Fix filled / not filled forms for compare tests

hpi-swa-teaching · May 31, 2022 · 2d649c7 · 2d649c7
1 parent d283b36
commit 2d649c7
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 17 deletions.
diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/filledEllipse.st b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/filledEllipse.st
diff --git a/...etchMorph2-Tests.package/M2DrawingComponentTests.class/class/filledEquilateralTriangle.st b/...etchMorph2-Tests.package/M2DrawingComponentTests.class/class/filledEquilateralTriangle.st
diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/filledTriangle.st b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/filledTriangle.st
diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledEllipse.st b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledEllipse.st
diff --git a/...hMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledEquilateralTriangle.st b/...hMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledEquilateralTriangle.st
diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledTriangle.st b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/class/notFilledTriangle.st
diff --git a/...Tests.package/M2DrawingComponentTests.class/instance/testCompareGeometricEllipseFilled.st b/...Tests.package/M2DrawingComponentTests.class/instance/testCompareGeometricEllipseFilled.st
@@ -0,0 +1,6 @@
+testing
+testCompareGeometricEllipseFilled
+	self
+		contextFillGeometricModeWithForm: #ellipse;
+		drawFrom: (40 @ 10) to: (80 @ 90);
+		compareBackendFormWith: #filledEllipse
diff --git a/...ts.package/M2DrawingComponentTests.class/instance/testCompareGeometricEllipseNotFilled.st b/...ts.package/M2DrawingComponentTests.class/instance/testCompareGeometricEllipseNotFilled.st
@@ -1,6 +1,6 @@
 testing
 testCompareGeometricEllipseNotFilled
 	self
-		contextFillGeometricModeWithForm: #ellipse;
+		contextGeometricModeWithForm: #ellipse;
 		drawFrom: (40 @ 10) to: (80 @ 90);
 		compareBackendFormWith: #notFilledEllipse
diff --git a/...e/M2DrawingComponentTests.class/instance/testCompareGeometricEquilateralTriangleFilled.st b/...e/M2DrawingComponentTests.class/instance/testCompareGeometricEquilateralTriangleFilled.st
@@ -0,0 +1,8 @@
+testing
+testCompareGeometricEquilateralTriangleFilled
+	self
+		contextFillGeometricModeWithForm: #triangle;
+		holdShift;
+		drawFrom: (40 @ 10) to: (80 @ 90);
+		compareBackendFormWith: #filledEquilateralTriangle;
+		releaseShift
diff --git a/...2DrawingComponentTests.class/instance/testCompareGeometricEquilateralTriangleNotFilled.st b/...2DrawingComponentTests.class/instance/testCompareGeometricEquilateralTriangleNotFilled.st
@@ -1,7 +1,7 @@
 testing
 testCompareGeometricEquilateralTriangleNotFilled
 	self
-		contextFillGeometricModeWithForm: #triangle;
+		contextGeometricModeWithForm: #triangle;
 		holdShift;
 		drawFrom: (40 @ 10) to: (80 @ 90);
 		compareBackendFormWith: #notFilledEquilateralTriangle;

diff --git a/...s.package/M2DrawingComponentTests.class/instance/testCompareGeometricTriangleNotFilled.st b/...s.package/M2DrawingComponentTests.class/instance/testCompareGeometricTriangleNotFilled.st
@@ -1,6 +1,6 @@
 testing
 testCompareGeometricTriangleNotFilled
 	self
-		contextFillGeometricModeWithForm: #triangle;
+		contextGeometricModeWithForm: #triangle;
 		drawFrom: (40 @ 10) to: (80 @ 90);
 		compareBackendFormWith: #notFilledTriangle
diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/methodProperties.json b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/methodProperties.json
@@ -10,15 +10,17 @@
 		"diagonalPencilLine" : "md 5/26/2022 19:06",
 		"filledCircle" : "md 5/26/2022 19:06",
 		"filledCircleNarrow" : "md 5/26/2022 19:06",
+		"filledEllipse" : "kbr 5/31/2022 09:57",
+		"filledEquilateralTriangle" : "kbr 5/31/2022 09:53",
 		"filledRectangle" : "md 5/26/2022 19:06",
-		"filledTriangle" : "SW 5/21/2022 18:10",
+		"filledTriangle" : "kbr 5/31/2022 09:49",
 		"importTestJPEG" : "CS 6/29/2021 11:31",
 		"importTestPNG" : "wr 6/18/2020 16:44",
 		"notFilledCircle" : "md 5/26/2022 19:06",
-		"notFilledEllipse" : "ms 5/27/2022 17:00",
-		"notFilledEquilateralTriangle" : "ms 5/30/2022 23:06",
+		"notFilledEllipse" : "kbr 5/31/2022 10:01",
+		"notFilledEquilateralTriangle" : "kbr 5/31/2022 10:08",
 		"notFilledRectangle" : "md 5/26/2022 19:06",
-		"notFilledTriangle" : "ms 5/27/2022 17:02",
+		"notFilledTriangle" : "kbr 5/31/2022 10:12",
 		"overlappingCircles" : "md 5/26/2022 19:06",
 		"simpleColouredText" : "kbr 5/30/2022 22:14",
 		"simpleText" : "md 5/26/2022 19:06",
@@ -72,12 +74,14 @@
 		"testCompareGeometricCircleFilledNarrow" : "ms 5/27/2022 16:44",
 		"testCompareGeometricCircleNotFilled" : "ms 5/27/2022 16:44",
 		"testCompareGeometricCircleOverlapping" : "ms 5/27/2022 16:44",
-		"testCompareGeometricEllipseNotFilled" : "ms 5/27/2022 17:00",
-		"testCompareGeometricEquilateralTriangleNotFilled" : "ms 5/27/2022 17:04",
+		"testCompareGeometricEllipseFilled" : "kbr 5/31/2022 09:58",
+		"testCompareGeometricEllipseNotFilled" : "kbr 5/31/2022 10:01",
+		"testCompareGeometricEquilateralTriangleFilled" : "kbr 5/31/2022 09:53",
+		"testCompareGeometricEquilateralTriangleNotFilled" : "kbr 5/31/2022 10:08",
 		"testCompareGeometricRectangleFilled" : "CS 8/5/2021 22:59",
 		"testCompareGeometricRectangleNotFilled" : "CS 8/5/2021 22:59",
-		"testCompareGeometricTriangleFilled" : "SW 5/21/2022 18:00",		
-		"testCompareGeometricTriangleNotFilled" : "ms 5/27/2022 17:03",
+		"testCompareGeometricTriangleFilled" : "SW 5/21/2022 18:00",
+		"testCompareGeometricTriangleNotFilled" : "kbr 5/31/2022 10:12",
 		"testCompareSelectionLasso" : "md 5/27/2022 23:45",
 		"testCompareSelectionRectangle" : "md 5/27/2022 23:38",
 		"testDoesExportPNGSavesFile" : "K.P. 6/26/2021 16:29",