Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml
===================================================================
diff -u -r60207 -r60208
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 60207)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 60208)
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm">
+<IncludeCode>vhLib.Macro</IncludeCode>
 <Super>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.BasisElementSvgTooling</Super>
 
 <Property name="SvgBox">
 <Type>TECH.Svg.Basis.SvgBox</Type>
 <Parameter name="XMLNAME" value="svg"/>
 </Property>
 
+<Property name="BasisElementFactory">
+<Type>TECH.Svg.BasisElementFactory</Type>
+</Property>
+
+<Property name="CoordinatesService">
+<Type>TECH.Svg.Services.CoordinatesService</Type>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>BasisElementFactory:TECH.Svg.BasisElementFactory,CoordinatesService:TECH.Svg.Services.CoordinatesService</FormalSpec>
 <Private>1</Private>
@@ -16,7 +25,8 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..SvgBox = ##class(TECH.Svg.Basis.SvgBox).%New()
-	
+	Set ..BasisElementFactory = $$$Inject(BasisElementFactory, ##class(TECH.Svg.BasisElementFactory).%New())
+	Set ..CoordinatesService = $$$Inject(CoordinatesService, ##class(TECH.Svg.Services.CoordinatesService).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -39,20 +49,19 @@
 <Method name="SDxFREES">
 <FormalSpec>Diameter:%Integer,MiddleOffset:%Integer,Offset:%Integer,OffsetOpposite:%Integer,P1:%Integer,P2:%Integer,Rotation:%Integer,Breedte:%Integer,Lengte:%Integer</FormalSpec>
 <Implementation><![CDATA[
-	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
-	Set CoordinatesService = ##class(TECH.Svg.Services.CoordinatesService).%New()
+	#dim CoordinatesList As %ListOfObjects
 	If (Rotation = 0) {
-		Set CoordinatesList =  CoordinatesService.MaakCoordinatenLijstVanPunten(Breedte-Offset,Lengte-(Diameter\2),Diameter,Diameter,Offset,P2,Offset,P1)
-		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
+		Set CoordinatesList =  ..CoordinatesService.MaakCoordinatenLijstVanPunten(Breedte-Offset,Lengte-(Diameter\2),Diameter,Diameter,Offset,P2,Offset,P1)
+		Set Path = ..BasisElementFactory.MaakPath(CoordinatesList,1)
 	}ElseIf (Rotation = 90) {
-		Set CoordinatesList =  CoordinatesService.MaakCoordinatenLijstVanPunten(Lengte-(Diameter\2), Breedte-Offset,Diameter,Diameter,P1,Offset,P2,Offset)
-		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
+		Set CoordinatesList =  ..CoordinatesService.MaakCoordinatenLijstVanPunten(Lengte-(Diameter\2), Breedte-Offset,Diameter,Diameter,P1,Offset,P2,Offset)
+		Set Path = ..BasisElementFactory.MaakPath(CoordinatesList,1)
 	}ElseIf (Rotation = 180) {
-		Set CoordinatesList =  CoordinatesService.MaakCoordinatenLijstVanPunten(Breedte-Offset,Lengte-(Diameter\2),Diameter,Diameter,OffsetOpposite,P1,OffsetOpposite,P2)
-		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
+		Set CoordinatesList =  ..CoordinatesService.MaakCoordinatenLijstVanPunten(Breedte-Offset,Lengte-(Diameter\2),Diameter,Diameter,OffsetOpposite,P1,OffsetOpposite,P2)
+		Set Path = ..BasisElementFactory.MaakPath(CoordinatesList,1)
 	}ElseIf (Rotation = 270) {
-		Set CoordinatesList =  CoordinatesService.MaakCoordinatenLijstVanPunten(Lengte-(Diameter\2), Breedte-Offset,Diameter,Diameter,P2,OffsetOpposite,P1,OffsetOpposite)
-		Set Path = BasisElementFactory.MaakPath(CoordinatesList,1)
+		Set CoordinatesList =  ..CoordinatesService.MaakCoordinatenLijstVanPunten(Lengte-(Diameter\2), Breedte-Offset,Diameter,Diameter,P2,OffsetOpposite,P1,OffsetOpposite)
+		Set Path = ..BasisElementFactory.MaakPath(CoordinatesList,1)
 	}
 	Do ..SvgBox.VoegToeElement(Path)
 ]]></Implementation>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/MaakBoringSpecialeVorm/Test.cls.xml
===================================================================
diff -u -r60207 -r60208
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/MaakBoringSpecialeVorm/Test.cls.xml	(.../Test.cls.xml)	(revision 60207)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm/MaakBoringSpecialeVorm/Test.cls.xml	(.../Test.cls.xml)	(revision 60208)
@@ -5,12 +5,18 @@
 
 <Method name="Test SD30FREES">
 <Implementation><![CDATA[
-	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
+	Set CoordinatesList = ##class(%ListOfObjects).%New()
 	Set CoordinatesServiceMock = ##class(vhTest.Mock.TECH.Svg.Services.CoordinatesService).%New()
+	Do CoordinatesServiceMock.VerwachtMethodCall("MaakCoordinatenLijstVanPunten",337.9,435,30,30,12.1,29.72,12.1,.28).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,0)
 	
+	Do CoordinatesServiceMock.Verifieer()
+	Do BasisElementFactoryMock.Verifieer()
 	Do $$$AssertEquals(BeslagBoringSpecialeVorm.SvgBox.Paths.Count(),1)
 ]]></Implementation>
 </Method>