Index: vhUnitTest/APPS/PM/Maatwerk/impl/BerekeningServiceProduct/TbxHelper/StelInProductDataOpGADataProduct/Test.cls.xml
===================================================================
diff -u -r58663 -r58665
--- vhUnitTest/APPS/PM/Maatwerk/impl/BerekeningServiceProduct/TbxHelper/StelInProductDataOpGADataProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 58663)
+++ vhUnitTest/APPS/PM/Maatwerk/impl/BerekeningServiceProduct/TbxHelper/StelInProductDataOpGADataProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 58665)
@@ -10,11 +10,7 @@
 	Set GADataProduct.Dossier = "DummyDossierCode"
 	#dim BuildOpties As %String = $$$DummyString _ ";ProductId="_"NewProductId"_";DossierCode="_"NewDossierCode"_";"
 	
-	Set TbxHelper = ##class(APPS.PM.Maatwerk.impl.BerekeningServiceProduct.TbxHelper).%New()
-	Do TbxHelper.StelInProductDataOpGADataProduct(GADataProduct, BuildOpties)
-	
-	Do $$$AssertEquals(GADataProduct.ProductGetObjectId(),"NewProductId")
-	Do $$$AssertEquals(GADataProduct.Dossier,"NewDossierCode")
+	Do ..AssertGADataProduct(GADataProduct, BuildOpties, "NewProductId", "NewDossierCode")
 ]]></Implementation>
 </Method>
 
@@ -23,11 +19,7 @@
 	Set GADataProduct = ##class(Prod.GAData.Product).%New()
 	#dim BuildOpties As %String = $$$DummyString
 	
-	Set TbxHelper = ##class(APPS.PM.Maatwerk.impl.BerekeningServiceProduct.TbxHelper).%New()
-	Do TbxHelper.StelInProductDataOpGADataProduct(GADataProduct, BuildOpties)
-	
-	Do $$$AssertEquals(GADataProduct.ProductGetObjectId(),"")
-	Do $$$AssertEquals(GADataProduct.Dossier,"")
+	Do ..AssertGADataProduct(GADataProduct, BuildOpties, "", "")
 ]]></Implementation>
 </Method>
 
@@ -38,11 +30,7 @@
 	Set GADataProduct.Dossier = "DummyDossierCode"
 	#dim BuildOpties As %String = $$$DummyString
 	
-	Set TbxHelper = ##class(APPS.PM.Maatwerk.impl.BerekeningServiceProduct.TbxHelper).%New()
-	Do TbxHelper.StelInProductDataOpGADataProduct(GADataProduct, BuildOpties)
-	
-	Do $$$AssertEquals(GADataProduct.ProductGetObjectId(),"DummyProductId")
-	Do $$$AssertEquals(GADataProduct.Dossier,"DummyDossierCode")
+	Do ..AssertGADataProduct(GADataProduct, BuildOpties, "DummyProductId", "DummyDossierCode")
 ]]></Implementation>
 </Method>
 
@@ -53,11 +41,19 @@
 	Set GADataProduct.Dossier = "DummyDossierCode"
 	#dim BuildOpties As %String = $$$DummyString _ ";ProductId="_""_";DossierCode="_""_";"
 	
+	Do ..AssertGADataProduct(GADataProduct, BuildOpties, "", "")
+]]></Implementation>
+</Method>
+
+<Method name="AssertGADataProduct">
+<FormalSpec>GADataProduct:Prod.GAData.Product,BuildOpties:%String,VerwachteProductId:%String,VerwachteDossierCode:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
 	Set TbxHelper = ##class(APPS.PM.Maatwerk.impl.BerekeningServiceProduct.TbxHelper).%New()
 	Do TbxHelper.StelInProductDataOpGADataProduct(GADataProduct, BuildOpties)
 	
-	Do $$$AssertEquals(GADataProduct.ProductGetObjectId(),"")
-	Do $$$AssertEquals(GADataProduct.Dossier,"")
+	Do $$$AssertEquals(GADataProduct.ProductGetObjectId(), VerwachteProductId)
+	Do $$$AssertEquals(GADataProduct.Dossier, VerwachteDossierCode)
 ]]></Implementation>
 </Method>
 </Class>