Index: vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml
===================================================================
diff -u -r51475 -r51921
--- vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 51475)
+++ vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 51921)
@@ -8,6 +8,11 @@
 <Default>1000</Default>
 </Parameter>
 
+<Parameter name="AndereJNode">
+<Type>%String</Type>
+<Default>J1234</Default>
+</Parameter>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -174,6 +179,75 @@
 	Do Product.Save()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Als de LeverancierId wijzigt worden alle J-nodes niet-conform de nieuwe LeverancierId verwijderd">
+<Implementation><![CDATA[
+	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProduct(..#ProductId)
+	
+	#dim EventRaiserSpy As vhTest.Spy.TECH.PubSub.EventRaiser = ##class(vhTest.Spy.TECH.PubSub.EventRaiser).PushedInstance()
+	
+	Do ..AssertAantalJNodes(1)
+	
+	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New()
+	Do Product.Open(..#ProductId)
+	
+	#dim LeverancierId As DOM.common.PartijID = "L||"_$Extract(..#AndereJNode,2,*)
+	Do Product.ZetLeverancierId(LeverancierId)
+	Do Product.Save()
+	
+	Do $$$AssertEquals(EventRaiserSpy.IsEventGeraised("AdministratiefProductGewijzigdEvent"),"")
+	
+	Do ..AssertAantalJNodes(1)
+	Do $$$AssertTrue($Data(^KPR(..#ProductId,..#AndereJNode)))
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als de LeverancierId niet wijzigt blijft de bestaande J-node in gebruik">
+<Implementation><![CDATA[
+	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProduct(..#ProductId)
+	
+	#dim EventRaiserSpy As vhTest.Spy.TECH.PubSub.EventRaiser = ##class(vhTest.Spy.TECH.PubSub.EventRaiser).PushedInstance()
+	
+	Do ..AssertAantalJNodes(1)
+	
+	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New()
+	Do Product.Open(..#ProductId)
+	
+	Do Product.ZetAantalInGrootVerpakking("AnderAantal")
+	Do Product.Save()
+	
+	Do $$$AssertEquals(EventRaiserSpy.IsEventGeraised("AdministratiefProductGewijzigdEvent"),"")
+	
+	Do ..AssertAantalJNodes(1)
+	Do $$$AssertTrue($Data(^KPR(..#ProductId,"J5005")))
+]]></Implementation>
+</Method>
+
+<Method name="AssertAantalJNodes">
+<FormalSpec>AssertAantalJNodes:%Integer</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim WerkelijkAantalJNodes As %Integer = ..GeefAantalJNodes()
+	
+	Do $$$AssertEquals(AssertAantalJNodes,WerkelijkAantalJNodes)
+]]></Implementation>
+</Method>
+
+<Method name="GeefAantalJNodes">
+<Private>1</Private>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	#dim AantalJNodes As %Integer = 0
+	#dim LevNode As %String = "J"
+	
+    For { 
+        Set LevNode = $Order(^KPR(..#ProductId,LevNode))  Quit:(LevNode'?1"J".E)
+        Set AantalJNodes = AantalJNodes + 1
+    }
+    
+    Quit AantalJNodes
+]]></Implementation>
+</Method>
 </Class>