Index: vhUnitTest/BL/Prod/OptiBox/TestHergroepeerVerzameldozen.cls.xml
===================================================================
diff -u -r29059 -r40123
--- vhUnitTest/BL/Prod/OptiBox/TestHergroepeerVerzameldozen.cls.xml	(.../TestHergroepeerVerzameldozen.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Prod/OptiBox/TestHergroepeerVerzameldozen.cls.xml	(.../TestHergroepeerVerzameldozen.cls.xml)	(revision 40123)
@@ -26,23 +26,22 @@
 
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super(aTestName)
+	
 	Set ..Optimizer = ##class(BL.Prod.OptiBox.Optimize).%New()
-	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Do ..SQL("DELETE FROM Prod.OptiBox_SnijData WHERE OptiData IN (SELECT ID FROM Prod.OptiBox_OptiData WHERE ObjRef = ?)", $ListBuild(..#VerzameldoosOptiDataRef))
 	Do ..SQL("DELETE FROM Prod.OptiBox_SnijData WHERE OptiData IN (SELECT ID FROM Prod.OptiBox_OptiData WHERE ObjRef = ?)", $ListBuild(..#DeelVolumeOptiDataRef))
-	Do ..SQL("DELETE FROM Prod.OptiBox_OptiData WHERE ObjRef = ?", $ListBuild(VerzameldoosOptiDataRef))
-	Do ..SQL("DELETE FROM Prod.OptiBox_OptiData WHERE ObjRef = ?", $ListBuild(DeelVolumeOptiDataRef))
+	Do ..SQL("DELETE FROM Prod.OptiBox_OptiData WHERE ObjRef = ?", $ListBuild(..#VerzameldoosOptiDataRef))
+	Do ..SQL("DELETE FROM Prod.OptiBox_OptiData WHERE ObjRef = ?", $ListBuild(..#DeelVolumeOptiDataRef))
 	
-	Quit $$$OK
+	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
@@ -51,15 +50,15 @@
 	// SETUP	
 	// Insert Verzameldoos-OptiData record
 	Do ..SQL("INSERT INTO Prod.OptiBox_OptiData (ObjRef) VALUES (?)",$ListBuild(..#VerzameldoosOptiDataRef))
-	Set VerzameldoosOptiDataID = ..SQLScalar("SELECT ID FROM Prod.OptiBox_OptiData WHERE ObjRef=?", $ListBuild(..#VerzameldoosOptiDataRef))
+	#dim VerzameldoosOptiDataID As %String = ..SQLScalar("SELECT ID FROM Prod.OptiBox_OptiData WHERE ObjRef=?", $ListBuild(..#VerzameldoosOptiDataRef))
 
 	// Insert deelvolume-OptiData record
 	Do ..SQL("INSERT INTO Prod.OptiBox_OptiData (ObjRef) VALUES (?)", $ListBuild(..#DeelVolumeOptiDataRef))
-	Set DeelVolumeOptiDataID = ..SQLScalar("SELECT ID FROM Prod.OptiBox_OptiData WHERE ObjRef=?", $ListBuild(..#DeelVolumeOptiDataRef))
+	#dim DeelVolumeOptiDataID As %String = ..SQLScalar("SELECT ID FROM Prod.OptiBox_OptiData WHERE ObjRef=?", $ListBuild(..#DeelVolumeOptiDataRef))
 	
 	// Insert Verzameldoos-SnijData record
 	Do ..SQL("INSERT INTO Prod.OptiBox_SnijData (OptiData, OptiID) VALUES (?, ?)", $ListBuild(VerzameldoosOptiDataID, ..#OptimalisatieID))
-	Set VerzameldoosSnijDataID = ..SQLScalar("SELECT ID1 AS ID FROM Prod.OptiBox_SnijData WHERE OptiData=?", $ListBuild(VerzameldoosOptiDataID))
+	#dim VerzameldoosSnijDataID As %String = ..SQLScalar("SELECT ID1 AS ID FROM Prod.OptiBox_SnijData WHERE OptiData=?", $ListBuild(VerzameldoosOptiDataID))
 	
 	// Insert Deelvolume-SnijData record
 	#dim DeelVolumeReference = "L." _ ..#VerzameldoosOptiDataRef _ ".optidatanr." _ VerzameldoosOptiDataID
@@ -71,19 +70,17 @@
 	
 	
 	// CONTROLE
-	Set DeelVolumeSnijDataParent = ..SQLScalar("SELECT Parent AS ID FROM Prod.OptiBox_SnijData WHERE ParentOptiDataViaReference = ?", $ListBuild(VerzameldoosOptiDataID))
+	#dim DeelVolumeSnijDataParent As %String = ..SQLScalar("SELECT Parent AS ID FROM Prod.OptiBox_SnijData WHERE ParentOptiDataViaReference = ?", $ListBuild(VerzameldoosOptiDataID))
 	Do $$$AssertEquals(DeelVolumeSnijDataParent, VerzameldoosSnijDataID)
 	
-	Set DeelVolumeSnijDataBoxParent = ..SQLScalar("SELECT BoxParent AS ID FROM Prod.OptiBox_SnijData WHERE ParentOptiDataViaReference = ?", $ListBuild(VerzameldoosOptiDataID))
+	#dim DeelVolumeSnijDataBoxParent As %String = ..SQLScalar("SELECT BoxParent AS ID FROM Prod.OptiBox_SnijData WHERE ParentOptiDataViaReference = ?", $ListBuild(VerzameldoosOptiDataID))
 	Do $$$AssertEquals(DeelVolumeSnijDataBoxParent, VerzameldoosSnijDataID)
 	
-	Set JuistePPSGroepEnSubgroepGevonden = ..SQLScalar("SELECT '1' AS ID FROM Prod.OptiBox_SnijData WHERE ID1=? AND PPSGroep='OL' AND PPSSubgroep='PRODUCT'", $ListBuild(VerzameldoosSnijDataID))
+	#dim JuistePPSGroepEnSubgroepGevonden As %String = ..SQLScalar("SELECT '1' AS ID FROM Prod.OptiBox_SnijData WHERE ID1=? AND PPSGroep='OL' AND PPSSubgroep='PRODUCT'", $ListBuild(VerzameldoosSnijDataID))
 	Do $$$AssertEquals(1, JuistePPSGroepEnSubgroepGevonden)
 	
-	Set DeelVolumeOptiDataParentID = ..SQLScalar("SELECT Parent AS ID FROM Prod.OptiBox_OptiData WHERE ObjRef=?", $ListBuild(..#DeelVolumeOptiDataRef))
+	#dim DeelVolumeOptiDataParentID As %String = ..SQLScalar("SELECT Parent AS ID FROM Prod.OptiBox_OptiData WHERE ObjRef=?", $ListBuild(..#DeelVolumeOptiDataRef))
 	Do $$$AssertEquals(VerzameldoosOptiDataID, DeelVolumeOptiDataParentID)
-	
-	Quit $$$OK
 ]]></Implementation>
 </Method>