Index: vhUnitTest/BL/PPS/OptiBox/TestBase.cls.xml
===================================================================
diff -u
--- vhUnitTest/BL/PPS/OptiBox/TestBase.cls.xml	(revision 0)
+++ vhUnitTest/BL/PPS/OptiBox/TestBase.cls.xml	(revision 35957)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.BL.PPS.OptiBox.TestBase">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="IsOptiboxServerAlive">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsAlive As %Boolean = $$$False
+	
+	Try {
+		Set IsAlive = ##class(BL.Prod.OptiBox.Diverse).%New().IsOptiboxServerAlive(##class(BL.Prod.OptiBox.enu.OptiServer).SmallEnCuts())
+	}
+	Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do $$$AssertTrue(0,Exception.GeefOmschrijving())
+	}
+	Quit IsAlive
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Utils/BL/PPS/OptiBox.cls.xml
===================================================================
diff -u
--- vhTest/Utils/BL/PPS/OptiBox.cls.xml	(revision 0)
+++ vhTest/Utils/BL/PPS/OptiBox.cls.xml	(revision 35957)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.BL.PPS.OptiBox">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="MaakBoxData">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ObjRef:%String,ObjType:%String,BreedteExpressie:%String,DiepteExpressie:%String,CutOrder:%Integer</FormalSpec>
+<ReturnType>DS.Prod.OptiBox.BoxData</ReturnType>
+<Implementation><![CDATA[
+	#dim BoxData As DS.Prod.OptiBox.BoxData = ##class(DS.Prod.OptiBox.BoxData).%New()
+	// ID properties
+	Set BoxData.ObjType = ObjType
+	Set BoxData.ObjRef = ObjRef
+	Set BoxData.CutOrder = CutOrder
+	
+	// Volume properties
+	Set BoxData.Breedte = BreedteExpressie
+	Set BoxData.BreedteExec = BreedteExpressie
+	Set BoxData.DiepteExec = DiepteExpressie
+	Set BoxData.Diepte = DiepteExpressie
+	Set BoxData.Hoogte = "32"
+	Set BoxData.HoogteExec = "32"
+	set BoxData.MaxCombinAantal = 1
+	Set BoxData.Aantal = "Aantal"
+	Set BoxData.AantalExec = "Params(""AANTAL"")"
+	
+	// GetVolume method controleert op het aanwezig zijn van een Meta object, dus dat is nodig.
+	Set BoxData.Meta = ##class(DS.Prod.OptiBox.BoxMeta).%OpenId("471")
+	#dim Status As %Status = BoxData.%Save()
+	If $$$ISERR(Status){
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).SaveFailed(),"MaakBoxData",Status))
+	}	
+	
+	Quit BoxData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 35957 refers to a dead (removed) revision in file `vhUnitTest/BL/Prod/OptiBox/TestAddOptiBox.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 35957 refers to a dead (removed) revision in file `vhUnitTest/BL/PPS/OL/TestInpak.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/BL/Prod/OptiBox/Optimize/AddOptiBox/TestAddOptiBox.cls.xml
===================================================================
diff -u -r29059 -r35957
--- vhUnitTest/BL/Prod/OptiBox/Optimize/AddOptiBox/TestAddOptiBox.cls.xml	(.../TestAddOptiBox.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Prod/OptiBox/Optimize/AddOptiBox/TestAddOptiBox.cls.xml	(.../Optimize/AddOptiBox/Test.cls.xml)	(revision 35957)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhUnitTest.BL.Prod.OptiBox.TestAddOptiBox">
+<Class name="vhUnitTest.BL.Prod.OptiBox.Optimize.AddOptiBox.Test">
 <Super>vhUnitTest.TestCase</Super>
 
 <Property name="Optimizer">
@@ -35,37 +35,26 @@
 
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super(aTestName)
 	Do ..KuisOpBoxData()
 	
 	Set ..Optimizer = ##class(BL.Prod.OptiBox.Optimize).%New()
 	Set ..pxParent = ##class(WS.Prod.PanOpti.q1.BOXDEF).%New()
 	
-	Set ..BoxData = ##class(vhUnitTest.BL.PPS.OL.TestInpak).MaakBoxData(..#ObjRef, "TestType", "1", "1", 1)
+	Set ..BoxData = ##class(vhTest.Utils.BL.PPS.OptiBox).MaakBoxData(..#ObjRef, "TestType", "1", "1", 1)
 	Set ..BoxDataID = ..BoxData.%Id()
-	
-	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	
-	Do ..KuisOpBoxData()	
-	Quit $$$OK
+	Do ..KuisOpBoxData()
+	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
-<Method name="KuisOpBoxData">
-<Implementation><![CDATA[
-	Do ExecDynQuery^vhLib.Query( "DELETE FROM Prod.OptiBox_BoxData WHERE ObjRef=?", $LB(..#ObjRef))
-	Do ExecDynQuery^vhLib.Query( "DELETE FROM Prod.OptiBox_BoxData WHERE ObjRef=?", $LB(..#VerzameldoosObjRef))
-]]></Implementation>
-</Method>
-
 <Method name="TestAddOptiBoxZonderVerzameldoos">
 <Implementation><![CDATA[
 	Do ..AddOptiBox()
@@ -75,7 +64,7 @@
 
 <Method name="TestAddOptiBoxMetVolumeVerzameldoos">
 <Implementation><![CDATA[
-	#dim VerzameldoosBoxData As DS.Prod.OptiBox.BoxData = ##class(vhUnitTest.BL.PPS.OL.TestInpak).MaakBoxData(..#VerzameldoosObjRef, "TestType", "1", "1", 1)
+	#dim VerzameldoosBoxData As DS.Prod.OptiBox.BoxData = ##class(vhTest.Utils.BL.PPS.OptiBox).MaakBoxData(..#VerzameldoosObjRef, "TestType", "1", "1", 1)
 	Set VerzameldoosBoxData.OptiType = "VOLUME"
 	
 	Set ..BoxData.VolumeVan = VerzameldoosBoxData
@@ -87,7 +76,7 @@
 
 <Method name="TestAddOptiBoxMetSnijdbareVerzameldoos">
 <Implementation><![CDATA[
-	#dim VerzameldoosBoxData As DS.Prod.OptiBox.BoxData = ##class(vhUnitTest.BL.PPS.OL.TestInpak).MaakBoxData(..#VerzameldoosObjRef, "TestType", "1", "1", 1)
+	#dim VerzameldoosBoxData As DS.Prod.OptiBox.BoxData = ##class(vhTest.Utils.BL.PPS.OptiBox).MaakBoxData(..#VerzameldoosObjRef, "TestType", "1", "1", 1)
 	Set VerzameldoosBoxData.OptiType = "NIET-VOLUME"
 	
 	Set ..BoxData.VolumeVan = VerzameldoosBoxData
@@ -116,10 +105,19 @@
 </Method>
 
 <Method name="AddOptiBox">
+<Private>1</Private>
 <ReturnType>WS.Prod.PanOpti.q1.BOXDEF</ReturnType>
 <Implementation><![CDATA[	Set ..AddedBoxDef = ..Optimizer.AddOptiBox(..pxParent, ..BoxDataID, "", "", 1, "TestBasisRef", "TestLijnRef", "TestPRNr", "TestProductRef", 1, , 0, 1)
 ]]></Implementation>
 </Method>
+
+<Method name="KuisOpBoxData">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ExecDynQuery^vhLib.Query( "DELETE FROM Prod.OptiBox_BoxData WHERE ObjRef=?", $LB(..#ObjRef))
+	Do ExecDynQuery^vhLib.Query( "DELETE FROM Prod.OptiBox_BoxData WHERE ObjRef=?", $LB(..#VerzameldoosObjRef))
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/Halux/PPS/TBXPers/TestWerkpost.cls.xml
===================================================================
diff -u -r35936 -r35957
--- vhUnitTest/APPS/Halux/PPS/TBXPers/TestWerkpost.cls.xml	(.../TestWerkpost.cls.xml)	(revision 35936)
+++ vhUnitTest/APPS/Halux/PPS/TBXPers/TestWerkpost.cls.xml	(.../TestWerkpost.cls.xml)	(revision 35957)
@@ -3,22 +3,17 @@
 <Class name="vhUnitTest.APPS.Halux.PPS.TBXPers.TestWerkpost">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.BL.PPS.OptiBox.TestBase</Super>
 
-<Parameter name="SkipTestCase">
-<Type>%Boolean</Type>
-<Default>1</Default>
+<Parameter name="Type">
+<Type>%String</Type>
+<Default>I</Default>
 </Parameter>
 
 <Parameter name="TBXStalenRugBodemGezaagd">
 <Default>1007</Default>
 </Parameter>
 
-<Parameter name="Type">
-<Type>%String</Type>
-<Default>I</Default>
-</Parameter>
-
 <Parameter name="TBXStalenRug">
 <Default>1008</Default>
 </Parameter>
@@ -53,16 +48,15 @@
 
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
-	Do ..MaakData()
 	Do ##super()
+	Do ..MaakData()
 ]]></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>
@@ -76,6 +70,8 @@
 
 <Method name="TestZetStatus">
 <Implementation><![CDATA[
+	quit:$$$Not($$$AssertTrue(..IsOptiboxServerAlive()))
+	
 	#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"))
@@ -114,6 +110,8 @@
 
 <Method name="TestBeschadiging">
 <Implementation><![CDATA[
+	quit:$$$Not($$$AssertTrue(..IsOptiboxServerAlive()))
+	
 	#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"))
@@ -169,16 +167,18 @@
 
 <Method name="TestStilstandLijst">
 <Implementation><![CDATA[
-	#dim DataSet as %XML.DataSet = ..Werkpost.GeefStilstanden()
+	quit:$$$Not($$$AssertTrue(..IsOptiboxServerAlive()))
 	
+	#dim DataSet as %XML.DataSet = ..Werkpost.GeefStilstanden()
 	Do $$$AssertEquals(DataSet.GetColumnCount(), 5, "Stilstandenlijst aantal columns")
 ]]></Implementation>
 </Method>
 
 <Method name="TestHerwerkingLijst">
 <Implementation><![CDATA[
+	quit:$$$Not($$$AssertTrue(..IsOptiboxServerAlive()))
+	
 	#dim DataSet as %XML.DataSet = ..Werkpost.GeefHerwerkingen()
-
 	Do $$$AssertEquals(DataSet.GetColumnCount(), 3, "Herwerkingslijst aantal columns")
 ]]></Implementation>
 </Method>
Index: vhUnitTest/BL/PPS/OL/Inpak/TestInpak.cls.xml
===================================================================
diff -u -r35936 -r35957
--- vhUnitTest/BL/PPS/OL/Inpak/TestInpak.cls.xml	(.../TestInpak.cls.xml)	(revision 35936)
+++ vhUnitTest/BL/PPS/OL/Inpak/TestInpak.cls.xml	(.../Inpak/Test.cls.xml)	(revision 35957)
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhUnitTest.BL.PPS.OL.TestInpak">
-<Description>
-d ##class(vhUnitTest.Manager).RunTest("/debug/display=all","BL.PPS.OL.TestInpak")</Description>
+<Class name="vhUnitTest.BL.PPS.OL.Inpak.Test">
 <IncludeCode>BL.Sys.Proxy</IncludeCode>
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.BL.PPS.OptiBox.TestBase</Super>
 
 <Parameter name="GebruiktVariabeleControle">
 <Default>0</Default>
@@ -40,76 +38,45 @@
 <Private>1</Private>
 </Property>
 
-<Method name="OnAfterAllTests">
-<Implementation><![CDATA[
-	Do ..OpkuisData()
-	Do ..VerwijderBon()
-	Do ..VerwijderConsument()
-	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1018,1022)
-	Do ##super()
-]]></Implementation>
-</Method>
-
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
+	Do ##super()
+	
 	Do ..OpkuisData()
 	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1018,1022)
 	Do ..MaakConsument()	
 	Do ..MaakBon()
 	
-	Set ..BoxData1 =  ..MaakBoxData(1018,"PR",500,600,1)
+	Set ..BoxData1 =  ##class(vhTest.Utils.BL.PPS.OptiBox).MaakBoxData(1018,"PR",500,600,1)
 	Do ..MaakOptiData(1018,"102",..BoxData1)
 	
-	Set ..BoxData2 =  ..MaakBoxData(1018,"PR",500,400,2)
+	Set ..BoxData2 = ##class(vhTest.Utils.BL.PPS.OptiBox).MaakBoxData(1018,"PR",500,400,2)
 	Do ..MaakOptiData(1018,"102",..BoxData2)
 	
 	Set ..BoxDataDoos =  ##class(DS.Prod.OptiBox.BoxData).%OpenId("TAOR indelingen||Overdoos||1") 
 	If ('$IsObject(..BoxDataDoos)) {
 		/// Omdat de unit tests vroeger de vaste Overdoos van TAOR onterecht verwijderden, moet ze op veel omgevingen toch nog éénmalig gemaakt worden.
-		Set ..BoxDataDoos = ..MaakBoxData("Overdoos","TAOR indelingen",500,400,1)
+		Set ..BoxDataDoos = ##class(vhTest.Utils.BL.PPS.OptiBox).MaakBoxData("Overdoos","TAOR indelingen",500,400,1)
 	}
-	
- 	Do ##super()
 ]]></Implementation>
 </Method>
 
-<Method name="OpkuisData">
-<Private>1</Private>
+<Method name="OnAfterAllTests">
 <Implementation><![CDATA[
-	Do ..VerwijderSnijData()
-	Do ..VerwijderOptiData()
-	Do ..VerwijderBoxData()
+	Do ..OpkuisData()
+	Do ..VerwijderBon()
+	Do ..VerwijderConsument()
+	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1018,1022)
+	Do ##super()
 ]]></Implementation>
 </Method>
 
-<Method name="IsOptiboxServerAlive">
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim IsAlive As %Boolean = $$$False
-	
-	Try {
-		Set IsAlive = ##class(BL.Prod.OptiBox.Diverse).%New().IsOptiboxServerAlive(##class(BL.Prod.OptiBox.enu.OptiServer).SmallEnCuts())
-	}
-	Catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		Do $$$AssertTrue(0,Exception.GeefOmschrijving())
-	}
-	Quit IsAlive
-]]></Implementation>
-</Method>
-
 <Method name="TestStartBerekening">
 <Implementation><![CDATA[
 	If $$$AssertTrue(..IsOptiboxServerAlive()) {
 		Set Inpak = ##class(BL.PPS.OL.Inpak).%New()
 		Do $$$AssertEquals(Inpak.StartBerekening(..Bon.GeefID()),$$$pxStatusOK)
-		
-		Do $$$AssertTrue(0,"Als OptiboxDEV Alive is, dan deze UT terug inschakelen: vhUnitTest.APPS.Halux.PPS.TBXPers.TestWerkpost")
 	}
-	Else {
-		Do $$$AssertTrue(0,"Zolang de OptiboxDEV niet Alive is, is de test vhUnitTest.APPS.Halux.PPS.TBXPers.TestWerkpost uitgeschakeld")
-	}
 ]]></Implementation>
 </Method>
 
@@ -375,6 +342,7 @@
 
 <Method name="MaakOptiData">
 <FormalSpec>ProductID:%String,ObjLijnRef:%String,BoxData:DS.Prod.OptiBox.BoxData</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	#dim oOptiData As DS.Prod.OptiBox.OptiData =##class(DS.Prod.OptiBox.OptiData).%New()
 	Set oOptiData.ObjType = "L"
@@ -394,36 +362,12 @@
 ]]></Implementation>
 </Method>
 
-<Method name="MaakBoxData">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>ObjRef:%String,ObjType:%String,BreedteExpressie:%String,DiepteExpressie:%String,CutOrder:%Integer</FormalSpec>
-<ReturnType>DS.Prod.OptiBox.BoxData</ReturnType>
+<Method name="OpkuisData">
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim BoxData As DS.Prod.OptiBox.BoxData = ##class(DS.Prod.OptiBox.BoxData).%New()
-	// ID properties
-	Set BoxData.ObjType = ObjType
-	Set BoxData.ObjRef = ObjRef
-	Set BoxData.CutOrder = CutOrder
-	
-	// Volume properties
-	Set BoxData.Breedte = BreedteExpressie
-	Set BoxData.BreedteExec = BreedteExpressie
-	Set BoxData.DiepteExec = DiepteExpressie
-	Set BoxData.Diepte = DiepteExpressie
-	Set BoxData.Hoogte = "32"
-	Set BoxData.HoogteExec = "32"
-	set BoxData.MaxCombinAantal = 1
-	Set BoxData.Aantal = "Aantal"
-	Set BoxData.AantalExec = "Params(""AANTAL"")"
-	
-	// GetVolume method controleert op het aanwezig zijn van een Meta object, dus dat is nodig.
-	Set BoxData.Meta = ##class(DS.Prod.OptiBox.BoxMeta).%OpenId("471")
-	#dim Status As %Status = BoxData.%Save()
-	If $$$ISERR(Status){
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).SaveFailed(),"MaakBoxData",Status))
-	}	
-	
-	Quit BoxData
+	Do ..VerwijderSnijData()
+	Do ..VerwijderOptiData()
+	Do ..VerwijderBoxData()
 ]]></Implementation>
 </Method>