Index: vhUnitTest/BL/Prod/TestVoorraadInitieleTelling.cls.xml
===================================================================
diff -u -r29059 -r40187
--- vhUnitTest/BL/Prod/TestVoorraadInitieleTelling.cls.xml	(.../TestVoorraadInitieleTelling.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Prod/TestVoorraadInitieleTelling.cls.xml	(.../TestVoorraadInitieleTelling.cls.xml)	(revision 40187)
@@ -19,6 +19,90 @@
 <Default>Initieel 2</Default>
 </Parameter>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+ 	 Do ##super()
+ 	 
+ 	 Do ##class(DS.Prod.VoorraadTelling).%KillExtent()
+]]></Implementation>
+</Method>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	#dim ProductID As %String = 1000
+	#dim MoederProductID1 As %String = 1001
+	#dim MoederProductID2 As %String = 1002
+	#dim KindProductID As %String = 1003	
+	
+	Do ..CleanUpProduct(ProductID)	
+	
+	Set ^PRSTOCK("D",ProductID)	= "19488\\\\1543\934\6141\424\43\0"
+	Set ^KPR(ProductID,0)="358M2702SF Z RE V20WA/G\TANDEMBOX plus, F-design\\\8\\5.5290\C#B\0\\ladeprofiel rechts, staal, 270mm diep\\\393\\\200#200\6\2.5433\\\\\\\\\62311"
+	Set ^KPR(ProductID,1)="1\3\\\\\.5\\2371\\\\474.51\\\\2\\\1\46#0\TANDEMBOX plus, F-design\51#0#49\9#285#0\\\"
+	Set ^KPR(ProductID,2)="\\\\\\\08\0#0\\Z\B\C128\9002617431698\1\800\A;62397,49106\42.9\30\0\3.6\\1880\\0.999.999.0\\61393"
+	#dim Zone As %String = "ZKGVP"
+	Set ^KPR(ProductID,15)=	"\\\\1G\G\\\ST\PR\M\"_Zone_"\"
+	do Gemaakt^PRODUKT2(ProductID)
+	
+	Set Zone = "ZKGVP"
+	/// MoederProducten
+	Do ..CleanUpProduct(1001)	
+	#dim IdentNr As %String = "1.999.999.1"
+	Set ^PRSTOCK("D",1001)="330\\\\91\108\993\0"
+	Set ^KPR(1001,0)="358M3502SF ZA L*2913*WA/G\TANDEMBOX plus F\\\8\\5.5297\C#B\140\\ladeprofiel links, staal, 350mm diep\\\330\\\300#300#0\6\2.3634\\\\\\\\\59417"
+	Set ^KPR(1001,1)="1\3\\\\\.5\\\\\\602.65\\\\2\\\1\48#0\TANDEMBOX plus F\44#0#49\8#263#0\\\"
+	Set ^KPR(1001,2)="\\\\\\\08\140#140#0\\Z\B\C128\9002617532562\1\600\A;62328,58363\42.9\30\0\3.6\\1880\\"_IdentNr_"\\61393"
+	Set ^KPR(1001,15)=	"\\\\1G\G\\\ST\PR\M\"_Zone_"\"
+	Set ^KPR2($TR(IdentNr,".")_" ")	= "1001\"_IdentNr
+	
+	Do ..CleanUpProduct(1002)	
+	Set IdentNr = "2.999.999.1"
+	Set ^PRSTOCK("D",1002)="1034\\\\10\105"
+	Set ^KPR(1002,0)="358M3502SF Z LI*7608*WA/G\TANDEMBOX plus F\\\8\\5.5288\B#A\0\\ladeprofiel links, staal, 350mm diep\\\1034\\\600#600#\6\2.1916\\\\\\\\\60584"
+	Set ^KPR(1002,1)="1\3\\\\\.5\\\\\\602.65\\\\2\\\1\178#0\TANDEMBOX plus F\197#0#49\9#1074#0\\\"
+	Set ^KPR(1002,2)="\\\\\\\08\0#0\\Z\B\C128\9002617532562\1\600\A;62328,58476\42.9\30\0\3.6\\1880\\"_IdentNr_"\\61393"
+	Set ^KPR(1002,15)=	"\\\\1G\G\\\ST\PR\M\"_Zone_"\"	
+	Set ^KPR2($TR(IdentNr,".")_" ")	= "1002\"_IdentNr
+	
+	/// KindProduct
+	Do ..CleanUpProduct(1003)	
+	Set IdentNr = "0.999.999.1"
+	Set ^PRSTOCK("D",1003)="1364\\\\\0\\"
+	Set ^KPR(1003,0)="358M3502SF ZAR L *KP*WA/G\Tandembox PLUS F\\\8\\0.0000\C#C\140\\ladeprofiel links, staal, 350mm diep\\\1364\\\\6\0.0000\\\\K\\\\\59207"
+	Set ^KPR(1003,1)="1\3\\\\\.5\\\\\\602.65\\\\\\\\\Tandembox PLUS F\\2#155#0\\\"
+	Set ^KPR(1003,2)="\\\\\\\08\\\Z\B\C128\9002617532562\1\600\A;61657,35491\42.9\30\0\3.6\\1880\\"_IdentNr_"\\"
+	Set ^KPR(1003,15)=	"\\\\1G\G\\\ST\PR\M\"_Zone_"\"
+	Set ^KPR2($TR(IdentNr,".")_" ")	= "1003\"_IdentNr
+	
+	Set ..blVoorraadTelling = ##class(vhUnitTest.BL.Prod.VoorraadTellingMock).%New()
+	Do ..blVoorraadTelling.Init($j)
+	Do ..blVoorraadTelling.AddProduct(ProductID,0)
+	Do ..blVoorraadTelling.AddProduct(MoederProductID1,0)
+	Do ..blVoorraadTelling.AddProduct(MoederProductID2,0)
+	Do ..blVoorraadTelling.AddProduct(KindProductID,0)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim ProductID As %String = 1000
+	#dim MoederProductID1 As %String = 1001
+	#dim MoederProductID2 As %String = 1002
+	#dim KindProductID As %String = 1003	
+	
+	Do ..CleanUpProduct(ProductID)	
+	Do ..CleanUpProduct(MoederProductID1)	
+	Do ..CleanUpProduct(MoederProductID2)	
+	Do ..CleanUpProduct(KindProductID)	
+	
+	Do ##super(aTestName)
+]]></Implementation>
+</Method>
+
 <Method name="TestInitieleTellingenVerschillend-&gt;DanStatusHertelling">
 <Implementation><![CDATA[
 	#dim ProductID As %String = 1000	
@@ -247,84 +331,8 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeOneTest">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	#dim ProductID As %String = 1000
-	#dim MoederProductID1 As %String = 1001
-	#dim MoederProductID2 As %String = 1002
-	#dim KindProductID As %String = 1003	
-	
-	Do ..CleanUpProduct(ProductID)	
-	
-	Set ^PRSTOCK("D",ProductID)	= "19488\\\\1543\934\6141\424\43\0"
-	Set ^KPR(ProductID,0)="358M2702SF Z RE V20WA/G\TANDEMBOX plus, F-design\\\8\\5.5290\C#B\0\\ladeprofiel rechts, staal, 270mm diep\\\393\\\200#200\6\2.5433\\\\\\\\\62311"
-	Set ^KPR(ProductID,1)="1\3\\\\\.5\\2371\\\\474.51\\\\2\\\1\46#0\TANDEMBOX plus, F-design\51#0#49\9#285#0\\\"
-	Set ^KPR(ProductID,2)="\\\\\\\08\0#0\\Z\B\C128\9002617431698\1\800\A;62397,49106\42.9\30\0\3.6\\1880\\0.999.999.0\\61393"
-	#dim Zone As %String = "ZKGVP"
-	Set ^KPR(ProductID,15)=	"\\\\1G\G\\\ST\PR\M\"_Zone_"\"
-	do Gemaakt^PRODUKT2(ProductID)
-	
-	Set Zone = "ZKGVP"
-	/// MoederProducten
-	Do ..CleanUpProduct(1001)	
-	#dim IdentNr As %String = "1.999.999.1"
-	Set ^PRSTOCK("D",1001)="330\\\\91\108\993\0"
-	Set ^KPR(1001,0)="358M3502SF ZA L*2913*WA/G\TANDEMBOX plus F\\\8\\5.5297\C#B\140\\ladeprofiel links, staal, 350mm diep\\\330\\\300#300#0\6\2.3634\\\\\\\\\59417"
-	Set ^KPR(1001,1)="1\3\\\\\.5\\\\\\602.65\\\\2\\\1\48#0\TANDEMBOX plus F\44#0#49\8#263#0\\\"
-	Set ^KPR(1001,2)="\\\\\\\08\140#140#0\\Z\B\C128\9002617532562\1\600\A;62328,58363\42.9\30\0\3.6\\1880\\"_IdentNr_"\\61393"
-	Set ^KPR(1001,15)=	"\\\\1G\G\\\ST\PR\M\"_Zone_"\"
-	Set ^KPR2($TR(IdentNr,".")_" ")	= "1001\"_IdentNr
-	
-	Do ..CleanUpProduct(1002)	
-	Set IdentNr = "2.999.999.1"
-	Set ^PRSTOCK("D",1002)="1034\\\\10\105"
-	Set ^KPR(1002,0)="358M3502SF Z LI*7608*WA/G\TANDEMBOX plus F\\\8\\5.5288\B#A\0\\ladeprofiel links, staal, 350mm diep\\\1034\\\600#600#\6\2.1916\\\\\\\\\60584"
-	Set ^KPR(1002,1)="1\3\\\\\.5\\\\\\602.65\\\\2\\\1\178#0\TANDEMBOX plus F\197#0#49\9#1074#0\\\"
-	Set ^KPR(1002,2)="\\\\\\\08\0#0\\Z\B\C128\9002617532562\1\600\A;62328,58476\42.9\30\0\3.6\\1880\\"_IdentNr_"\\61393"
-	Set ^KPR(1002,15)=	"\\\\1G\G\\\ST\PR\M\"_Zone_"\"	
-	Set ^KPR2($TR(IdentNr,".")_" ")	= "1002\"_IdentNr
-	
-	/// KindProduct
-	Do ..CleanUpProduct(1003)	
-	Set IdentNr = "0.999.999.1"
-	Set ^PRSTOCK("D",1003)="1364\\\\\0\\"
-	Set ^KPR(1003,0)="358M3502SF ZAR L *KP*WA/G\Tandembox PLUS F\\\8\\0.0000\C#C\140\\ladeprofiel links, staal, 350mm diep\\\1364\\\\6\0.0000\\\\K\\\\\59207"
-	Set ^KPR(1003,1)="1\3\\\\\.5\\\\\\602.65\\\\\\\\\Tandembox PLUS F\\2#155#0\\\"
-	Set ^KPR(1003,2)="\\\\\\\08\\\Z\B\C128\9002617532562\1\600\A;61657,35491\42.9\30\0\3.6\\1880\\"_IdentNr_"\\"
-	Set ^KPR(1003,15)=	"\\\\1G\G\\\ST\PR\M\"_Zone_"\"
-	Set ^KPR2($TR(IdentNr,".")_" ")	= "1003\"_IdentNr
-	
-	Set ..blVoorraadTelling = ##class(vhUnitTest.BL.Prod.VoorraadTellingMock).%New()
-	Do ..blVoorraadTelling.Init($j)
-	Do ..blVoorraadTelling.AddProduct(ProductID,0)
-	Do ..blVoorraadTelling.AddProduct(MoederProductID1,0)
-	Do ..blVoorraadTelling.AddProduct(MoederProductID2,0)
-	Do ..blVoorraadTelling.AddProduct(KindProductID,0)
-	
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterOneTest">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	#dim ProductID As %String = 1000
-	#dim MoederProductID1 As %String = 1001
-	#dim MoederProductID2 As %String = 1002
-	#dim KindProductID As %String = 1003	
-	
-	Do ..CleanUpProduct(ProductID)	
-	Do ..CleanUpProduct(MoederProductID1)	
-	Do ..CleanUpProduct(MoederProductID2)	
-	Do ..CleanUpProduct(KindProductID)	
-	
- 	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="CleanUpProduct">
-<FormalSpec>ProductID</FormalSpec>
+<FormalSpec>ProductID:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	Kill ^KPR2($P($G(^KPR(ProductID,2)),"\",25)_" ")
@@ -337,14 +345,6 @@
 	}
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
- 	 Do ##class(DS.Prod.VoorraadTelling).%KillExtent()
- 	 Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>