Index: vhUnitTest/APPS/Halux/PPS/TBXPers/TestWerkpost.cls.xml
===================================================================
diff -u -r31291 -r33369
--- vhUnitTest/APPS/Halux/PPS/TBXPers/TestWerkpost.cls.xml	(.../TestWerkpost.cls.xml)	(revision 31291)
+++ vhUnitTest/APPS/Halux/PPS/TBXPers/TestWerkpost.cls.xml	(.../TestWerkpost.cls.xml)	(revision 33369)
@@ -34,7 +34,7 @@
 <Type>vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakSequentie</Type>
 </Property>
 
-<Property name="iWerkpost">
+<Property name="Werkpost">
 <Type>APPS.Halux.PPS.TBXPers.IWerkpost</Type>
 </Property>
 
@@ -48,137 +48,163 @@
 
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
-	Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakProducten).MaakAlleProducten()
-	Set ..MaakSequentie=##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakSequentie).%New()
-	Do ..MaakSequentie.MaakToeleveringPersWerkpost()
-	Set ..Batch=..MaakSequentie.MaakBatch($LB(..MaakSequentie.TOENrWerkpost))
-	do ##class(APPS.Halux.common.event.BatchEventRaiser).RaiseBatchGeslotenEvent(..Batch.GeefID())
-	Do ..Batch.ZetStatusEnSave(##class(APPS.Halux.common.enu.BatchStatus).Gestart())
-	Do ..MaakSequentie.MaakToeleveringSpecials()
-	Set ..BatchSpecials=..MaakSequentie.MaakBatch($LB(..MaakSequentie.TOENrSpecials))
-	do ##class(APPS.Halux.common.event.BatchEventRaiser).RaiseBatchGeslotenEvent(..BatchSpecials.GeefID())
-	Do ..BatchSpecials.ZetStatusEnSave(##class(APPS.Halux.common.enu.BatchStatus).Gestart())
-	
-	Set ..iWerkpost=##class(APPS.Halux.PPS.TBXPers.impl.Werkpost).%New(##class(APPS.Halux.common.enu.Werkpost).Pers1())
+	Do ..MaakData()
 	Do ##super()
 ]]></Implementation>
 </Method>
 
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..Werkpost = ##class(APPS.Halux.PPS.TBXPers.impl.Werkpost).%New(##class(APPS.Halux.common.enu.Werkpost).Pers1())
+]]></Implementation>
+</Method>
+
 <Method name="OnAfterAllTests">
 <Implementation><![CDATA[
-	Do ..MaakSequentie.VerwijderBatch(..Batch)
-	Do ..MaakSequentie.VerwijderBatch(..BatchSpecials)
-	Do ..MaakSequentie.VerwijderToeleveringPersWerkpost()
-	Do ..MaakSequentie.VerwijderToeleveringSpecials()
-	Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakProducten).VerwijderAlleProducten()
+	Do ..VerwijderData()
 	Do ##super()
 ]]></Implementation>
 </Method>
 
 <Method name="TestZetStatus">
 <Implementation><![CDATA[
-	Set BatchID=..Batch.%Id()
-	Set BatchIDSpecials = ..BatchSpecials.%Id()
-	Set rsBatches=##class(%ResultSet).%New("BL.PPS.TBX.WPPers:BatchIDList")
-	Set rsOpdrachten=##class(%ResultSet).%New("BL.PPS.TBX.WPPers:GetTBXsProdDef")
-	Set sc=rsBatches.Execute()
-	Set OpdrachtCnt=0
-	While (rsBatches.Next())
-	{
-		#dim BatchIDVanPerslijst As %String = $P(rsBatches.Data("BatchID"),"||")
-		If ((BatchIDVanPerslijst=BatchID) || (BatchIDVanPerslijst=BatchIDSpecials))
-		{
-			Set sc=rsOpdrachten.Execute(rsBatches.Data("BatchID"))
-			While (rsOpdrachten.Next())
-			{
-				/* Te testen methods */
-				Do ..iWerkpost.ZetStatus(rsOpdrachten.Data("UniqueID"))
+	#dim BatchID As %String = ..Batch.%Id()	
+	#dim BatchSpecialsID As %String = ..BatchSpecials.%Id()
+	#dim BatchesResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GetResultSet(##class(TECH.ClassQuery).%New("BL.PPS.TBX.WPPers", "BatchIDList"))
+	#dim OpdrachtCount As %Integer = 0
+	
+	While (BatchesResultSet.Next()) {
+		#dim BatchIDVanPerslijst As %String = $Piece(BatchesResultSet.Data("BatchID"), "||")
+		
+		If ((BatchIDVanPerslijst = BatchID) || (BatchIDVanPerslijst = BatchSpecialsID)) {
+			#dim OpdrachtenResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GetResultSet(##class(TECH.ClassQuery).%New("BL.PPS.TBX.WPPers", "GetTBXsProdDef", $ListBuild(BatchesResultSet.Data("BatchID"))))
+			
+			While (OpdrachtenResultSet.Next()) {
+				#dim UniekeID As %String = OpdrachtenResultSet.Data("UniqueID")
+				#dim Queue As DS.PPS.TBX.Queue = ##class(DS.PPS.TBX.Queue).%OpenId(UniekeID)
+				#dim ProductNummer As %String = Queue.Product.%Id()
 
-				Set OpdrachtCnt=OpdrachtCnt+1
-				Set Queue=##class(DS.PPS.TBX.Queue).%OpenId(rsOpdrachten.Data("UniqueID"))
-				Do $$$AssertEquals(Queue.WPPers.WPStatus,"F","ZetStatus : queue status")
-				Set PRNr=Queue.Product.%Id()
-				If PRNr=$Parameter(..MaakSequentie,"TBXSpoelbak")
-				{
-					Do $$$AssertEquals(rsOpdrachten.Data("Status"),"?","Status = Reeds geproduceerd")
-					Do $$$AssertNotEquals(rsOpdrachten.Data("Info1"),"","Info moet ingevuld zijn ingevuld")
+				Do ..Werkpost.ZetStatus(UniekeID)
+				
+				Set OpdrachtCount = $Increment(OpdrachtCount)
+
+				Do $$$AssertEquals(Queue.WPPers.WPStatus, "F", "ZetStatus : queue status")
+
+				If (ProductNummer = $Parameter(..MaakSequentie, "TBXSpoelbak")) {
+					Do $$$AssertEquals(OpdrachtenResultSet.Data("Status"), "?", "Status = Reeds geproduceerd")
+					Do $$$AssertNotEquals(OpdrachtenResultSet.Data("Info1"), "", "Info moet ingevuld zijn ingevuld")
 				}
 			}
+			
+			Set OpdrachtenResultSet = "" ; Close van de crazy query.
 		}
 	}
-	Do $$$AssertEquals(OpdrachtCnt,5,"Aantal te persen opdrachten")
+	
+	Do $$$AssertEquals(OpdrachtCount, 5, "Aantal te persen opdrachten")
 ]]></Implementation>
 </Method>
 
 <Method name="TestBeschadiging">
 <Implementation><![CDATA[
-
-	Set BatchID=..Batch.%Id()
-	Set BatchIDSpecials = ..BatchSpecials.%Id()
-	Set rsBatches=##class(%ResultSet).%New("BL.PPS.TBX.WPPers:BatchIDList")
-	Set rsOpdrachten=##class(%ResultSet).%New("BL.PPS.TBX.WPPers:GetTBXsProdDef")
-	Set sc=rsBatches.Execute()
-	Set OpdrachtCnt=0
-	While (rsBatches.Next())
-	{
-		#dim BatchIDVanPerslijst As %String = $P(rsBatches.Data("BatchID"),"||")
-		If ((BatchIDVanPerslijst=BatchID) || (BatchIDVanPerslijst=BatchIDSpecials))
-		{
-			Set sc=rsOpdrachten.Execute(rsBatches.Data("BatchID"))
-			While (rsOpdrachten.Next())
-			{
-				Set Queue=##class(DS.PPS.TBX.Queue).%OpenId(rsOpdrachten.Data("UniqueID"))
-				Set PRNr=Queue.Product.%Id()
-				If PRNr=$Parameter(..MaakSequentie,"TBX1")
-				{			
-					/* Te testen method */
-					Do ..iWerkpost.RegistreerBeschadiging(rsOpdrachten.Data("UniqueID"),"Zaag","B+R",##class(APPS.Halux.PPS.TBXZaag.enu.VerantwBeschadiging).Productie(),"unittest",##class(APPS.Halux.PPS.TBXZaag.enu.Output2Lijn).Direct()) ; met rework
+	#dim BatchID As %String = ..Batch.%Id()	
+	#dim BatchSpecialsID As %String = ..BatchSpecials.%Id()
+	#dim BatchesResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GetResultSet(##class(TECH.ClassQuery).%New("BL.PPS.TBX.WPPers", "BatchIDList"))
+	#dim OpdrachtCount As %Integer = 0
+	
+	While (BatchesResultSet.Next()) {
+		#dim BatchIDVanPerslijst As %String = $Piece(BatchesResultSet.Data("BatchID"), "||")
+		
+		If ((BatchIDVanPerslijst = BatchID) || (BatchIDVanPerslijst = BatchSpecialsID)) {
+			#dim OpdrachtenResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GetResultSet(##class(TECH.ClassQuery).%New("BL.PPS.TBX.WPPers", "GetTBXsProdDef", $ListBuild(BatchesResultSet.Data("BatchID"))))
+			
+			While (OpdrachtenResultSet.Next()) {
+				#dim UniekeID As %String = OpdrachtenResultSet.Data("UniqueID")
+				#dim Queue As DS.PPS.TBX.Queue = ##class(DS.PPS.TBX.Queue).%OpenId(UniekeID)
+				#dim ProductNummer As %String = Queue.Product.%Id()	
+				
+				If (ProductNummer = $Parameter(..MaakSequentie, "TBX1")) {			
+					Do ..Werkpost.RegistreerBeschadiging(UniekeID, "Zaag", "B+R", ##class(APPS.Halux.PPS.TBXZaag.enu.VerantwBeschadiging).Productie(), "unittest", ##class(APPS.Halux.PPS.TBXZaag.enu.Output2Lijn).Direct()) ; met rework
 				}
 			}
+			
+			Set OpdrachtenResultSet = "" ; Close van de crazy query.
 		}
+		
 	}
 
-	/* controle op herwerk */
-	Set rsBatches=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelperVoorTBX:qActieveBatchLijst")
-	Set sc=rsBatches.Execute("",1)
-	Set rsOpdrachten=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelperVoorTBX:qZaagLijstHelper")
-	Set HerwerkCnt=0
-	While (rsBatches.Next())
-	{
-		;w !,rsBatches.Data("BatchKey"),!
-		If ($P(rsBatches.Data("BatchKey"),"||")=BatchID)&&($P(rsBatches.Data("BatchKey"),"||",2)=##class(APPS.Halux.PPS.TBXZaag.enu.SubBatch).Herwerk())
-		{
-			Set sc=rsOpdrachten.Execute($P(rsBatches.Data("BatchKey"),"||"),$P(rsBatches.Data("BatchKey"),"||",2))
-			While (rsOpdrachten.Next())
-			{
-				Set dtoOpdracht=##class(APPS.Halux.PPS.TBXZaag.dto.Opdracht).GetOpdracht(rsOpdrachten.GetData(1))
-				Do $$$AssertEquals(dtoOpdracht.Transferlijn,##class(APPS.Halux.PPS.TBXZaag.enu.Output2Lijn).Direct())
-				Set HerwerkCnt=HerwerkCnt+1
+	/// controle op herwerk
+	#dim HerwerkBatchesResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GetResultSet(##class(TECH.ClassQuery).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelperVoorTBX", "qActieveBatchLijst",  $ListBuild("", 1)))
+	#dim HerwerkCount As %Integer = 0
+	
+	While (HerwerkBatchesResultSet.Next()) {
+		#dim HerkwerkBatchID As %String = $Piece(HerwerkBatchesResultSet.Data("BatchKey"), "||")
+		#dim SubBatch As APPS.Halux.PPS.TBXZaag.enu.SubBatch = $Piece(HerwerkBatchesResultSet.Data("BatchKey"), "||", 2)
+		
+		If (HerkwerkBatchID = BatchID) && (SubBatch = ##class(APPS.Halux.PPS.TBXZaag.enu.SubBatch).Herwerk()) {
+			#dim ActieveOpdrachtenResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GetResultSet(##class(TECH.ClassQuery).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelperVoorTBX", "qZaagLijstHelper", $ListBuild(HerkwerkBatchID, SubBatch)))
+			
+			While (ActieveOpdrachtenResultSet.Next()) {
+				#dim Opdracht As APPS.Halux.PPS.TBXZaag.dto.Opdracht = ##class(APPS.Halux.PPS.TBXZaag.dto.Opdracht).GetOpdracht(ActieveOpdrachtenResultSet.GetData(1))
+				
+				Do $$$AssertEquals(Opdracht.Transferlijn, ##class(APPS.Halux.PPS.TBXZaag.enu.Output2Lijn).Direct())
+				Set HerwerkCount = $Increment(HerwerkCount)
 			}
+			
+			Set ActieveOpdrachtenResultSet = ""
+			
 		}
 	}
-	Do $$$AssertEquals(HerwerkCnt,1,"Herwerkopdrachten")
+	
+	Do $$$AssertEquals(HerwerkCount, 1, "Herwerkopdrachten")
 ]]></Implementation>
 </Method>
 
 <Method name="TestStilstandLijst">
 <Implementation><![CDATA[
-	#dim DataSet as %XML.DataSet
-	Set Werkpost=##class(APPS.Halux.PPS.TBXPers.impl.Werkpost).%New(##class(APPS.Halux.common.enu.Werkpost).Pers1())
-	Set DataSet=Werkpost.GeefStilstanden()
-	Set x=DataSet.XMLExportToString()
-	Do $$$AssertEquals(DataSet.GetColumnCount(),5,"Stilstandenlijst aantal columns")
+	#dim DataSet as %XML.DataSet = ..Werkpost.GeefStilstanden()
+	
+	Do $$$AssertEquals(DataSet.GetColumnCount(), 5, "Stilstandenlijst aantal columns")
 ]]></Implementation>
 </Method>
 
 <Method name="TestHerwerkingLijst">
 <Implementation><![CDATA[
-	Set Werkpost=##class(APPS.Halux.PPS.TBXPers.impl.Werkpost).%New(##class(APPS.Halux.common.enu.Werkpost).Pers1())
-	Set DataSet=Werkpost.GeefHerwerkingen()
-	Set x=DataSet.XMLExportToString()
-	Do $$$AssertEquals(DataSet.GetColumnCount(),3,"Herwerkingslijst aantal columns")
+	#dim DataSet as %XML.DataSet = ..Werkpost.GeefHerwerkingen()
+
+	Do $$$AssertEquals(DataSet.GetColumnCount(), 3, "Herwerkingslijst aantal columns")
 ]]></Implementation>
 </Method>
+
+<Method name="MaakData">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakProducten).MaakAlleProducten()
+	
+	Set ..MaakSequentie=##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakSequentie).%New()
+	Do ..MaakSequentie.MaakToeleveringPersWerkpost()
+	Set ..Batch = ..MaakSequentie.MaakBatch($ListBuild(..MaakSequentie.TOENrWerkpost))
+	Do ##class(APPS.Halux.common.event.BatchEventRaiser).RaiseBatchGeslotenEvent(..Batch.GeefID())
+	Do ..Batch.ZetStatusEnSave(##class(APPS.Halux.common.enu.BatchStatus).Gestart())
+	Do ..MaakSequentie.MaakToeleveringSpecials()
+	Set ..BatchSpecials=..MaakSequentie.MaakBatch($LB(..MaakSequentie.TOENrSpecials))
+	Do ##class(APPS.Halux.common.event.BatchEventRaiser).RaiseBatchGeslotenEvent(..BatchSpecials.GeefID())
+	Do ..BatchSpecials.ZetStatusEnSave(##class(APPS.Halux.common.enu.BatchStatus).Gestart())
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderData">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ..MaakSequentie.VerwijderBatch(..Batch)
+	Do ..MaakSequentie.VerwijderBatch(..BatchSpecials)
+	Do ..MaakSequentie.VerwijderToeleveringPersWerkpost()
+	Do ..MaakSequentie.VerwijderToeleveringSpecials()
+	Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakProducten).VerwijderAlleProducten()
+]]></Implementation>
+</Method>
 </Class>