Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml
===================================================================
diff -u -r60575 -r60598
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 60575)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 60598)
@@ -7,17 +7,17 @@
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim DoorBoring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring
-		Set DoorBoring = BoringElementFactory.MaakDoorBoring(60,40,5,##class(TECH.Svg.enu.Kleur).Zwart())
+		Set DoorBoring = BoringElementFactory.MaakDoorBoring(60,40,5,##class(TECH.Svg.enu.Kleur).Blauw())
 		
-		Do ..AssertSvg(DoorBoring, "<svg x=""55"" y=""35"" height=""10"" width=""10"" id=""doorboring"">  <circle fill=""black"" cx=""5"" cy=""5"" r=""5""></circle></svg>")
+		Do ..AssertSvg(DoorBoring, "<svg x=""55"" y=""35"" height=""10"" width=""10"" id=""doorboring"">  <circle fill=""blue"" cx=""5"" cy=""5"" r=""5""></circle></svg>")
 ]]></Implementation>
 </Method>
 
 <Method name="Test invulling objecten DoorBoring">
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim DoorBoring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring
-		Set DoorBoring = BoringElementFactory.MaakDoorBoring(60,40,5,##class(TECH.Svg.enu.Kleur).Zwart())
+		Set DoorBoring = BoringElementFactory.MaakDoorBoring(60,40,5,##class(TECH.Svg.enu.Kleur).Blauw())
 		
 		Do $$$AssertEquals(DoorBoring.SvgBox.Circles.Count(),1)
 ]]></Implementation>
@@ -27,8 +27,8 @@
 <Implementation><![CDATA[
 		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
-		#dim DummyCirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(5,5,5)
-		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-5,-5,10,10)
+		#dim DummyCirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(0,0,0)
+		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(0,0,0,0)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel", 5,5,5).DanReturn(DummyCirkel)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 55,35,10,10).DanReturn(DummySvgBox)
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock)
@@ -43,8 +43,8 @@
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim Puntboring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring
-		Set Puntboring = BoringElementFactory.MaakPuntBoring(25,15,10,5)
-		Do ..AssertSvg(Puntboring, "<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""puntboring"">  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""10"" y2=""5""></line>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""5"" x2=""10"" y2=""0""></line></svg>")
+		Set Puntboring = BoringElementFactory.MaakPuntBoring(25,15,10,5,##class(TECH.Svg.enu.Kleur).Blauw())
+		Do ..AssertSvg(Puntboring, "<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""puntboring"">  <line stroke=""blue"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""10"" y2=""5""></line>  <line stroke=""blue"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""5"" x2=""10"" y2=""0""></line></svg>")
 ]]></Implementation>
 </Method>
 
@@ -63,8 +63,8 @@
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
 		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim DummyCrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
-		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		#dim DummyCrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(0,0,"kleur")
+		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(0,0,0,0)
 		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossDiag",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyCrossDiag)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)
@@ -80,8 +80,8 @@
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim Rugboring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring
-		Set Rugboring = BoringElementFactory.MaakRugBoring(25,15,10,5)
-		Do ..AssertSvg(Rugboring,"<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""rugboring"">  <circle fill=""black"" cx=""5"" cy=""2.5"" r=""4.545454545454545455""></circle>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""10"" y2=""5""></line>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""5"" x2=""10"" y2=""0""></line></svg>")
+		Set Rugboring = BoringElementFactory.MaakRugBoring(25,15,10,5,##class(TECH.Svg.enu.Kleur).Blauw())
+		Do ..AssertSvg(Rugboring,"<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""rugboring"">  <circle fill=""blue"" cx=""5"" cy=""2.5"" r=""4.545454545454545455""></circle>  <line stroke=""blue"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""10"" y2=""5""></line>  <line stroke=""blue"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""5"" x2=""10"" y2=""0""></line></svg>")
 ]]></Implementation>
 </Method>
 
@@ -101,9 +101,9 @@
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
 		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim DummyCirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(5,5,5)
-		#dim DummyCrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
-		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		#dim DummyCirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(0,0,0)
+		#dim DummyCrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(0,0,"kleur")
+		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(0,0,0,0)
 		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossDiag",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyCrossDiag)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel",5,2.5,4.545454545454545455).DanReturn(DummyCirkel)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
@@ -120,8 +120,8 @@
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim Zijboring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring
-		Set Zijboring = BoringElementFactory.MaakZijBoring(25,15,10,5)
-		Do ..AssertSvg(Zijboring,"<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""zijboring"">  <g transform=""rotate(0 5 2.5)"">    <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""10"" y2=""0""></line>    <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""5"" y1=""0"" x2=""5"" y2=""5""></line>  </g></svg>")
+		Set Zijboring = BoringElementFactory.MaakZijBoring(25,15,10,5,90,##class(TECH.Svg.enu.Kleur).Blauw())
+		Do ..AssertSvg(Zijboring,"<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""zijboring"">  <g transform=""rotate(90 5 2.5)"">    <line stroke=""blue"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""10"" y2=""0""></line>    <line stroke=""blue"" stroke-width=""1"" stroke-dasharray=""none"" x1=""5"" y1=""0"" x2=""5"" y2=""5""></line>  </g></svg>")
 ]]></Implementation>
 </Method>
 
@@ -140,8 +140,8 @@
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
 		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim DummyTCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross = CrossFactory.MaakTCross(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
-		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		#dim DummyTCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross = CrossFactory.MaakTCross(0,0,"kleur")
+		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(0,0,0,0)
 		Do CrossFactoryMock.VerwachtMethodCall("MaakTCross",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyTCross)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)
@@ -157,8 +157,8 @@
 <Implementation><![CDATA[
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New()
 		#dim SpecialeBoring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring
-		Set SpecialeBoring = BoringElementFactory.MaakSpecialeBoring(25,15,10,5)
-		Do ..AssertSvg(SpecialeBoring,"<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""specialeBoring"">  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""2.5"" x2=""10"" y2=""2.5""></line>  <line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""5"" y1=""0"" x2=""5"" y2=""5""></line></svg>")
+		Set SpecialeBoring = BoringElementFactory.MaakSpecialeBoring(25,15,10,5,##class(TECH.Svg.enu.Kleur).Blauw())
+		Do ..AssertSvg(SpecialeBoring,"<svg x=""20"" y=""12.5"" height=""10"" width=""5"" id=""specialeBoring"">  <line stroke=""blue"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""2.5"" x2=""10"" y2=""2.5""></line>  <line stroke=""blue"" stroke-width=""1"" stroke-dasharray=""none"" x1=""5"" y1=""0"" x2=""5"" y2=""5""></line></svg>")
 ]]></Implementation>
 </Method>
 
@@ -177,8 +177,8 @@
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
 		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim DummyCrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = CrossFactory.MaakCrossVH(10,10,##class(TECH.Svg.enu.Kleur).Zwart())
-		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(-2.5,-5,10,10)
+		#dim DummyCrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = CrossFactory.MaakCrossVH(0,0,"kleur")
+		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(0,0,0,0)
 		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossVH",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyCrossVH)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
 		Set BoringElementFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.BoringElementFactory).%New(,BasisElementFactoryMock,CrossFactoryMock)