Index: vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml
===================================================================
diff -u -r1791 -r1808
--- vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 1791)
+++ vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 1808)
@@ -29,10 +29,10 @@
 	Set SlotLabel=0
 	Set TOENr=234567
 	Set KLNr=1239
-	Set SequenceNr=0
-	Set QueueList = "418715;1;1.1\418582;1;1.1\418589;1;1.1\418582;2;1.1\"	
-	Set QueueList = QueueList_"418703;2;1.1\418589;2;1.1\418582;1;1.1\"
-	Set QueueList = QueueList_"418589;3;1.1\418703;2;1.1"
+	Set SequenceNr=0	
+	Set QueueList = "418715;1;1.1\418582;1;1.1\418589;1;1.1\418582;2;1.1\418588;3;1.1\418581;1;1.1\418609;1;1.1\"
+	Set QueueList = QueueList_"418703;1;1.1\418589;2;1.1\418703;1;1.1\418582;1;1.1\418581;2;1.1\418582;1;1.1\418715;1;1.1\418588;1;1.1"
+	Set QueueList = QueueList_"418589;3;1.1\418703;2;1.1\418582;1;1.1\418703;1;1.1\418704;1;1.1\418715:1:1.1\418704;1;1.1"
 	
 	Do QueueBuilder.Initialize(BatchID,SlotLabel,TOENr,KLNr,SequenceNr,QueueList)
 	Set BatchID=QueueBuilder.BuildBatch()
@@ -78,33 +78,118 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestFullFirstPallet">
+<Method name="TestUnmarshallingXML">
 <Implementation><![CDATA[
-	Set Dir = "01_FullFirstPallet\"
-	Set File = "ReadResults_ReadID00049264_Controller_Gate1_Status00_Time_20110721_170225_644_DUAL_(Stage_3_Before_DB_Insertion).xml"
+	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 ErrorCode=..Finish(ProcessedData)	
-	//d ProcessedData.XMLExport(,"literal,indent") r k
+	
+	/// Correctheid van data nakijken
+	Do $$$AssertTrue($IsObject(ProcessedData.VRRead),"VHRead is een object.")
+	
+	Do $$$AssertEquals(ProcessedData.VRRead.GetAt(1).Id,"182","VR_Read.Id is correct.")
+	Do $$$AssertEquals(ProcessedData.VRRead.GetAt(1).Result,"OK","VR_Read.Result is correct.")
+	Do $$$AssertEquals(ProcessedData.VRRead.GetAt(1).CommandTime,"2011/08/14_15:34:21","VR_Read.CommandTime is correct.")
+	Do $$$AssertEquals(ProcessedData.VRRead.GetAt(1).EndTime,"2011/08/14_15:34:23","VR_Read.EndTime is correct.")
+	
+	/// VR_Read.Reader
+	Do $$$AssertTrue($IsObject(ProcessedData.VRRead.GetAt(1).Reader),"VR_Read.Reader is een object.")
+	Do $$$AssertTrue($IsObject(ProcessedData.VRRead.GetAt(1).Reader.GetAt(1).Sequence),"VR_Read.Reader is een object")
+	Set Sequence = ProcessedData.VRRead.GetAt(1).Reader.GetAt(1).Sequence.GetAt(1)
+	Do $$$AssertEquals(Sequence.SequenceID,"1","VR_Read.Reader.Sequence.SequenceID is correct.")
+	Do $$$AssertEquals(Sequence.SeqTime,"12957809661890","VR_Read.Reader.Sequence.SeqTime is correct.")
+	
+	/// Camera
+	Do $$$AssertTrue($IsObject(Sequence.Camera.GetAt(1)),"VR_Read.Reader.Sequence.Camera is een object.") 
+	Set Camera = Sequence.Camera.GetAt(1)
+	Do $$$AssertEquals(Camera.Name,"CD6600.781002103","Camera.Name is correct.")
+	Do $$$AssertEquals(Camera.Id,"781002103","Camera.Id is correct.")
+	Do $$$AssertEquals(Camera.Side,"1","Camera.Side is correct.")
+	Do $$$AssertEquals(Camera.Row,"2","Camera.Row is correct.")
+	Do $$$AssertEquals(Camera.Column,"1","Camera.Column is correct.")
+	Do $$$AssertEquals(Camera.OffsetX,"0","Camera.OffsetX is correct.")
+	Do $$$AssertEquals(Camera.OffsetY,"1046","Camera.OffsetY is correct.")
+	
+	/// Photo
+	Do $$$AssertTrue($IsObject(Camera.Photo.GetAt(1)),"VR_Read.Reader.Sequence.Camera.Photo is een object.") 
+	Set Photo = Camera.Photo.GetAt(1)
+	Do $$$AssertEquals(Photo.File,"Scanner_781002103_15_34_21_906.jpg","Photo.File is correct.")
+	Do $$$AssertEquals(Photo.OriginalFile,"\\sff2003\Director_Root_VHK\Reader_Root\Photos\2011_08_14\Scanner_781002103_15_34_21_906.jpg","Photo.OriginalFile is correct.")
+	Do $$$AssertEquals(Photo.Width,"2208","Photo.Width is correct.")
+	Do $$$AssertEquals(Photo.Height,"3000","Photo.Height is correct.")
+	
+	/// Detection 1
+	Do $$$AssertTrue($IsObject(Photo.Detection.GetAt(1)),"VR_Read.Reader.Sequence.Camera.Photo.Detection 1 is een object.") 
+	Set Detection = Photo.Detection.GetAt(1)	
+	Do $$$AssertEquals(Detection.Id,"9999901100418589","Detection.Id is correct.")
+	Do $$$AssertEquals(Detection.X1,"112","Detection.X1 is correct.")
+	Do $$$AssertEquals(Detection.X2,"-1","Detection.X2 is correct.")
+	Do $$$AssertEquals(Detection.Y1,"1412","Detection.Y1 is correct.")
+	Do $$$AssertEquals(Detection.Y2,"-1","Detection.Y2 is correct.")
+	Do $$$AssertEquals(Detection.Status,"0","Detection.Status is correct.")
+	Do $$$AssertEquals(Detection.Type,"1","Detection.Type is correct.")
+	Do $$$AssertEquals(Detection.Selected,##class(APPS.VisiDot.enu.DetectionTypes).Lade(),"Detection.Selected is correct.")
+	
+	/// Detection 1 : DUAL 1
+	Do $$$AssertTrue($IsObject(Detection.DUAL.GetAt(1)),"VR_Read.Reader.Sequence.Camera.Photo.Detection.DUAL is een object.") 
+	Set Dual = Detection.DUAL.GetAt(1)	
+	Do $$$AssertEquals(Dual.CodeWidthMM,"20","Dual.CodeWidthMM is correct.")
+	Do $$$AssertEquals(Dual.ColInPallet,"1","Dual.ColInPallet is correct.")
+	Do $$$AssertEquals(Dual.RowInPallet,"1","Dual.RowInPallet is correct.")
+	Do $$$AssertEquals(Dual.SubPallet,"1","Dual.SubPallet is correct.")
+	Do $$$AssertEquals(Dual.CrateType,"10","Dual.CrateType is correct.")
+	Do $$$AssertEquals(Dual.CodeType,"Package","Dual.Package is correct.")
+	
+	/// Detection 2
+	Do $$$AssertTrue($IsObject(Photo.Detection.GetAt(2)),"VR_Read.Reader.Sequence.Camera.Photo.Detection 2 is een object.") 
+	Set Detection = Photo.Detection.GetAt(2)	
+	Do $$$AssertEquals(Detection.Id,"9999901100418703","Detection.Id is correct.")
+	Do $$$AssertEquals(Detection.X1,"136","Detection.X1 is correct.")
+	Do $$$AssertEquals(Detection.X2,"-1","Detection.X2 is correct.")
+	Do $$$AssertEquals(Detection.Y1,"546","Detection.Y1 is correct.")
+	Do $$$AssertEquals(Detection.Y2,"-1","Detection.Y2 is correct.")
+	Do $$$AssertEquals(Detection.Status,"0","Detection.Status is correct.")
+	Do $$$AssertEquals(Detection.Type,"1","Detection.Type is correct.")
+	Do $$$AssertEquals(Detection.Selected,"Dup","Detection.Selected is correct.")
+]]></Implementation>
+</Method>
+
+<Method name="TestNormalReadAllOK">
+<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)
+	
+	D ##class(APPS.VisiDot.zTryout).%New().ShowVHoss(CaptureInfo)
+	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set ErrorCode=..Finish(ProcessedData)	
+	d ProcessedData.XMLExport(,"literal,indent") 
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture moet correct zijn (zonder fouten)")
 ]]></Implementation>
 </Method>
 
 <Method name="TestMissingLabels">
 <Implementation><![CDATA[
-	Set Dir = "02_MissingLabels\"
-	Set File = "ReadResults_ReadID00049267_Controller_Gate1_Status00_Time_20110721_170704_972_DUAL_(Stage_3_Before_DB_Insertion).xml"
+	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)
+	
+	w !,"Missing labels : ",!
+	D ##class(APPS.VisiDot.zTryout).%New().ShowVHoss(CaptureInfo)
+	
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossLadeOntbrekend(),"Capture bevat een ontbrekende lade")
 ]]></Implementation>
 </Method>
 
 <Method name="TestReadAgain">
 <Implementation><![CDATA[
-	Set Dir = "03_ReadAgain\"
-	Set File = "ReadResults_ReadID00049269_Controller_Gate1_Status00_Time_20110721_170917_081_DUAL_(Stage_3_Before_DB_Insertion).xml"
+	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 ErrorCode=..Finish(ProcessedData)
@@ -113,8 +198,8 @@
 
 <Method name="TestEndOrder">
 <Implementation><![CDATA[
-	Set Dir = "04_EndOrder\"
-	Set File = "END_ORDER_Time_2011_07_21_18_01_48.xml"
+	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 ErrorCode=..Finish(ProcessedData)