Index: vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml
===================================================================
diff -u -r1847 -r1861
--- vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 1847)
+++ vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 1861)
@@ -5,21 +5,9 @@
 JBL - 2011-08-11
 Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VisiDot.TestVHossXML")</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.APPS.VisiDot.VHossTestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="DirUnitTestFiles">
-<Type>%String</Type>
-</Property>
-
-<Property name="CaptureHelper">
-<Type>APPS.VisiDot.impl.VHossCaptureHelper</Type>
-</Property>
-
-<Property name="WebService">
-<Type>WS.VisiDot.OperatorServer</Type>
-</Property>
-
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
@@ -62,73 +50,27 @@
 	
 	Set result=reader.Next(.CaptureInfo,.sc)
 	
-	/*
-	
-	Om test data te krijgen met HTML entities 
-	
-	Set XML = ""
-	Do CaptureInfo.XMLExportToString(.XML,,"literal")
-	
-	//Set FullXMLStream = ##class(%GlobalCharacterStream).%New()
-	Set FullXMLStream=##class(%FileCharacterStream).%New()
-	Set FullXMLStream.Filename="c:\myfile.txt"
-	
-	Set Buffer = 10000
-	Set AantalChars = $Length(XML)
-	For i = 1 : 1 : ((AantalChars/Buffer)+1) {
-		Set XMLPart = $EXTRACT(XML,((i-1)*Buffer)+1,(i*Buffer))		
-		set ^XML = XMLPart
-		w !,i
-		Do FullXMLStream.Write($ZCVT(XMLPart,"O","HTML"))
-		//Do FullXMLStream.Write(XMLPart)
-	}
-	Do FullXMLStream.Flush()
-	Do FullXMLStream.SaveStream()
-	Do FullXMLStream.%Close()
-	
-	/*
-	Set FullXMLStream=##class(%FileCharacterStream).%New()
-	Set FullXMLStream.Filename="c:\myfile.txt"
-	Set LijnNr = 1
-	While 'FullXMLStream.AtEnd {
-		Set line=FullXMLStream.ReadLine()
-		set ^Line = line
-		w "Lijn:",LijnNr,!
-		Set LijnNr = LijnNr + 1
-	}
-	
-	Set reader = ##class(%XML.Reader).%New()
-	Set sc=reader.OpenStream(FullXMLStream)
-	If $$$ISERR(sc) w !,"ERROR : "_$$ParseStatus^vhLib(sc),! Quit  
-	Do reader.Correlate("Capture_Info","APPS.VisiDot.dto.CaptureInfo")
-	While reader.Next(.CaptureInfo,.sc) {
-		//w !,"Yep",!
-	}
-	
-	
 	If $$$ISERR(sc)	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon XML bestand '"_FullName_"' niet lezen : "_$$ParseStatus^vhLib(sc))) 
-	*/
+	
 	Quit $G(CaptureInfo)
 ]]></Implementation>
 </Method>
 
-<Method name="Finish">
-<FormalSpec>ProcessedData</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set ..CaptureHelper=##class(APPS.VisiDot.impl.VHossCaptureHelper).%New(ProcessedData)
-	Quit ..CaptureHelper.GeefFoutCode()
-]]></Implementation>
-</Method>
-
 <Method name="TestUnmarshallingXML">
 <Implementation><![CDATA[
 	Set Dir = "Stage2_NormalRead_AllOk\"
 	Set File = "ReadResults_ReadID00000182_Controller_Gate1_Status00_Time_20110814_153423_890_DUAL_(Stage_3_Before_DB_Insertion).xml"
 	Set CaptureInfo = ..Import(Dir, File)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set Status = CaptureInfo.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	
 	Set ErrorCode=..Finish(ProcessedData)	
 	
+	Set XMLReader = ##class(%XML.Reader).%New()
+	Do XMLReader.OpenStream(ProcessedData)
+	Do XMLReader.Correlate("Capture_Info","APPS.VisiDot.dto.CaptureInfo") 	
+	Do XMLReader.Next(.ProcessedData,.sc) 
+	
 	/// Correctheid van data nakijken
 	Do $$$AssertTrue($IsObject(ProcessedData.VRRead),"VHRead is een object.")
 	
@@ -204,54 +146,56 @@
 	Set Dir = "Stage2_NormalRead_AllOk\"
 	Set File = "ReadResults_ReadID00000182_Controller_Gate1_Status00_Time_20110814_153423_890_DUAL_(Stage_3_Before_DB_Insertion).xml"
 	Set CaptureInfo = ..Import(Dir, File)
-	
 	D ##class(APPS.VisiDot.zTryout).%New().ShowVHoss(CaptureInfo)
 	
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set Status = CaptureInfo.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	Set ErrorCode=..Finish(ProcessedData)	
-	d ProcessedData.XMLExport(,"literal,indent") 
+	//d ProcessedData.XMLExport(,"literal,indent") 
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture moet correct zijn (zonder fouten)")
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Method TestMissingLabels()
-{
+<Method name="TestMissingLabels">
+<Implementation><![CDATA[
 	Set Dir = "Stage3_MissingLabel\"
 	Set File = "ReadResults_ReadID00000183_Controller_Gate1_Status00_Time_20110814_153456_593_DUAL_(Stage_3_Before_DB_Insertion).xml"
 	Set CaptureInfo = ..Import(Dir, File)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set Status = CaptureInfo.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	
 	w !,"Missing labels : ",!
 	D ##class(APPS.VisiDot.zTryout).%New().ShowVHoss(CaptureInfo)
 	
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekend(),"Capture bevat een ontbrekende lade")
-}
+]]></Implementation>
+</Method>
 
-Method TestReadAgain()
-{
+<Method name="TestReadAgain">
+<Implementation><![CDATA[
 	Set Dir = "Stage4_ReadAgain\"
 	Set File = "ReadResults_ReadID00000184_Controller_Gate1_Status00_Time_20110814_153651_906_DUAL_(Stage_3_Before_DB_Insertion).xml"
 	Set CaptureInfo = ..Import(Dir, File)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set Status = CaptureInfo.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	Set ErrorCode=..Finish(ProcessedData)
-}
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture moet correct zijn (zonder fouten)")
+]]></Implementation>
+</Method>
 
-Method TestEndOrder()
-{
+<Method name="TestEndOrder">
+<Implementation><![CDATA[
 	Set Dir = "Stage5_EndOrder\"
 	Set File = "END_ORDER_Time_2011_08_14_15_37_57_To_ERP.xml"
 	Set CaptureInfo = ..Import(Dir, File)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set Status = CaptureInfo.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	
 	Set ErrorCode=..Finish(ProcessedData)	
-	//d ProcessedData.XMLExport(,"literal,indent") r k
+	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"End Order was correct.")
-}
-*/
-]]></Content>
-</UDLText>
+]]></Implementation>
+</Method>
 </Class>
 </Export>