Index: vhUnitTest/DOM/PM/TestProductBeheerAPI.cls.xml
===================================================================
diff -u -r35039 -r35115
--- vhUnitTest/DOM/PM/TestProductBeheerAPI.cls.xml	(.../TestProductBeheerAPI.cls.xml)	(revision 35039)
+++ vhUnitTest/DOM/PM/TestProductBeheerAPI.cls.xml	(.../TestProductBeheerAPI.cls.xml)	(revision 35115)
@@ -90,60 +90,6 @@
 	Do $$$AssertEquals(ProductTypeAPI.GeefProductType($$$SpaceTowerProductID),##class(DOM.PM.enu.ProductType).Onbepaald())
 ]]></Implementation>
 </Method>
-
-<Method name="Test product zonder moeders is geen lade van Space Tower">
-<Implementation><![CDATA[
-	#dim ProductMockZonderMoeders As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-	Do ProductMockZonderMoeders.IndienMethodCall("GeefMoederProductenIterator").DanReturn( ##class(TECH.ListIterator).%New(##class(%ListOfObjects).%New()) )
-	
-	#dim ProductAPIMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
-	Do ProductAPIMock.IndienMethodCall("GeefProduct",100).DanReturn(ProductMockZonderMoeders)
-	
-	#dim ProductTypeAPI As DOM.PM.ProductTypeAPI = ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI()
-	
-	Do $$$AssertFalse(ProductTypeAPI.IsLadeVanSpaceTowerProduct(100))
-]]></Implementation>
-</Method>
-
-<Method name="Test product met niet-spacetower-moeder is geen lade van Space Tower">
-<Implementation><![CDATA[
-	#dim ProductTypeAPI As DOM.PM.ProductTypeAPI = ..SetupProductEnMoederEnGeefProductAPIUnderTest()
-	
-	#dim ProductTypeAPIMock As vhTest.Mock.DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).MockInstance()
-	Do ProductTypeAPIMock.IndienMethodCall("IsSpaceTowerProduct",101).DanReturn(0)
-	
-	Do $$$AssertFalse(ProductTypeAPI.IsLadeVanSpaceTowerProduct(100))
-]]></Implementation>
-</Method>
-
-<Method name="Test product met wél-spacetower-moeder is wél lade van Space Tower">
-<Implementation><![CDATA[
-	#dim ProductTypeAPI As DOM.PM.ProductTypeAPI = ..SetupProductEnMoederEnGeefProductAPIUnderTest()
-	
-	#dim ProductTypeAPIMock As vhTest.Mock.DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).MockInstance()
-	Do ProductTypeAPIMock.IndienMethodCall("IsSpaceTowerProduct",101).DanReturn(1)
-	
-	Do $$$AssertTrue(ProductTypeAPI.IsLadeVanSpaceTowerProduct(100))
-]]></Implementation>
-</Method>
-
-<Method name="SetupProductEnMoederEnGeefProductAPIUnderTest">
-<Implementation><![CDATA[
-	#dim ProductTypeAPI As DOM.PM.ProductTypeAPI = ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI()
-	
-	#dim NietSpaceTowerMoeder As vhTest.Mock.DOM.PM.SamengesteldProduct = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New()
-	Do NietSpaceTowerMoeder.IndienMethodCall("GeefID").DanReturn( 101 )
-	
-	#dim ProductMock As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-	Do ProductMock.IndienMethodCall("GeefMoederProductenIterator").DanReturn( ##class(TECH.ListUtils).CreateIteratorOfObjects(NietSpaceTowerMoeder) )
-	
-	#dim ProductAPIMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
-	Do ProductAPIMock.IndienMethodCall("GeefProduct",100).DanReturn(ProductMock)
-	Do ProductAPIMock.IndienMethodCall("BestaatProduct",101).DanReturn(1)
-	
-	Quit ProductTypeAPI
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/DOM/PM/TestProductBeheerAPI/IsLadeVanSpaceTowerProduct.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/PM/TestProductBeheerAPI/IsLadeVanSpaceTowerProduct.cls.xml	(revision 0)
+++ vhUnitTest/DOM/PM/TestProductBeheerAPI/IsLadeVanSpaceTowerProduct.cls.xml	(revision 35115)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.PM.TestProductBeheerAPI.IsLadeVanSpaceTowerProduct">
+<Description>
+Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.PM.TestProductBeheerAPI")</Description>
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="GetestProduct">
+<Type>%String</Type>
+<Default>100</Default>
+</Parameter>
+
+<Parameter name="MoederVanGetestProduct">
+<Type>%String</Type>
+<Default>101</Default>
+</Parameter>
+
+<Property name="ProductTypeAPI">
+<Type>DOM.PM.ProductTypeAPI</Type>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	do ##super(aTestName)
+	Set ..ProductTypeAPI = ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI()
+]]></Implementation>
+</Method>
+
+<Method name="Test product zonder moeders is geen lade van Space Tower">
+<Implementation><![CDATA[
+	#dim ProductMockZonderMoeders As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Do ProductMockZonderMoeders.IndienMethodCall("GeefMoederProductenIterator").DanReturn( ##class(TECH.ListIterator).%New(##class(%ListOfObjects).%New()) )
+	
+	#dim ProductAPIMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	Do ProductAPIMock.IndienMethodCall("GeefProduct",..#GetestProduct).DanReturn(ProductMockZonderMoeders)
+		
+	Do $$$AssertFalse(..ProductTypeAPI.IsLadeVanSpaceTowerProduct(..#GetestProduct))
+]]></Implementation>
+</Method>
+
+<Method name="Test product met niet-spacetower-moeder is geen lade van Space Tower">
+<Implementation><![CDATA[
+	Do ..SetupProductEnMoederEnGeefProductAPIUnderTest()
+	
+	#dim ProductTypeAPIMock As vhTest.Mock.DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).MockInstance()
+	Do ProductTypeAPIMock.IndienMethodCall("IsSpaceTowerProduct",..#MoederVanGetestProduct).DanReturn($$$False)
+	
+	Do $$$AssertFalse(..ProductTypeAPI.IsLadeVanSpaceTowerProduct(..#GetestProduct))
+]]></Implementation>
+</Method>
+
+<Method name="Test product met wél-spacetower-moeder is wél lade van Space Tower">
+<Implementation><![CDATA[
+	Do ..SetupProductEnMoederEnGeefProductAPIUnderTest()
+	
+	#dim ProductTypeAPIMock As vhTest.Mock.DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).MockInstance()
+	Do ProductTypeAPIMock.IndienMethodCall("IsSpaceTowerProduct",..#MoederVanGetestProduct).DanReturn($$$True)
+	
+	Do $$$AssertTrue(..ProductTypeAPI.IsLadeVanSpaceTowerProduct(..#GetestProduct))
+]]></Implementation>
+</Method>
+
+<Method name="SetupProductEnMoederEnGeefProductAPIUnderTest">
+<Implementation><![CDATA[
+	#dim NietSpaceTowerMoeder As vhTest.Mock.DOM.PM.SamengesteldProduct = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New()
+	Do NietSpaceTowerMoeder.IndienMethodCall("GeefID").DanReturn( ..#MoederVanGetestProduct )
+	
+	#dim ProductMock As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Do ProductMock.IndienMethodCall("GeefMoederProductenIterator").DanReturn( ##class(TECH.ListUtils).CreateIteratorOfObjects(NietSpaceTowerMoeder) )
+	
+	#dim ProductAPIMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	Do ProductAPIMock.IndienMethodCall("GeefProduct",..#GetestProduct).DanReturn(ProductMock)
+	Do ProductAPIMock.IndienMethodCall("BestaatProduct",..#MoederVanGetestProduct).DanReturn($$$True)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>