Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/MaakBoringSpecialeVorm/Test.cls.xml
===================================================================
diff -u -r60208 -r60229
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/MaakBoringSpecialeVorm/Test.cls.xml	(.../Test.cls.xml)	(revision 60208)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/MaakBoringSpecialeVorm/Test.cls.xml	(.../Test.cls.xml)	(revision 60229)
@@ -21,44 +21,109 @@
 ]]></Implementation>
 </Method>
 
-<Method name="aTest SDxFREES 90 ">
+<Method name="Test SDxFREES 90 ">
 <Implementation><![CDATA[
-	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New("SD30",350,450,90)
+	Set CoordinatesList = ##class(%ListOfObjects).%New()
+	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",435,337.9,30,30,.28,12.1,29.72,12.1).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPath", CoordinatesList,1).DanReturn(Path)
+	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
+		
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30",350,450,90)
+	
+	Do CoordinatesServiceMock.Verifieer()
+	Do BasisElementFactoryMock.Verifieer()
+	
+	
 	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
 ]]></Implementation>
 </Method>
 
-<Method name="aTest SDxFREES 180 ">
+<Method name="Test SDxFREES 180 ">
 <Implementation><![CDATA[
-	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New("SD30",350,450,180)
+	Set CoordinatesList = ##class(%ListOfObjects).%New()
+	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",337.9,435,30,30,17.9,.28,17.9,29.72).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPath", CoordinatesList,1).DanReturn(Path)
+	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
+	
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30",350,450,180)
+
+	Do CoordinatesServiceMock.Verifieer()
+	Do BasisElementFactoryMock.Verifieer()
 	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
 ]]></Implementation>
 </Method>
 
-<Method name="aTest SDxFREES 270 ">
+<Method name="Test SDxFREES 270 ">
 <Implementation><![CDATA[
-	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New("SD30",350,450,270)
+	Set CoordinatesList = ##class(%ListOfObjects).%New()
+	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",435,337.9,30,30,29.72,17.9,.28,17.9).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPath", CoordinatesList,1).DanReturn(Path)
+	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
+	
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD30",350,450,270)
+
+	Do CoordinatesServiceMock.Verifieer()
+	Do BasisElementFactoryMock.Verifieer()
 	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
 ]]></Implementation>
 </Method>
 
-<Method name="aTest SD35FREES">
+<Method name="Test SD35FREES">
 <Implementation><![CDATA[
-	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New("SD35",350,450,0)
+	Set CoordinatesList = ##class(%ListOfObjects).%New()
+	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",342.5,435,30,30,7.5,33.31,7.5,1.69).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPath", CoordinatesList,1).DanReturn(Path)
+	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
+		
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("SD35",350,450,0)
+	
+	Do CoordinatesServiceMock.Verifieer()
+	Do BasisElementFactoryMock.Verifieer()
 	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
 ]]></Implementation>
 </Method>
 
-<Method name="aTest KAD">
+<Method name="Test KAD">
 <Implementation><![CDATA[
-	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New("KAD",350,450,0)
+	Set CoordinatesList = ##class(%ListOfObjects).%New()
+	#dim Rect as TECH.Svg.Basis.Rect = ##class(TECH.Svg.BasisElementFactory).%New().MaakRechthoek(1,2,3,4)
+	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakRechthoek",350,450,16,14).DanReturn(Rect)
+	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock)
+		
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("KAD",350,450,0)
+	
+	Do BasisElementFactoryMock.Verifieer()
 	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Rects.Count(),1)
 ]]></Implementation>
 </Method>
 
-<Method name="aTest REGULA_SM">
+<Method name="Test REGULA_SM">
 <Implementation><![CDATA[
-	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New("REGULA_SM",350,450,0)
+	Set CoordinatesList = ##class(%ListOfObjects).%New()
+	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",342.5,435,30,30,7.5,33.31,7.5,1.69).ExactAantalKeer(1).DanReturn(CoordinatesList)
+	#dim Path as TECH.Svg.Basis.Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
+	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+	Do BasisElementFactoryMock.VerwachtMethodCall("MaakPath", CoordinatesList,1).DanReturn(Path)
+	Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(BasisElementFactoryMock, CoordinatesServiceMock)
+		
+	Do BeslagBoringSpecialeVorm.MaakBoringSpecialeVorm("REGULA_SM",350,450,0)
+	
+	Do CoordinatesServiceMock.Verifieer()
+	Do BasisElementFactoryMock.Verifieer()
 	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
 ]]></Implementation>
 </Method>
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml
===================================================================
diff -u -r60226 -r60229
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 60226)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 60229)
@@ -96,24 +96,23 @@
 <Method name="KadFreesRect">
 <FormalSpec>Breedte:%Integer,Lengte:%Integer,Rotation:%Integer</FormalSpec>
 <Implementation><![CDATA[
-	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+	Set ElementToevoeger = ##class(TECH.Svg.Basis.SvgBox.ElementToevoeger).%New()
 	#dim FreesB As %Integer =16
 	#dim FreesL As %Integer =14
 	#dim Rect As TECH.Svg.Basis.Rect
-	
 	If (Rotation = 0) {
-		Set Rect = BasisElementFactory.MaakRechthoek(Breedte, Lengte, FreesB, FreesL)
+		Set Rect = ..BasisElementFactory.MaakRechthoek(Breedte, Lengte, FreesB, FreesL)
 	}
 	If (Rotation = 90) {
-		Set Rect = BasisElementFactory.MaakRechthoek(Breedte , Lengte, FreesB,FreesL)
+		Set Rect = ..BasisElementFactory.MaakRechthoek(Breedte , Lengte, FreesB,FreesL)
 	}
 	If (Rotation = 180) {
-		Set Rect = BasisElementFactory.MaakRechthoek(0 , (Lengte - FreesL)/2, FreesB, FreesL)
+		Set Rect = ..BasisElementFactory.MaakRechthoek(0 , (Lengte - FreesL)/2, FreesB, FreesL)
 	}
 	If (Rotation = 270) {
-		Set Rect = BasisElementFactory.MaakRechthoek(Breedte, Lengte , FreesB, FreesL)
+		Set Rect = ..BasisElementFactory.MaakRechthoek(Breedte, Lengte , FreesB, FreesL)
 	}
-	Do ..SvgBox.VoegToeElement(Rect)
+	Do ElementToevoeger.VoegToeElement(..SvgBox,Rect)
 ]]></Implementation>
 </Method>