Index: vhUnitTest/APPS/Halux/PPS/TBXZaag/TestBuild.cls.xml
===================================================================
diff -u -r2575 -r2686
--- vhUnitTest/APPS/Halux/PPS/TBXZaag/TestBuild.cls.xml	(.../TestBuild.cls.xml)	(revision 2575)
+++ vhUnitTest/APPS/Halux/PPS/TBXZaag/TestBuild.cls.xml	(.../TestBuild.cls.xml)	(revision 2686)
@@ -2,42 +2,176 @@
 <Export generator="Cache" version="9">
 <Class name="vhUnitTest.APPS.Halux.PPS.TBXZaag.TestBuild">
 <Description>
-do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.Halux.Docs.TestLadeProductLijst")</Description>
+do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.Halux.PPS.TBXZaag")</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Method OnBeforeAllTests() As %Status
-{
-	Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.BuildProducts).BeforeAllTests()
-	Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.BuildSequentie).BeforeAllTests()
+<Parameter name="TBXKOP">
+<Default>1003</Default>
+</Parameter>
+
+<Parameter name="TBXSyfon">
+<Default>1005</Default>
+</Parameter>
+
+<Parameter name="TBXSpoelbak">
+<Default>1006</Default>
+</Parameter>
+
+<Parameter name="TBXStalenRugBodemGezaagd">
+<Default>1007</Default>
+</Parameter>
+
+<Parameter name="TBXStalenRug">
+<Default>1008</Default>
+</Parameter>
+
+<Parameter name="TBXSpecialBodemRug">
+<Default>1009</Default>
+</Parameter>
+
+<Parameter name="TBXSpecialRug">
+<Default>1010</Default>
+</Parameter>
+
+<Parameter name="TBXSpecialBodem">
+<Default>1011</Default>
+</Parameter>
+
+<Property name="MaakSequentie">
+<Type>vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakSequentie</Type>
+</Property>
+
+<Property name="Batch">
+<Type>APPS.Halux.common.impl.BatchImpl</Type>
+</Property>
+
+<Property name="BatchSpecials">
+<Type>APPS.Halux.common.impl.BatchImpl</Type>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<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.MaakToelevering1()
+	Do ..MaakSequentie.MaakToelevering2()
+	Set ..Batch=..MaakSequentie.MaakBatch($LB(..MaakSequentie.TOENr1,..MaakSequentie.TOENr2))
+	Do ..MaakSequentie.MaakToeleveringSpecials()
+	Set ..BatchSpecials=..MaakSequentie.MaakBatch($LB(..MaakSequentie.TOENrSpecials))
 	Quit $$$OK
-}
+]]></Implementation>
+</Method>
 
-Method OnAfterAllTests() As %Status
-{
-	Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.BuildProducts).AfterAllTests()
-	Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.BuildSequentie).AfterAllTests()
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..MaakSequentie.VerwijderBatch(..Batch)
+	Do ..MaakSequentie.VerwijderBatch(..BatchSpecials)
+	Do ..MaakSequentie.VerwijderToelevering1()
+	Do ..MaakSequentie.VerwijderToelevering2()
+	Do ..MaakSequentie.VerwijderToeleveringSpecials()
+	;Do ##class(vhUnitTest.APPS.Halux.PPS.TBXZaag.impl.MaakProducten).VerwijderAlleProducten()
 	Quit $$$OK
-}
+]]></Implementation>
+</Method>
 
-Method TestToevoegenLade()
-{
-	Set Lijst = ##class(APPS.Halux.Docs.LadeProductLijst).%New("TBX")
-	Set LadeProduct = ##class(vhUnitTest.APPS.Halux.Docs.impl.TBXLadeProduct).%New()
-	Set Resultaat = Lijst.VoegToe(LadeProduct)
-	Do $$$AssertTrue(Resultaat,"Het product is toegevoegd")
-}
-*/
-]]></Content>
-</UDLText>
+<Method name="TestBuild">
+<Implementation><![CDATA[
+	Set BatchID=..Batch.%Id()
+	/* Te testen method */
+	Set ZaagBuilder=##class(APPS.Halux.PPS.TBXZaag.impl.Builder).%New(BatchID)
+	Set sc=ZaagBuilder.MaakZaagOpdrachten()
+	/* Verificatie */
+	Set rsBatches=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qActieveBatchLijst")
+	Set rsOpdrachten=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qZaagLijstHelper")
+	Set sc=rsBatches.Execute()
+	Set BatchCnt=0
+	While (rsBatches.Next())
+	{
+		If $P(rsBatches.Data("BatchKey"),"||")=BatchID 
+		{
+			Set BatchCnt=BatchCnt+1
+			Set OpdrachtCnt=0
+			Set sc=rsOpdrachten.Execute($P(rsBatches.Data("BatchKey"),"||"),$P(rsBatches.Data("BatchKey"),"||",2))
+			While (rsOpdrachten.Next())
+			{
+				Set OpdrachtCnt=OpdrachtCnt+1
+			}
+			Set VerwachtAantal=$Case($P(rsBatches.Data("BatchKey"),"||",2),##class(APPS.Halux.PPS.TBXZaag.enu.SubBatch).SpoelbakSifon():3,##class(APPS.Halux.PPS.TBXZaag.enu.SubBatch).TipOn():2,:10)
+			Do $$$AssertEquals(OpdrachtCnt,VerwachtAantal,"Aantal per subbatch "_rsBatches.Data("BatchKey"))
+		}
+	}
+	Do $$$AssertEquals(BatchCnt,3,"Aantal splits in subbatches van "_BatchID)
+]]></Implementation>
+</Method>
 
-<Method name="TestDummy">
-<Implementation><![CDATA[	Do $$$AssertFalse(1,"Dummy placeholder")
+<Method name="TestSpecials">
+<Implementation><![CDATA[
+	Set BatchID=..BatchSpecials.%Id()
+	/* Te testen method */
+	Set ZaagBuilder=##class(APPS.Halux.PPS.TBXZaag.impl.Builder).%New(BatchID)
+	Set sc=ZaagBuilder.MaakZaagOpdrachten()
+	/* Verificatie */
+	Set rsBatches=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qActieveBatchLijst")
+	Set rsOpdrachten=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qZaagLijstHelper")
+	Set sc=rsBatches.Execute()
+	Set OpdrachtCnt=0
+	While (rsBatches.Next())
+	{
+		If $P(rsBatches.Data("BatchKey"),"||")=BatchID 
+		{
+			Set sc=rsOpdrachten.Execute($P(rsBatches.Data("BatchKey"),"||"),$P(rsBatches.Data("BatchKey"),"||",2))
+			While (rsOpdrachten.Next())
+			{
+				Set Opdracht=##class(APPS.Halux.PPS.TBXZaag.Opdrachten).%OpenId(rsOpdrachten.GetData(1))
+				;w rsOpdrachten.GetData(1)," PRnr",Opdracht.Product.%Id(),!
+				Set Opdracht=##class(APPS.Halux.PPS.TBXZaag.dto.Opdracht).GetOpdracht(rsOpdrachten.GetData(1))
+				
+				Do:Opdracht.PRNr=..#TBXKOP $$$AssertNotEquals(Opdracht.PRNr,..#TBXKOP,"Bodem met KOP moeten in manuele mode verzaagd worden, dus mag niet voorkomen; PRNr:"_..#TBXKOP)
+				Do:Opdracht.PRNr=..#TBXStalenRugBodemGezaagd $$$AssertNotEquals(Opdracht.PRNr,..#TBXStalenRugBodemGezaagd,"Bodem is reeds verzaagd dus mag niet voorkomen"_..#TBXStalenRugBodemGezaagd)
+				
+				If Opdracht.PRNr=..#TBXSpoelbak
+				{ 
+					Do $$$AssertEquals(..ControleBodemRug(Opdracht),##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).Bodem(),"Spoelbak:alleen een bodem te zagen; PRNr:"_..#TBXSpoelbak)
+				}
+				ElseIf Opdracht.PRNr=..#TBXStalenRug
+				{
+					Do $$$AssertEquals(..ControleBodemRug(Opdracht),##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).Bodem(),"Stalenrug: alleen een bodem te zagen; PRNr:"_..#TBXStalenRug)
+				}
+				ElseIf Opdracht.PRNr=..#TBXSpecialBodem
+				{
+					Do $$$AssertEquals(..ControleBodemRug(Opdracht),##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).Bodem(),"Special: alleen een bodem te zagen; PRNr:"_..#TBXSpecialBodem)
+				}
+				ElseIf Opdracht.PRNr=..#TBXSpecialBodemRug
+				{
+					Do $$$AssertEquals(..ControleBodemRug(Opdracht),##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).BodemRug(),"Special: bodem en rug te zagen; PRNr:"_..#TBXSpecialBodemRug)
+				}
+				ElseIf Opdracht.PRNr=..#TBXSpecialRug
+				{
+					Do $$$AssertEquals(..ControleBodemRug(Opdracht),##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).Rug(),"Special: alleen een rug te zagen; PRNr:"_..#TBXSpecialRug)
+				}
+				Set OpdrachtCnt=OpdrachtCnt+1			
+			}
+			Do $$$AssertEquals(OpdrachtCnt,4,"Aantal per subbatch "_rsBatches.Data("BatchKey"))
+			
+		}
+	}
 ]]></Implementation>
 </Method>
+
+<Method name="ControleBodemRug">
+<FormalSpec>Opdracht:APPS.Halux.PPS.TBXZaag.dto.Opdracht,BodemRug:APPS.Halux.PPS.TBXZaag.enu.BodemRug</FormalSpec>
+<ReturnType>APPS.Halux.PPS.TBXZaag.enu.BodemRug</ReturnType>
+<Implementation><![CDATA[
+	Set:(Opdracht.Bodem.ProductNr?4.8N) BodemRug=##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).Bodem()
+	Set:(Opdracht.Rug.ProductNr?4.8N) BodemRug=##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).Rug()
+	Set:(Opdracht.Bodem.ProductNr?4.8N)&&(Opdracht.Rug.ProductNr?4.8N) BodemRug=##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).BodemRug()
+	
+	Quit $G(BodemRug)
+]]></Implementation>
+</Method>
 </Class>
 </Export>