Index: vhUnitTest/TECH/Svg/BasisElementFactory/Test.cls.xml
===================================================================
diff -u -r3655 -r3656
--- vhUnitTest/TECH/Svg/BasisElementFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 3655)
+++ vhUnitTest/TECH/Svg/BasisElementFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 3656)
@@ -7,6 +7,10 @@
 <Implementation><![CDATA[
 	#dim Rect As TECH.Svg.Basis.Rect = ##class(TECH.Svg.BasisElementFactory).%New().MaakRechthoek(0,0,150,105)
 	Do ..AssertSvg(Rect, "<rect x=""0"" y=""0"" width=""150"" height=""105""></rect>")
+	Do $$$AssertEquals(Rect.Width,150)
+	Do $$$AssertEquals(Rect.Height,105)
+	Do $$$AssertEquals(Rect.X,0)
+	Do $$$AssertEquals(Rect.Y,0)
 ]]></Implementation>
 </Method>
 
@@ -20,34 +24,40 @@
 <Method name="Test correcte invulling v/d property">
 <Implementation><![CDATA[
 		Set Circle = ##class(TECH.Svg.BasisElementFactory).%New().MaakCirkel(15,35,1)
-		Do $$$AssertEquals(Circle.MiddelpuntX,15,"")
-		Do $$$AssertEquals(Circle.MiddelpuntY,35,"")
-		Do $$$AssertEquals(Circle.Straal,1,"")
+		Do $$$AssertEquals(Circle.MiddelpuntX,15)
+		Do $$$AssertEquals(Circle.MiddelpuntY,35)
+		Do $$$AssertEquals(Circle.Straal,1)
 ]]></Implementation>
 </Method>
 
 <Method name="Test bestaan van een line klasse">
 <Implementation><![CDATA[
-		Set Line = ##class(TECH.Svg.BasisElementFactory).%New().MaakLijn(35,30,35,40)
+		#dim Line As TECH.Svg.Basis.Line = ##class(TECH.Svg.BasisElementFactory).%New().MaakLijn(35,30,35,40)
 		Do ..AssertSvg(Line, "<line x1=""35"" y1=""30"" x2=""35"" y2=""40""></line>")
+		Do $$$AssertEquals(Line.X1,35)
+		Do $$$AssertEquals(Line.Y1,30)
+		Do $$$AssertEquals(Line.X2,35)
+		Do $$$AssertEquals(Line.Y2,40)
 ]]></Implementation>
 </Method>
 
 <Method name="Test bestaan van een text klasse">
 <Implementation><![CDATA[
-		Set Text = ##class(TECH.Svg.BasisElementFactory).%New().MaakText(35,30,"hoi")
+		#dim Text As TECH.Svg.Basis.Text = ##class(TECH.Svg.BasisElementFactory).%New().MaakText(35,30,"hoi")
 		Do ..AssertSvg(Text, "<text x=""35"" y=""30"">hoi</text>")
+		Do $$$AssertEquals(Text.X,35)
+		Do $$$AssertEquals(Text.Y,30)
+		Do $$$AssertEquals(Text.Content,"hoi")
 ]]></Implementation>
 </Method>
 
 <Method name="Test bestaan van een path klasse open">
 <Implementation><![CDATA[
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
-	Do CoordinatesList.Insert(##class(TECH.Svg.Basis.Path.Coordinates).%New(0,0))
-	Do CoordinatesList.Insert(##class(TECH.Svg.Basis.Path.Coordinates).%New(19,19))
-	Do CoordinatesList.Insert(##class(TECH.Svg.Basis.Path.Coordinates).%New(38,19))
-	Do CoordinatesList.Insert(##class(TECH.Svg.Basis.Path.Coordinates).%New(38,0))
-	w "hoi"
+	Do CoordinatesList.Insert(##class(TECH.Svg.BasisElementFactory).%New().MaakCoordinaat(0,0))
+	Do CoordinatesList.Insert(##class(TECH.Svg.BasisElementFactory).%New().MaakCoordinaat(19,19))
+	Do CoordinatesList.Insert(##class(TECH.Svg.BasisElementFactory).%New().MaakCoordinaat(38,19))
+	Do CoordinatesList.Insert(##class(TECH.Svg.BasisElementFactory).%New().MaakCoordinaat(38,0))
 	Set Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,0)
 	Do ..AssertSvg(Path, "<path d=""M0 0 L19 19 L38 19 L38 0""></path>")
 ]]></Implementation>
@@ -56,9 +66,9 @@
 <Method name="Test bestaan van een path klasse gesloten">
 <Implementation><![CDATA[
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
-	Do CoordinatesList.Insert(##class(TECH.Svg.Basis.Path.Coordinates).%New(0,0))
-	Do CoordinatesList.Insert(##class(TECH.Svg.Basis.Path.Coordinates).%New(19,19))
-	Do CoordinatesList.Insert(##class(TECH.Svg.Basis.Path.Coordinates).%New(38,19))
+	Do CoordinatesList.Insert(##class(TECH.Svg.BasisElementFactory).%New().MaakCoordinaat(0,0))
+	Do CoordinatesList.Insert(##class(TECH.Svg.BasisElementFactory).%New().MaakCoordinaat(19,19))
+	Do CoordinatesList.Insert(##class(TECH.Svg.BasisElementFactory).%New().MaakCoordinaat(38,19))
 	Set Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,1)
 	Do ..AssertSvg(Path, "<path d=""M0 0 L19 19 L38 19z""></path>")
 ]]></Implementation>
@@ -67,13 +77,10 @@
 <Method name="Test bestaan van een path klasse gesloten met minder dan 3 parameters, exceptie verwacht">
 <Implementation><![CDATA[
 	Set CoordinatesList = ##class(%ListOfObjects).%New()
-	Do CoordinatesList.Insert(##class(TECH.Svg.Basis.Path.Coordinates).%New(0,0))
-	Do CoordinatesList.Insert(##class(TECH.Svg.Basis.Path.Coordinates).%New(19,19))
-	If (CoordinatesList.Count() <3)
-	{
-		#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Het afsluiten van een figuur is pas praktisch als er meer dan 2 coördinaten aanwezig zijn.")
-		Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", Substrings))
-	}
+	Do CoordinatesList.Insert(##class(TECH.Svg.BasisElementFactory).%New().MaakCoordinaat(0,0))
+	Do CoordinatesList.Insert(##class(TECH.Svg.BasisElementFactory).%New().MaakCoordinaat(19,19))
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Het afsluiten van een figuur is pas praktisch als er meer dan 2 coördinaten aanwezig zijn.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", Substrings))
 	Set Path = ##class(TECH.Svg.BasisElementFactory).%New().MaakPath(CoordinatesList,1)
 	Do ..AssertSvg(Path, "<path d=""M0 0 L19 19z""></path>")
 ]]></Implementation>