Index: vhUnitTest/APPS/PM/TestEANCodeService.cls.xml
===================================================================
diff -u -r38760 -r38765
--- vhUnitTest/APPS/PM/TestEANCodeService.cls.xml	(.../TestEANCodeService.cls.xml)	(revision 38760)
+++ vhUnitTest/APPS/PM/TestEANCodeService.cls.xml	(.../TestEANCodeService.cls.xml)	(revision 38765)
@@ -19,65 +19,47 @@
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigOK">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1000)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,1, "De waarde is correct (ID:1000)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1000, 1)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigBeperktActief">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1001)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,0, "De waarde is correct (ID:1001)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1001, 0)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigNietActief">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1002)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,0, "De waarde is correct (ID:1002)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1002, 0)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigGenerischAfgeleidStandaard">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1003)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,0, "De waarde is correct (ID:1003)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1003, 0)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigGenerischAfgeleidUitzonderlijkeClassificatie">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1006)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,1, "De waarde is correct (ID:1006)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1006, 1)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigAlsEANCodeReedsAanwezig">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1004)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,0, "De waarde is correct (ID:1004)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1004, 0)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigClassifZonderEAN">
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1005, 0)
+]]></Implementation>
+</Method>
+
+<Method name="AssertIsNieuweEANCodeNodig">
+<FormalSpec>ProductID:%String,VerwachteNoodAanEANCode:%Boolean</FormalSpec>
 <Implementation><![CDATA[
 	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1005)
+	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(ProductID)
 	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,0, "De waarde is correct (ID:1005)")
+	Do $$$AssertEquals(IsNieuweEANCodeNodig, VerwachteNoodAanEANCode, "De waarde is correct (ID:" _ ProductID _ ")")
 ]]></Implementation>
 </Method>
 </Class>