Index: vhTest/Integratie/Productie/Setup/TestTemplate.cls.xml
===================================================================
diff -u -r73024 -r73025
--- vhTest/Integratie/Productie/Setup/TestTemplate.cls.xml	(.../TestTemplate.cls.xml)	(revision 73024)
+++ vhTest/Integratie/Productie/Setup/TestTemplate.cls.xml	(.../TestTemplate.cls.xml)	(revision 73025)
@@ -47,14 +47,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="VhConfigRepository">
+<Type>APPS.PM.Maatwerk.impl.VhConfigRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>AManager:Tools.Test.Manager</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	#dim Status As %String = ##super(.AManager)
-	set ..ToeleveringLCS = ##class(APPS.AKP.ToeleveringLevenCyclusService).%New()
-	set ..OrderLCS = ##class(APPS.VKP.OrderLevenCyclusService).%New()
-	quit Status
+	Set ..ToeleveringLCS = ##class(APPS.AKP.ToeleveringLevenCyclusService).%New()
+	Set ..OrderLCS = ##class(APPS.VKP.OrderLevenCyclusService).%New()
+	Set ..VhConfigRepository = ##class(APPS.PM.Maatwerk.impl.VhConfigRepository).%New()
+	
+	Quit Status
 ]]></Implementation>
 </Method>
 
@@ -104,18 +111,24 @@
 <Implementation><![CDATA[
 	#dim Toeleveringen As DOM.AKP.ToeleveringLijst = ##class(DOM.AKP.ToeleveringLijst).%New()
 	
-	Set ..ProductenPerToeleveringArray = ..GeefProductenPerToeleveringArray()
-	#dim ToeleveringenIterator = ##class(TECH.ListIterator).%New(..ProductenPerToeleveringArray)
-	
-	While ToeleveringenIterator.HasNext() {
-		#dim Producten As list of ProductInfo = ToeleveringenIterator.Next()
-		#dim ToeleveringID As %String = ToeleveringenIterator.Key()
-		#dim OrderID As %String = "3"_$extract(ToeleveringID,2,*)
+	Try {
+		Set ..ProductenPerToeleveringArray = ..GeefProductenPerToeleveringArray()
+		#dim ToeleveringenIterator = ##class(TECH.ListIterator).%New(..ProductenPerToeleveringArray)
 		
-		Do ..MaakOrder(OrderID,Producten)
-		#dim Toelevering As DOM.AKP.Toelevering = ..MaakToelevering(ToeleveringID,Producten,OrderID)
-		Do ..KoppelOrderLijnenAanToelevering(Toelevering,OrderID)
-		Do Toeleveringen.Insert(Toelevering)
+		While ToeleveringenIterator.HasNext() {
+			#dim Producten As list of ProductInfo = ToeleveringenIterator.Next()
+			#dim ToeleveringID As %String = ToeleveringenIterator.Key()
+			#dim OrderID As %String = "3"_$extract(ToeleveringID,2,*)
+			
+			Do ..MaakOrder(OrderID,Producten)
+			#dim Toelevering As DOM.AKP.Toelevering = ..MaakToelevering(ToeleveringID,Producten,OrderID)
+			Do ..KoppelOrderLijnenAanToelevering(Toelevering,OrderID)
+			Do Toeleveringen.Insert(Toelevering)
+		}	
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ..VhConfigRepository.VerwijderTestData()
+		Do Exception.Throw()
 	}
 	
 	Quit Toeleveringen