Merge pull request 'test: add contains(Point) hit-testing tests for all shapes' (#21) from issue-11/contains-point-tests into master

Reviewed-on: #21

src/main/java/ovh/gasser/newshapes/ShapeVisitor.java

@@ -2,7 +2,6 @@ package ovh.gasser.newshapes;
 
 import ovh.gasser.newshapes.shapes.SCircle;
 import ovh.gasser.newshapes.shapes.SCollection;
-import ovh.gasser.newshapes.shapes.SPolygon;
 import ovh.gasser.newshapes.shapes.SRectangle;
 import ovh.gasser.newshapes.shapes.SText;
 import ovh.gasser.newshapes.shapes.STriangle;
@@ -17,6 +16,4 @@ public interface ShapeVisitor {
     void visitTriangle(STriangle sTriangle);
 
     void visitText(SText sText);
-
-    void visitPolygon(SPolygon sPolygon);
 }

src/main/java/ovh/gasser/newshapes/shapes/SPolygon.java

@@ -1,110 +0,0 @@
-package ovh.gasser.newshapes.shapes;
-
-import ovh.gasser.newshapes.ShapeVisitor;
-import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.attributes.SelectionAttributes;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class SPolygon extends AbstractShape {
-    private final List<Point> points;
-
-    private SPolygon(List<Point> points) {
-        super(calculateBounds(points));
-        this.points = new ArrayList<>(points);
-    }
-
-    @Override
-    public void accept(ShapeVisitor visitor) {
-        visitor.visitPolygon(this);
-    }
-
-    @Override
-    public void translate(int dx, int dy) {
-        super.translate(dx, dy);
-        for (Point p : points) {
-            p.translate(dx, dy);
-        }
-    }
-
-    @Override
-    public void resize(ResizeHandle handle, int dx, int dy) {
-        Rectangle oldBounds = getBounds();
-        super.resize(handle, dx, dy);
-        Rectangle newBounds = getBounds();
-
-        if (oldBounds.width == 0 || oldBounds.height == 0) {
-            return;
-        }
-
-        double scaleX = (double) newBounds.width / oldBounds.width;
-        double scaleY = (double) newBounds.height / oldBounds.height;
-
-        for (Point p : points) {
-            int relativeX = p.x - oldBounds.x;
-            int relativeY = p.y - oldBounds.y;
-            p.x = newBounds.x + (int) (relativeX * scaleX);
-            p.y = newBounds.y + (int) (relativeY * scaleY);
-        }
-    }
-
-    @Override
-    public Shape clone() {
-        List<Point> clonedPoints = points.stream()
-                .map(p -> new Point(p.x, p.y))
-                .toList();
-        SPolygon clone = new SPolygon(clonedPoints);
-        ColorAttributes color = (ColorAttributes) this.getAttributes(ColorAttributes.ID);
-        if (color != null) {
-            clone.addAttributes(new ColorAttributes(color.filled, color.stroked, color.filledColor, color.strokedColor));
-        }
-        clone.addAttributes(new SelectionAttributes());
-        return clone;
-    }
-
-    public List<Point> getPoints() {
-        return Collections.unmodifiableList(points);
-    }
-
-    public static SPolygon create(List<Point> points) {
-        if (points == null || points.size() < 3) {
-            throw new IllegalArgumentException("Polygon must have at least 3 points");
-        }
-        SPolygon polygon = new SPolygon(points);
-        polygon.addAttributes(new SelectionAttributes());
-        polygon.addAttributes(new ColorAttributes(false, true, Color.BLACK, Color.BLACK));
-        return polygon;
-    }
-
-    public static SPolygon create(Point... points) {
-        return create(List.of(points));
-    }
-
-    private static Rectangle calculateBounds(List<Point> points) {
-        if (points == null || points.isEmpty()) {
-            return new Rectangle(0, 0, 0, 0);
-        }
-
-        int minX = points.get(0).x;
-        int minY = points.get(0).y;
-        int maxX = points.get(0).x;
-        int maxY = points.get(0).y;
-
-        for (Point p : points) {
-            minX = Math.min(minX, p.x);
-            minY = Math.min(minY, p.y);
-            maxX = Math.max(maxX, p.x);
-            maxY = Math.max(maxY, p.y);
-        }
-
-        return new Rectangle(minX, minY, maxX - minX, maxY - minY);
-    }
-
-    @Override
-    public String toString() {
-        return "SPolygon{points=" + points.size() + ", bounds=" + super.toString() + "}";
-    }
-}

src/main/java/ovh/gasser/newshapes/shapes/SText.java

@@ -57,7 +57,7 @@ public class SText extends AbstractShape {
     }
 
     public void updateMeasuredBounds(int width, int height) {
-        getBounds().setSize(Math.max(width, 0), Math.max(height, 0));
+        bounds.setSize(Math.max(width, 0), Math.max(height, 0));
     }
 
     @Override

src/main/java/ovh/gasser/newshapes/ui/ShapeDraftman.java

@@ -117,30 +117,6 @@ public class ShapeDraftman implements ShapeVisitor {
         drawHandlerIfSelected(text);
     }
 
-    @Override
-    public void visitPolygon(SPolygon polygon) {
-        ColorAttributes colAttrs = (ColorAttributes) polygon.getAttributes(ColorAttributes.ID);
-        if (colAttrs == null) {
-            colAttrs = DEFAULT_COLOR_ATTRIBUTES;
-        }
-
-        java.util.List<Point> points = polygon.getPoints();
-        int[] xPoints = points.stream().mapToInt(p -> p.x).toArray();
-        int[] yPoints = points.stream().mapToInt(p -> p.y).toArray();
-        int nPoints = points.size();
-
-        if (colAttrs.filled) {
-            this.g2d.setColor(colAttrs.filledColor);
-            this.g2d.fillPolygon(xPoints, yPoints, nPoints);
-        }
-        if (colAttrs.stroked) {
-            this.g2d.setColor(colAttrs.strokedColor);
-            this.g2d.drawPolygon(xPoints, yPoints, nPoints);
-        }
-
-        drawHandlerIfSelected(polygon);
-    }
-
     private Color resolveTextColor(ColorAttributes attrs) {
         if (attrs == null) {
             return Color.BLACK;

src/main/java/ovh/gasser/newshapes/ui/listeners/MenuAddListener.java

@@ -19,17 +19,11 @@ public class MenuAddListener implements ActionListener {
 	private final String shape;
 	private final ShapesView view;
 	private final SCollection model;
-	private final Runnable onModelChanged;
 
 	public MenuAddListener(String shape, SCollection model, ShapesView view) {
-		this(shape, model, view, () -> { });
-	}
-
-	public MenuAddListener(String shape, SCollection model, ShapesView view, Runnable onModelChanged) {
 		this.shape = shape;
 		this.model = model;
 		this.view = view;
-		this.onModelChanged = onModelChanged;
 	}
 	@Override
 	public void actionPerformed(ActionEvent e) {
@@ -47,7 +41,6 @@ public class MenuAddListener implements ActionListener {
 		s.addAttributes(new SelectionAttributes());
 		s.addAttributes(new ColorAttributes(true, false, randomColor(), Color.BLACK));
 		model.add(s);
-		onModelChanged.run();
 		view.repaint();
 	}
 	

src/main/java/ovh/gasser/newshapes/ui/visitors/HTMLDraftman.java

@@ -2,12 +2,7 @@ package ovh.gasser.newshapes.ui.visitors;
 
 import ovh.gasser.newshapes.ShapeVisitor;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.shapes.SCircle;
+import ovh.gasser.newshapes.shapes.*;
-import ovh.gasser.newshapes.shapes.SCollection;
-import ovh.gasser.newshapes.shapes.SPolygon;
-import ovh.gasser.newshapes.shapes.SRectangle;
-import ovh.gasser.newshapes.shapes.SText;
-import ovh.gasser.newshapes.shapes.STriangle;
 import ovh.gasser.newshapes.shapes.Shape;
 
 import java.awt.*;
@@ -110,36 +105,6 @@ public class HTMLDraftman implements ShapeVisitor {
         cssOutput.println("}");
     }
 
-    @Override
-    public void visitPolygon(SPolygon polygon) {
-        int id = polygon.hashCode();
-        Rectangle bounds = polygon.getBounds();
-        htmlOutput.printf("<svg class=\"poly%d\" viewBox=\"%d %d %d %d\">\n", id, bounds.x, bounds.y, bounds.width, bounds.height);
-
-        var points = new StringJoiner(" ");
-        for (var point : polygon.getPoints()) {
-            points.add("%d,%d".formatted(point.x, point.y));
-        }
-
-        ColorAttributes attrs = (ColorAttributes) polygon.getAttributes(ColorAttributes.ID);
-        String fill = attrs.filled ? formatCSSColor(attrs.filledColor) : "none";
-        String stroke = attrs.stroked ? formatCSSColor(attrs.strokedColor) : "none";
-        int strokeWidth = attrs.stroked ? 1 : 0;
-
-        htmlOutput.printf("  <polygon points=\"%s\" fill=\"%s\" stroke=\"%s\" stroke-width=\"%d\" />\n",
-                points, fill, stroke, strokeWidth);
-        htmlOutput.println("</svg>");
-
-        cssOutput.printf(".poly%d{\n", id);
-        cssOutput.println("  position: absolute;");
-        cssOutput.printf("  top: %dpx;\n", bounds.y);
-        cssOutput.printf("  left: %dpx;\n", bounds.x);
-        cssOutput.printf("  width: %dpx;\n", bounds.width);
-        cssOutput.printf("  height: %dpx;\n", bounds.height);
-        cssOutput.println("  overflow: visible;");
-        cssOutput.println("}");
-    }
-
     private String attributesToCss(Shape shape) {
         ColorAttributes attrs = (ColorAttributes) shape.getAttributes(ColorAttributes.ID);
         String strokedColor = "#ffffff";

src/main/java/ovh/gasser/newshapes/ui/visitors/SVGDraftman.java

@@ -5,7 +5,6 @@ import ovh.gasser.newshapes.ShapeVisitor;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
 import ovh.gasser.newshapes.shapes.SCircle;
 import ovh.gasser.newshapes.shapes.SCollection;
-import ovh.gasser.newshapes.shapes.SPolygon;
 import ovh.gasser.newshapes.shapes.SRectangle;
 import ovh.gasser.newshapes.shapes.SText;
 import ovh.gasser.newshapes.shapes.STriangle;
@@ -93,21 +92,6 @@ public class SVGDraftman implements ShapeVisitor {
         );
     }
 
-    @Override
-    public void visitPolygon(SPolygon sPolygon) {
-        var points = new StringJoiner(" ");
-        for (var point : sPolygon.getPoints()) {
-            points.add("%d,%d".formatted(point.x, point.y));
-        }
-        ColorAttributes attrs = (ColorAttributes) sPolygon.getAttributes(ColorAttributes.ID);
-        var style = new StringJoiner(";", "fill:", "");
-        style.add(attrs.filled ? colorToHex(attrs.filledColor) : "none");
-        if (attrs.stroked) {
-            style.add("stroke:%s;stroke-width:1".formatted(colorToHex(attrs.strokedColor)));
-        }
-        this.output.printf("<polygon points=\"%s\" style=\"%s\" />\n", points, style);
-    }
-
     public void generateSVG(SCollection model) {
         output.println(String.format(SVG_PRELUDE, App.WIN_SIZE.width, App.WIN_SIZE.height));
         visitCollection(model);

src/test/java/ovh/gasser/newshapes/shapes/ContainsPointTest.java

@@ -0,0 +1,387 @@
+package ovh.gasser.newshapes.shapes;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.awt.Color;
+import java.awt.Point;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Tests bounds-based hit-testing for all shape types.
+ * Hit-testing is performed via {@code shape.getBounds().contains(Point)},
+ * delegating to {@link java.awt.Rectangle#contains(Point)}.
+ *
+ * <p>Note on {@link java.awt.Rectangle#contains} boundary semantics:
+ * A rectangle {@code (x, y, w, h)} contains a point {@code (px, py)} when:
+ * {@code x <= px < x+w} and {@code y <= py < y+h}.
+ * The top-left corner is <em>inclusive</em>; the bottom-right corner is <em>exclusive</em>.
+ */
+class ContainsPointTest {
+
+    // -----------------------------------------------------------------------
+    // SRectangle — bounds = (x, y, width, height)
+    // -----------------------------------------------------------------------
+
+    @Nested
+    class SRectangleContainsPoint {
+
+        // Shape: origin (10, 20), size 80×60  →  right-exclusive: x=90, y=80
+        private final SRectangle rect = SRectangle.create(10, 20, 80, 60);
+
+        @Test
+        void pointInsideShouldBeContained() {
+            Point inside = new Point(50, 50);
+            assertTrue(rect.getBounds().contains(inside),
+                    "A point clearly inside the rectangle should be contained");
+        }
+
+        @Test
+        void pointOutsideShouldNotBeContained() {
+            Point outside = new Point(5, 5);
+            assertFalse(rect.getBounds().contains(outside),
+                    "A point outside the rectangle should not be contained");
+        }
+
+        @Test
+        void pointFarOutsideShouldNotBeContained() {
+            Point farOutside = new Point(200, 300);
+            assertFalse(rect.getBounds().contains(farOutside),
+                    "A point far outside the rectangle should not be contained");
+        }
+
+        @Test
+        void topLeftCornerShouldBeContained() {
+            // Rectangle.contains is inclusive of the top-left corner
+            Point topLeft = new Point(10, 20);
+            assertTrue(rect.getBounds().contains(topLeft),
+                    "The top-left corner (inclusive boundary) should be contained");
+        }
+
+        @Test
+        void bottomRightCornerShouldNotBeContained() {
+            // Rectangle.contains is exclusive of the bottom-right corner
+            Point bottomRight = new Point(90, 80); // x + width, y + height
+            assertFalse(rect.getBounds().contains(bottomRight),
+                    "The bottom-right corner (exclusive boundary) should not be contained");
+        }
+
+        @Test
+        void pointJustInsideBottomRightShouldBeContained() {
+            Point justInside = new Point(89, 79); // one pixel before exclusive boundary
+            assertTrue(rect.getBounds().contains(justInside),
+                    "A point one pixel before the bottom-right boundary should be contained");
+        }
+
+        @Test
+        void pointAfterTranslateShouldBeAtNewPosition() {
+            SRectangle moved = SRectangle.create(10, 20, 80, 60);
+            moved.translate(30, 40); // new bounds: (40, 60, 80, 60)
+
+            Point oldCenter = new Point(50, 50);
+            assertFalse(moved.getBounds().contains(oldCenter),
+                    "After translate, old center should no longer be contained");
+
+            Point newCenter = new Point(80, 90);
+            assertTrue(moved.getBounds().contains(newCenter),
+                    "After translate, a point at the new center should be contained");
+        }
+
+        @Test
+        void pointOnTopEdgeShouldBeContained() {
+            Point topEdge = new Point(50, 20); // y == rect.y, inside x range
+            assertTrue(rect.getBounds().contains(topEdge),
+                    "A point on the top edge should be contained");
+        }
+
+        @Test
+        void pointOnLeftEdgeShouldBeContained() {
+            Point leftEdge = new Point(10, 50); // x == rect.x, inside y range
+            assertTrue(rect.getBounds().contains(leftEdge),
+                    "A point on the left edge should be contained");
+        }
+
+        @Test
+        void pointOnRightEdgeShouldNotBeContained() {
+            Point rightEdge = new Point(90, 50); // x == rect.x + rect.width (exclusive)
+            assertFalse(rect.getBounds().contains(rightEdge),
+                    "A point exactly on the right edge (exclusive) should not be contained");
+        }
+
+        @Test
+        void pointOnBottomEdgeShouldNotBeContained() {
+            Point bottomEdge = new Point(50, 80); // y == rect.y + rect.height (exclusive)
+            assertFalse(rect.getBounds().contains(bottomEdge),
+                    "A point exactly on the bottom edge (exclusive) should not be contained");
+        }
+    }
+
+    // -----------------------------------------------------------------------
+    // SCircle — bounds = (x, y, radius*2, radius*2)
+    // -----------------------------------------------------------------------
+
+    @Nested
+    class SCircleContainsPoint {
+
+        // Shape: origin (20, 30), radius=40  →  bounds (20, 30, 80, 80)
+        // right-exclusive corner: (100, 110)
+        private final SCircle circle = SCircle.create(20, 30, 40);
+
+        @Test
+        void pointInsideBoundsShouldBeContained() {
+            Point inside = new Point(60, 70);
+            assertTrue(circle.getBounds().contains(inside),
+                    "A point inside the bounding box should be contained");
+        }
+
+        @Test
+        void pointOutsideBoundsShouldNotBeContained() {
+            Point outside = new Point(10, 10);
+            assertFalse(circle.getBounds().contains(outside),
+                    "A point outside the bounding box should not be contained");
+        }
+
+        @Test
+        void topLeftCornerShouldBeContained() {
+            Point topLeft = new Point(20, 30);
+            assertTrue(circle.getBounds().contains(topLeft),
+                    "The top-left corner of the bounding box (inclusive) should be contained");
+        }
+
+        @Test
+        void bottomRightCornerShouldNotBeContained() {
+            Point bottomRight = new Point(100, 110); // x + 2r, y + 2r
+            assertFalse(circle.getBounds().contains(bottomRight),
+                    "The bottom-right corner of the bounding box (exclusive) should not be contained");
+        }
+
+        @Test
+        void pointAfterTranslateShouldBeAtNewPosition() {
+            SCircle moved = SCircle.create(20, 30, 40);
+            moved.translate(50, 50); // new bounds: (70, 80, 80, 80)
+
+            Point oldCenter = new Point(60, 70);
+            assertFalse(moved.getBounds().contains(oldCenter),
+                    "After translate, old center should no longer be contained");
+
+            Point newCenter = new Point(110, 120);
+            assertTrue(moved.getBounds().contains(newCenter),
+                    "After translate, a point at the new center should be contained");
+        }
+    }
+
+    // -----------------------------------------------------------------------
+    // STriangle — bounds = (x, y, size, size)
+    // -----------------------------------------------------------------------
+
+    @Nested
+    class STriangleContainsPoint {
+
+        // Shape: origin (5, 15), size=60  →  bounds (5, 15, 60, 60)
+        // right-exclusive corner: (65, 75)
+        private final STriangle triangle = STriangle.create(5, 15, 60, Color.RED, Color.BLACK);
+
+        @Test
+        void pointInsideBoundsShouldBeContained() {
+            Point inside = new Point(35, 45);
+            assertTrue(triangle.getBounds().contains(inside),
+                    "A point inside the bounding box should be contained");
+        }
+
+        @Test
+        void pointOutsideBoundsShouldNotBeContained() {
+            Point outside = new Point(0, 0);
+            assertFalse(triangle.getBounds().contains(outside),
+                    "A point outside the bounding box should not be contained");
+        }
+
+        @Test
+        void topLeftCornerShouldBeContained() {
+            Point topLeft = new Point(5, 15);
+            assertTrue(triangle.getBounds().contains(topLeft),
+                    "The top-left corner of the bounding box (inclusive) should be contained");
+        }
+
+        @Test
+        void bottomRightCornerShouldNotBeContained() {
+            Point bottomRight = new Point(65, 75); // x + size, y + size
+            assertFalse(triangle.getBounds().contains(bottomRight),
+                    "The bottom-right corner of the bounding box (exclusive) should not be contained");
+        }
+
+        @Test
+        void pointAfterTranslateShouldBeAtNewPosition() {
+            STriangle moved = STriangle.create(5, 15, 60, Color.RED, Color.BLACK);
+            moved.translate(100, 100); // new bounds: (105, 115, 60, 60)
+
+            Point oldCenter = new Point(35, 45);
+            assertFalse(moved.getBounds().contains(oldCenter),
+                    "After translate, old center should no longer be contained");
+
+            Point newCenter = new Point(135, 145);
+            assertTrue(moved.getBounds().contains(newCenter),
+                    "After translate, a point at the new center should be contained");
+        }
+    }
+
+    // -----------------------------------------------------------------------
+    // SText — bounds = (x, y, 100, 20)
+    // -----------------------------------------------------------------------
+
+    @Nested
+    class STextContainsPoint {
+
+        // Shape: origin (50, 100)  →  bounds (50, 100, 100, 20)
+        // right-exclusive corner: (150, 120)
+        private final SText text = SText.create(50, 100, "Hello");
+
+        @Test
+        void pointInsideBoundsShouldBeContained() {
+            Point inside = new Point(100, 110);
+            assertTrue(text.getBounds().contains(inside),
+                    "A point inside the default text bounding box should be contained");
+        }
+
+        @Test
+        void pointOutsideBoundsShouldNotBeContained() {
+            Point outside = new Point(10, 10);
+            assertFalse(text.getBounds().contains(outside),
+                    "A point outside the text bounding box should not be contained");
+        }
+
+        @Test
+        void topLeftCornerShouldBeContained() {
+            Point topLeft = new Point(50, 100);
+            assertTrue(text.getBounds().contains(topLeft),
+                    "The top-left corner of the text bounding box (inclusive) should be contained");
+        }
+
+        @Test
+        void bottomRightCornerShouldNotBeContained() {
+            // Default bounds width=100, height=20  →  exclusive corner at (150, 120)
+            Point bottomRight = new Point(150, 120);
+            assertFalse(text.getBounds().contains(bottomRight),
+                    "The bottom-right corner of the text bounding box (exclusive) should not be contained");
+        }
+
+        @Test
+        void pointJustBeforeBottomRightShouldBeContained() {
+            Point justInside = new Point(149, 119);
+            assertTrue(text.getBounds().contains(justInside),
+                    "A point one pixel before the exclusive bottom-right boundary should be contained");
+        }
+
+        @Test
+        void pointAfterTranslateShouldBeAtNewPosition() {
+            // Original bounds: (50, 100, 100, 20) — covers x∈[50,150), y∈[100,120)
+            SText moved = SText.create(50, 100, "Hello");
+            moved.translate(-40, 10); // new bounds: (10, 110, 100, 20) — covers x∈[10,110), y∈[110,130)
+
+            // (130, 105) was inside original bounds but is now outside (x=130 >= 110, y=105 < 110)
+            Point oldPosition = new Point(130, 105);
+            assertFalse(moved.getBounds().contains(oldPosition),
+                    "After translate, a point that was in the old bounds should no longer be contained");
+
+            // (50, 115) is inside new bounds: x∈[10,110), y∈[110,130) ✓
+            Point newPosition = new Point(50, 115);
+            assertTrue(moved.getBounds().contains(newPosition),
+                    "After translate, a point in the new bounds should be contained");
+        }
+
+        @Test
+        void blankTextUsesDefaultPlaceholderAndSameBounds() {
+            // Even blank/null text falls back to the placeholder — bounds remain (x, y, 100, 20)
+            SText blankText = SText.create(0, 0, "");
+            Point inside = new Point(50, 10);
+            assertTrue(blankText.getBounds().contains(inside),
+                    "Blank text still uses default bounds; interior point should be contained");
+        }
+    }
+
+    // -----------------------------------------------------------------------
+    // SCollection — bounds = union of children bounds
+    // -----------------------------------------------------------------------
+
+    @Nested
+    class SCollectionContainsPoint {
+
+        // Two non-overlapping children:
+        //   rect1: (10, 10, 50, 50)  →  covers x∈[10,60), y∈[10,60)
+        //   rect2: (100, 100, 40, 40) →  covers x∈[100,140), y∈[100,140)
+        // Union bounds: (10, 10, 130, 130) →  exclusive corner: (140, 140)
+        private final SRectangle child1 = SRectangle.create(10, 10, 50, 50);
+        private final SRectangle child2 = SRectangle.create(100, 100, 40, 40);
+        private final SCollection collection = SCollection.of(child1, child2);
+
+        @Test
+        void pointInsideFirstChildBoundsShouldBeContained() {
+            Point insideChild1 = new Point(30, 30);
+            assertTrue(collection.getBounds().contains(insideChild1),
+                    "A point inside the first child's bounds is within the union and should be contained");
+        }
+
+        @Test
+        void pointInsideSecondChildBoundsShouldBeContained() {
+            Point insideChild2 = new Point(120, 120);
+            assertTrue(collection.getBounds().contains(insideChild2),
+                    "A point inside the second child's bounds is within the union and should be contained");
+        }
+
+        @Test
+        void pointInGapBetweenChildrenShouldBeContained() {
+            // The union rectangle spans the gap between the two children
+            Point inGap = new Point(70, 70);
+            assertTrue(collection.getBounds().contains(inGap),
+                    "A point in the gap between children is still inside the union bounds and should be contained");
+        }
+
+        @Test
+        void pointOutsideUnionShouldNotBeContained() {
+            Point outside = new Point(0, 0);
+            assertFalse(collection.getBounds().contains(outside),
+                    "A point outside the union bounds should not be contained");
+        }
+
+        @Test
+        void topLeftCornerOfUnionShouldBeContained() {
+            // Union top-left = (10, 10) — inclusive
+            Point topLeft = new Point(10, 10);
+            assertTrue(collection.getBounds().contains(topLeft),
+                    "The top-left corner of the union bounds (inclusive) should be contained");
+        }
+
+        @Test
+        void bottomRightCornerOfUnionShouldNotBeContained() {
+            // Union: x=10, y=10, w=130, h=130 → exclusive corner (140, 140)
+            Point bottomRight = new Point(140, 140);
+            assertFalse(collection.getBounds().contains(bottomRight),
+                    "The bottom-right corner of the union bounds (exclusive) should not be contained");
+        }
+
+        @Test
+        void pointAfterTranslatingChildrenShouldBeAtNewPosition() {
+            SRectangle movableChild = SRectangle.create(0, 0, 30, 30);
+            SCollection movable = SCollection.of(movableChild);
+
+            movable.translate(50, 50); // child now at (50, 50, 30, 30)
+
+            Point oldPoint = new Point(15, 15);
+            assertFalse(movable.getBounds().contains(oldPoint),
+                    "After translate, a point at the old location should not be contained");
+
+            Point newPoint = new Point(65, 65);
+            assertTrue(movable.getBounds().contains(newPoint),
+                    "After translate, a point at the new location should be contained");
+        }
+
+        @Test
+        void singleChildCollectionBoundsMatchChildBounds() {
+            SRectangle only = SRectangle.create(5, 5, 20, 20);
+            SCollection single = SCollection.of(only);
+
+            assertEquals(only.getBounds(), single.getBounds(),
+                    "A single-child collection's bounds should equal the child's own bounds");
+        }
+    }
+}

src/test/java/ovh/gasser/newshapes/shapes/EdgeCaseTest.java

@@ -0,0 +1,223 @@
+package ovh.gasser.newshapes.shapes;
+
+import ovh.gasser.newshapes.App;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EdgeCaseTest {
+
+    // -------------------------------------------------------------------------
+    // NegativeCoordinates
+    // -------------------------------------------------------------------------
+
+    @Nested
+    class NegativeCoordinates {
+
+        @Test
+        void rectangleAtNegativeCoordsShouldPreserveBounds() {
+            SRectangle rect = SRectangle.create(-10, -20, 50, 50);
+            Rectangle bounds = rect.getBounds();
+            assertEquals(-10, bounds.x,      "x should be -10");
+            assertEquals(-20, bounds.y,      "y should be -20");
+            assertEquals(50,  bounds.width,  "width should be 50");
+            assertEquals(50,  bounds.height, "height should be 50");
+        }
+
+        @Test
+        void circleAtNegativeCoordsShouldPreserveBounds() {
+            SCircle circle = SCircle.create(-30, -40, 25);
+            Rectangle bounds = circle.getBounds();
+            assertEquals(-30, bounds.x,      "x should be -30");
+            assertEquals(-40, bounds.y,      "y should be -40");
+            assertEquals(50,  bounds.width,  "width should be radius*2 = 50");
+            assertEquals(50,  bounds.height, "height should be radius*2 = 50");
+        }
+
+        @Test
+        void triangleAtNegativeCoordsShouldPreserveBounds() {
+            STriangle tri = STriangle.create(-5, -15, 60, Color.RED, Color.BLACK);
+            Rectangle bounds = tri.getBounds();
+            assertEquals(-5,  bounds.x,      "x should be -5");
+            assertEquals(-15, bounds.y,      "y should be -15");
+            assertEquals(60,  bounds.width,  "width should be 60");
+            assertEquals(60,  bounds.height, "height should be 60");
+        }
+
+        @Test
+        void translateToNegativePositionShouldUpdateBoundsCorrectly() {
+            SRectangle rect = SRectangle.create(10, 20, 80, 40);
+            rect.translate(-50, -70);
+            Rectangle bounds = rect.getBounds();
+            assertEquals(-40, bounds.x, "x after translate should be -40");
+            assertEquals(-50, bounds.y, "y after translate should be -50");
+            // dimensions must be unchanged
+            assertEquals(80, bounds.width,  "width must remain 80 after translate");
+            assertEquals(40, bounds.height, "height must remain 40 after translate");
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // ZeroDimensions
+    // -------------------------------------------------------------------------
+
+    @Nested
+    class ZeroDimensions {
+
+        @Test
+        void rectangleWithZeroWidthShouldReturnZeroWidthFromFactory() {
+            SRectangle rect = SRectangle.create(0, 0, 0, 50);
+            assertEquals(0, rect.getBounds().width,
+                    "factory should allow zero width without clamping");
+        }
+
+        @Test
+        void rectangleWithZeroHeightShouldReturnZeroHeightFromFactory() {
+            SRectangle rect = SRectangle.create(0, 0, 50, 0);
+            assertEquals(0, rect.getBounds().height,
+                    "factory should allow zero height without clamping");
+        }
+
+        @Test
+        void circleWithZeroRadiusShouldHaveZeroBoundsDimensions() {
+            SCircle circle = SCircle.create(5, 10, 0);
+            assertEquals(0, circle.getRadius(),        "radius should be 0");
+            assertEquals(0, circle.getBounds().width,  "bounds width should be 0 (radius*2)");
+            assertEquals(0, circle.getBounds().height, "bounds height should be 0 (radius*2)");
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // ResizeClamping
+    // -------------------------------------------------------------------------
+
+    @Nested
+    class ResizeClamping {
+
+        @Test
+        void rectangleResizedToNegativeShouldClampWidthToOne() {
+            // Start with a 10x10 rect and drag the E handle far to the left
+            SRectangle rect = SRectangle.create(0, 0, 10, 10);
+            rect.resize(ResizeHandle.E, -200, 0);
+            assertTrue(rect.getBounds().width >= 1,
+                    "width must be clamped to a minimum of 1 after negative resize");
+            assertEquals(1, rect.getBounds().width,
+                    "width should be exactly 1 after extreme negative resize on E handle");
+        }
+
+        @Test
+        void rectangleResizedToNegativeShouldClampHeightToOne() {
+            SRectangle rect = SRectangle.create(0, 0, 10, 10);
+            rect.resize(ResizeHandle.S, 0, -200);
+            assertTrue(rect.getBounds().height >= 1,
+                    "height must be clamped to a minimum of 1 after negative resize");
+            assertEquals(1, rect.getBounds().height,
+                    "height should be exactly 1 after extreme negative resize on S handle");
+        }
+
+        @Test
+        void circleResizedToNegativeShouldClampToTwo() {
+            SCircle circle = SCircle.create(0, 0, 50);
+            // Drag E handle far to the left → shrink
+            circle.resize(ResizeHandle.E, -500, 0);
+            assertTrue(circle.getBounds().width >= 2,
+                    "circle width must be clamped to a minimum of 2");
+            assertTrue(circle.getBounds().height >= 2,
+                    "circle height must be clamped to a minimum of 2");
+            assertEquals(2, circle.getBounds().width,
+                    "circle width should be exactly 2 after extreme negative resize");
+            assertEquals(2, circle.getBounds().height,
+                    "circle height should be exactly 2 after extreme negative resize");
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // NullHandling
+    // -------------------------------------------------------------------------
+
+    @Nested
+    class NullHandling {
+
+        @Test
+        void textCreatedWithNullShouldReturnPlaceholder() {
+            SText text = SText.create(0, 0, null);
+            assertEquals(SText.PLACEHOLDER_TEXT, text.getText(),
+                    "null input should be normalized to the placeholder text");
+        }
+
+        @Test
+        void textCreatedWithBlankStringShouldReturnPlaceholder() {
+            SText text = SText.create(0, 0, "   ");
+            assertEquals(SText.PLACEHOLDER_TEXT, text.getText(),
+                    "blank string input should be normalized to the placeholder text");
+        }
+
+        @Test
+        void getAttributesWithUnknownKeyShouldReturnNull() {
+            SRectangle rect = SRectangle.create(0, 0, 50, 50);
+            assertNull(rect.getAttributes("NONEXISTENT"),
+                    "getAttributes() with an unknown key must return null");
+        }
+
+        @Test
+        void emptyCollectionCreationShouldNotThrow() {
+            assertDoesNotThrow(() -> SCollection.of(),
+                    "SCollection.of() with no arguments must not throw");
+        }
+
+        @Test
+        void emptyCollectionGetBoundsShouldReturnWindowSize() {
+            SCollection collection = SCollection.of();
+            Rectangle bounds = collection.getBounds();
+            assertNotNull(bounds, "getBounds() on empty collection must not return null");
+            assertEquals(App.WIN_SIZE.width,  bounds.width,
+                    "empty collection bounds width should equal WIN_SIZE.width");
+            assertEquals(App.WIN_SIZE.height, bounds.height,
+                    "empty collection bounds height should equal WIN_SIZE.height");
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // LargeValues
+    // -------------------------------------------------------------------------
+
+    @Nested
+    class LargeValues {
+
+        @Test
+        void rectangleAtMaxIntHalfCoordsShouldNotThrow() {
+            int halfMax = Integer.MAX_VALUE / 2;
+            assertDoesNotThrow(() -> SRectangle.create(halfMax, halfMax, 100, 100),
+                    "SRectangle.create() with very large coordinates must not throw");
+        }
+
+        @Test
+        void rectangleAtMaxIntHalfCoordsPreservesBounds() {
+            int halfMax = Integer.MAX_VALUE / 2;
+            SRectangle rect = SRectangle.create(halfMax, halfMax, 100, 100);
+            assertEquals(halfMax, rect.getBounds().x,   "x should be Integer.MAX_VALUE/2");
+            assertEquals(halfMax, rect.getBounds().y,   "y should be Integer.MAX_VALUE/2");
+            assertEquals(100,     rect.getBounds().width,  "width should be 100");
+            assertEquals(100,     rect.getBounds().height, "height should be 100");
+        }
+
+        @Test
+        void translateWithLargeValuesShouldNotThrow() {
+            SRectangle rect = SRectangle.create(0, 0, 50, 50);
+            // Integer overflow is a known platform behaviour; we only assert no exception
+            assertDoesNotThrow(() -> rect.translate(Integer.MAX_VALUE, Integer.MAX_VALUE),
+                    "translate() with Integer.MAX_VALUE must not throw (overflow is acceptable)");
+        }
+
+        @Test
+        void translateWithLargeNegativeValuesShouldNotThrow() {
+            SRectangle rect = SRectangle.create(0, 0, 50, 50);
+            assertDoesNotThrow(() -> rect.translate(Integer.MIN_VALUE, Integer.MIN_VALUE),
+                    "translate() with Integer.MIN_VALUE must not throw (overflow is acceptable)");
+        }
+    }
+}

src/test/java/ovh/gasser/newshapes/shapes/SPolygonTest.java

@@ -1,142 +0,0 @@
-package ovh.gasser.newshapes.shapes;
-
-import org.junit.jupiter.api.Test;
-import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.attributes.SelectionAttributes;
-
-import java.awt.Color;
-import java.awt.Point;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
-class SPolygonTest {
-
-    private static final String POLYGON_CLASS = "ovh.gasser.newshapes.shapes.SPolygon";
-
-    @Test
-    void testCreateWithListOfPoints() {
-        assumeTrue(isPolygonAvailable(), "SPolygon is not present in this checkout");
-
-        var polygon = createPolygon(List.of(
-                new Point(10, 10),
-                new Point(20, 30),
-                new Point(40, 15)
-        ));
-
-        assertNotNull(polygon);
-        assertEquals(List.of(new Point(10, 10), new Point(20, 30), new Point(40, 15)), pointsOf(polygon));
-    }
-
-    @Test
-    void testCreateWithVarargs() {
-        assumeTrue(isPolygonAvailable(), "SPolygon is not present in this checkout");
-
-        var polygon = createPolygon(new Point(5, 5), new Point(15, 25), new Point(35, 10));
-
-        assertNotNull(polygon);
-        assertEquals(List.of(new Point(5, 5), new Point(15, 25), new Point(35, 10)), pointsOf(polygon));
-    }
-
-    @Test
-    void testDefaultAttributesAdded() {
-        assumeTrue(isPolygonAvailable(), "SPolygon is not present in this checkout");
-
-        var polygon = createPolygon(new Point(0, 0), new Point(10, 0), new Point(5, 10));
-
-        assertNotNull(getAttribute(polygon, SelectionAttributes.ID));
-        var colorAttrs = (ColorAttributes) getAttribute(polygon, ColorAttributes.ID);
-        assertNotNull(colorAttrs);
-        assertEquals(false, colorAttrs.filled);
-        assertEquals(true, colorAttrs.stroked);
-        assertEquals(Color.BLACK, colorAttrs.filledColor);
-        assertEquals(Color.BLACK, colorAttrs.strokedColor);
-    }
-
-    @Test
-    void testGetPointsReturnsUnmodifiableList() {
-        assumeTrue(isPolygonAvailable(), "SPolygon is not present in this checkout");
-
-        var polygon = createPolygon(new Point(0, 0), new Point(10, 0), new Point(5, 10));
-
-        assertThrows(UnsupportedOperationException.class,
-                () -> pointsOf(polygon).add(new Point(1, 1)));
-    }
-
-    @Test
-    void testGetPointsReturnsCorrectPoints() {
-        assumeTrue(isPolygonAvailable(), "SPolygon is not present in this checkout");
-
-        var polygon = createPolygon(Arrays.asList(
-                new Point(1, 2),
-                new Point(3, 4),
-                new Point(5, 6),
-                new Point(7, 8)
-        ));
-
-        assertEquals(Arrays.asList(
-                new Point(1, 2),
-                new Point(3, 4),
-                new Point(5, 6),
-                new Point(7, 8)
-        ), pointsOf(polygon));
-    }
-
-    private static Object createPolygon(Point... points) {
-        return createPolygon(Arrays.asList(points));
-    }
-
-    private static Object createPolygon(List<Point> points) {
-        try {
-            Class<?> polygonClass = Class.forName(POLYGON_CLASS);
-            try {
-                Method createWithList = polygonClass.getMethod("create", List.class);
-                return createWithList.invoke(null, points);
-            } catch (NoSuchMethodException ignored) {
-                Method createWithVarargs = polygonClass.getMethod("create", Point[].class);
-                return createWithVarargs.invoke(null, (Object) points.toArray(new Point[0]));
-            }
-        } catch (InvocationTargetException e) {
-            if (e.getCause() instanceof RuntimeException runtimeException) {
-                throw runtimeException;
-            }
-            throw new IllegalStateException(e.getCause());
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    private static boolean isPolygonAvailable() {
-        try {
-            Class.forName(POLYGON_CLASS);
-            return true;
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
-
-    private static Object getAttribute(Object polygon, String id) {
-        try {
-            Method getAttributes = polygon.getClass().getMethod("getAttributes", String.class);
-            return getAttributes.invoke(polygon, id);
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static List<Point> pointsOf(Object polygon) {
-        try {
-            Method getPoints = polygon.getClass().getMethod("getPoints");
-            return (List<Point>) getPoints.invoke(polygon);
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-}

src/test/java/ovh/gasser/newshapes/shapes/STextTest.java

@@ -44,4 +44,40 @@ class STextTest {
         SText text = SText.create(0, 0, null);
         assertEquals(SText.PLACEHOLDER_TEXT, text.getText());
     }
+
+    @Test
+    void testUpdateMeasuredBoundsActuallyUpdatesBounds() {
+        SText text = SText.create(10, 20, "Hello");
+        text.updateMeasuredBounds(200, 30);
+        Rectangle bounds = text.getBounds();
+        assertEquals(200, bounds.width, "updateMeasuredBounds must update width");
+        assertEquals(30, bounds.height, "updateMeasuredBounds must update height");
+    }
+
+    @Test
+    void testUpdateMeasuredBoundsDoesNotChangePosition() {
+        SText text = SText.create(10, 20, "Hello");
+        text.updateMeasuredBounds(200, 30);
+        Rectangle bounds = text.getBounds();
+        assertEquals(10, bounds.x, "updateMeasuredBounds must not change x");
+        assertEquals(20, bounds.y, "updateMeasuredBounds must not change y");
+    }
+
+    @Test
+    void testUpdateMeasuredBoundsNegativeClampedToZero() {
+        SText text = SText.create(0, 0, "Hello");
+        text.updateMeasuredBounds(-5, -10);
+        Rectangle bounds = text.getBounds();
+        assertEquals(0, bounds.width, "negative width must be clamped to 0");
+        assertEquals(0, bounds.height, "negative height must be clamped to 0");
+    }
+
+    @Test
+    void testUpdateMeasuredBoundsZeroIsAllowed() {
+        SText text = SText.create(0, 0, "Hello");
+        text.updateMeasuredBounds(0, 0);
+        Rectangle bounds = text.getBounds();
+        assertEquals(0, bounds.width);
+        assertEquals(0, bounds.height);
+    }
 }

src/test/java/ovh/gasser/newshapes/shapes/ShapeFactory.java

@@ -1,11 +1,6 @@
 package ovh.gasser.newshapes.shapes;
 
 import java.awt.Color;
-import java.awt.Point;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.stream.Stream;
 
 /**
@@ -21,100 +16,10 @@ public final class ShapeFactory {
                 SCircle.create(5, 5, 30),
                 STriangle.create(0, 0, 40, Color.RED, Color.BLACK),
                 SText.create(15, 25, "Hello"),
-                createPolygon(),
                 SCollection.of(
                         SRectangle.create(0, 0, 20, 20),
                         SCircle.create(10, 10, 5)
                 )
         );
     }
-
-    private static Shape createPolygon() {
-        List<Point> points = List.of(
-                new Point(0, 0),
-                new Point(10, 0),
-                new Point(5, 10)
-        );
-
-        try {
-            Class<?> polygonClass = Class.forName("ovh.gasser.newshapes.shapes.SPolygon");
-            try {
-                Method createWithList = polygonClass.getMethod("create", List.class);
-                return (Shape) createWithList.invoke(null, points);
-            } catch (NoSuchMethodException ignored) {
-                Method createWithVarargs = polygonClass.getMethod("create", Point[].class);
-                return (Shape) createWithVarargs.invoke(null, (Object) points.toArray(Point[]::new));
-            }
-        } catch (ClassNotFoundException | NoSuchMethodException |
-                 InvocationTargetException | IllegalAccessException e) {
-            return new FallbackPolygon(points);
-        }
-    }
-
-    private static final class FallbackPolygon implements Shape {
-
-        private final List<Point> points;
-
-        private FallbackPolygon(List<Point> points) {
-            this.points = copyPoints(points);
-        }
-
-        @Override
-        public void accept(ovh.gasser.newshapes.ShapeVisitor visitor) {
-        }
-
-        @Override
-        public void translate(int dx, int dy) {
-            for (Point point : points) {
-                point.translate(dx, dy);
-            }
-        }
-
-        @Override
-        public void resize(ResizeHandle handle, int dx, int dy) {
-        }
-
-        @Override
-        public ovh.gasser.newshapes.attributes.Attributes getAttributes(String key) {
-            return null;
-        }
-
-        @Override
-        public void addAttributes(ovh.gasser.newshapes.attributes.Attributes attr) {
-        }
-
-        @Override
-        public java.awt.Rectangle getBounds() {
-            return computeBounds(points);
-        }
-
-        @Override
-        public Shape clone() {
-            return new FallbackPolygon(points);
-        }
-
-        private static List<Point> copyPoints(List<Point> source) {
-            List<Point> copy = new ArrayList<>(source.size());
-            for (Point point : source) {
-                copy.add(new Point(point));
-            }
-            return copy;
-        }
-
-        private static java.awt.Rectangle computeBounds(List<Point> points) {
-            int minX = points.get(0).x;
-            int minY = points.get(0).y;
-            int maxX = points.get(0).x;
-            int maxY = points.get(0).y;
-
-            for (Point point : points) {
-                minX = Math.min(minX, point.x);
-                minY = Math.min(minY, point.y);
-                maxX = Math.max(maxX, point.x);
-                maxY = Math.max(maxY, point.y);
-            }
-
-            return new java.awt.Rectangle(minX, minY, maxX - minX, maxY - minY);
-        }
-    }
 }

src/test/java/ovh/gasser/newshapes/ui/ShapeDraftmanTest.java

@@ -1,507 +0,0 @@
-package ovh.gasser.newshapes.ui;
-
-import org.junit.jupiter.api.Test;
-import ovh.gasser.newshapes.attributes.ColorAttributes;
-
-import java.awt.*;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ImageObserver;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.text.AttributedCharacterIterator;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
-class ShapeDraftmanTest {
-
-    private static final String POLYGON_CLASS = "ovh.gasser.newshapes.shapes.SPolygon";
-
-    @Test
-    void testVisitPolygonDrawsPolygon() {
-        assumeTrue(isVisitPolygonAvailable(), "SPolygon or ShapeDraftman.visitPolygon() is not present in this checkout");
-
-        RecordingGraphics2D graphics = new RecordingGraphics2D();
-        ShapeDraftman draftman = new ShapeDraftman(graphics);
-        Object polygon = createPolygon(new Point(10, 10), new Point(30, 10), new Point(20, 25));
-
-        invokeVisitPolygon(draftman, polygon);
-
-        assertEquals(1, graphics.drawPolygonCalls(), "Should draw the polygon once");
-    }
-
-    @Test
-    void testVisitPolygonWithColors() {
-        assumeTrue(isVisitPolygonAvailable(), "SPolygon or ShapeDraftman.visitPolygon() is not present in this checkout");
-
-        RecordingGraphics2D graphics = new RecordingGraphics2D();
-        ShapeDraftman draftman = new ShapeDraftman(graphics);
-        Object polygon = createPolygon(new Point(0, 0), new Point(20, 0), new Point(10, 20));
-        addColorAttributes(polygon, new ColorAttributes(true, true, Color.RED, Color.BLUE));
-
-        invokeVisitPolygon(draftman, polygon);
-
-        assertEquals(List.of(Color.RED, Color.BLUE), graphics.colors(), "Should set fill and stroke colors in order");
-        assertEquals(1, graphics.fillPolygonCalls(), "Should fill the polygon once");
-        assertEquals(1, graphics.drawPolygonCalls(), "Should stroke the polygon once");
-    }
-
-    private static void invokeVisitPolygon(ShapeDraftman draftman, Object polygon) {
-        try {
-            Method visitPolygon = draftman.getClass().getMethod("visitPolygon", polygon.getClass());
-            visitPolygon.invoke(draftman, polygon);
-        } catch (InvocationTargetException e) {
-            throw new IllegalStateException(e.getCause());
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    private static void addColorAttributes(Object polygon, ColorAttributes attributes) {
-        try {
-            Method addAttributes = polygon.getClass().getMethod("addAttributes", Class.forName("ovh.gasser.newshapes.attributes.Attributes"));
-            addAttributes.invoke(polygon, attributes);
-        } catch (InvocationTargetException e) {
-            throw new IllegalStateException(e.getCause());
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    private static Object createPolygon(Point... points) {
-        return createPolygon(Arrays.asList(points));
-    }
-
-    private static Object createPolygon(List<Point> points) {
-        try {
-            Class<?> polygonClass = Class.forName(POLYGON_CLASS);
-            try {
-                Method createWithList = polygonClass.getMethod("create", List.class);
-                return createWithList.invoke(null, points);
-            } catch (NoSuchMethodException ignored) {
-                Method createWithVarargs = polygonClass.getMethod("create", Point[].class);
-                return createWithVarargs.invoke(null, (Object) points.toArray(new Point[0]));
-            }
-        } catch (InvocationTargetException e) {
-            if (e.getCause() instanceof RuntimeException runtimeException) {
-                throw runtimeException;
-            }
-            throw new IllegalStateException(e.getCause());
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    private static boolean isVisitPolygonAvailable() {
-        try {
-            Class<?> polygonClass = Class.forName(POLYGON_CLASS);
-            return Arrays.stream(ShapeDraftman.class.getMethods())
-                    .anyMatch(method -> method.getName().equals("visitPolygon")
-                            && method.getParameterCount() == 1
-                            && method.getParameterTypes()[0].isAssignableFrom(polygonClass));
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
-
-    private static final class RecordingGraphics2D extends Graphics2D {
-
-        private final Graphics2D delegate = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).createGraphics();
-        private final List<Color> colors = new ArrayList<>();
-        private int fillPolygonCalls;
-        private int drawPolygonCalls;
-
-        List<Color> colors() {
-            return List.copyOf(colors);
-        }
-
-        int fillPolygonCalls() {
-            return fillPolygonCalls;
-        }
-
-        int drawPolygonCalls() {
-            return drawPolygonCalls;
-        }
-
-        @Override
-        public void setColor(Color c) {
-            colors.add(c);
-            delegate.setColor(c);
-        }
-
-        @Override
-        public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) {
-            fillPolygonCalls++;
-            delegate.fillPolygon(xPoints, yPoints, nPoints);
-        }
-
-        @Override
-        public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) {
-            drawPolygonCalls++;
-            delegate.drawPolygon(xPoints, yPoints, nPoints);
-        }
-
-        @Override
-        public void addRenderingHints(Map<?, ?> hints) {
-            delegate.addRenderingHints(hints);
-        }
-
-        @Override
-        public void clip(Shape s) {
-            delegate.clip(s);
-        }
-
-        @Override
-        public void draw(Shape s) {
-            delegate.draw(s);
-        }
-
-        @Override
-        public void drawGlyphVector(GlyphVector g, float x, float y) {
-            delegate.drawGlyphVector(g, x, y);
-        }
-
-        @Override
-        public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) {
-            return delegate.drawImage(img, xform, obs);
-        }
-
-        @Override
-        public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y) {
-            delegate.drawImage(img, op, x, y);
-        }
-
-        @Override
-        public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
-            delegate.drawRenderableImage(img, xform);
-        }
-
-        @Override
-        public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
-            delegate.drawRenderedImage(img, xform);
-        }
-
-        @Override
-        public void drawString(String str, int x, int y) {
-            delegate.drawString(str, x, y);
-        }
-
-        @Override
-        public void drawString(String str, float x, float y) {
-            delegate.drawString(str, x, y);
-        }
-
-        @Override
-        public void drawString(AttributedCharacterIterator iterator, int x, int y) {
-            delegate.drawString(iterator, x, y);
-        }
-
-        @Override
-        public void drawString(AttributedCharacterIterator iterator, float x, float y) {
-            delegate.drawString(iterator, x, y);
-        }
-
-        @Override
-        public void fill(Shape s) {
-            delegate.fill(s);
-        }
-
-        @Override
-        public Color getBackground() {
-            return delegate.getBackground();
-        }
-
-        @Override
-        public Composite getComposite() {
-            return delegate.getComposite();
-        }
-
-        @Override
-        public GraphicsConfiguration getDeviceConfiguration() {
-            return delegate.getDeviceConfiguration();
-        }
-
-        @Override
-        public FontRenderContext getFontRenderContext() {
-            return delegate.getFontRenderContext();
-        }
-
-        @Override
-        public Paint getPaint() {
-            return delegate.getPaint();
-        }
-
-        @Override
-        public Object getRenderingHint(RenderingHints.Key hintKey) {
-            return delegate.getRenderingHint(hintKey);
-        }
-
-        @Override
-        public RenderingHints getRenderingHints() {
-            return delegate.getRenderingHints();
-        }
-
-        @Override
-        public Stroke getStroke() {
-            return delegate.getStroke();
-        }
-
-        @Override
-        public AffineTransform getTransform() {
-            return delegate.getTransform();
-        }
-
-        @Override
-        public boolean hit(Rectangle rect, Shape s, boolean onStroke) {
-            return delegate.hit(rect, s, onStroke);
-        }
-
-        @Override
-        public void rotate(double theta) {
-            delegate.rotate(theta);
-        }
-
-        @Override
-        public void rotate(double theta, double x, double y) {
-            delegate.rotate(theta, x, y);
-        }
-
-        @Override
-        public void scale(double sx, double sy) {
-            delegate.scale(sx, sy);
-        }
-
-        @Override
-        public void setBackground(Color color) {
-            delegate.setBackground(color);
-        }
-
-        @Override
-        public void setComposite(Composite comp) {
-            delegate.setComposite(comp);
-        }
-
-        @Override
-        public void setPaint(Paint paint) {
-            delegate.setPaint(paint);
-        }
-
-        @Override
-        public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue) {
-            delegate.setRenderingHint(hintKey, hintValue);
-        }
-
-        @Override
-        public void setRenderingHints(Map<?, ?> hints) {
-            delegate.setRenderingHints(hints);
-        }
-
-        @Override
-        public void setStroke(Stroke s) {
-            delegate.setStroke(s);
-        }
-
-        @Override
-        public void setTransform(AffineTransform Tx) {
-            delegate.setTransform(Tx);
-        }
-
-        @Override
-        public void shear(double shx, double shy) {
-            delegate.shear(shx, shy);
-        }
-
-        @Override
-        public void transform(AffineTransform Tx) {
-            delegate.transform(Tx);
-        }
-
-        @Override
-        public void translate(int x, int y) {
-            delegate.translate(x, y);
-        }
-
-        @Override
-        public void translate(double tx, double ty) {
-            delegate.translate(tx, ty);
-        }
-
-        @Override
-        public void clearRect(int x, int y, int width, int height) {
-            delegate.clearRect(x, y, width, height);
-        }
-
-        @Override
-        public void clipRect(int x, int y, int width, int height) {
-            delegate.clipRect(x, y, width, height);
-        }
-
-        @Override
-        public void copyArea(int x, int y, int width, int height, int dx, int dy) {
-            delegate.copyArea(x, y, width, height, dx, dy);
-        }
-
-        @Override
-        public Graphics create() {
-            return delegate.create();
-        }
-
-        @Override
-        public void dispose() {
-            delegate.dispose();
-        }
-
-        @Override
-        public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-            delegate.drawArc(x, y, width, height, startAngle, arcAngle);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
-            return delegate.drawImage(img, x, y, observer);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver observer) {
-            return delegate.drawImage(img, x, y, bgcolor, observer);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int x, int y, int width, int height, ImageObserver observer) {
-            return delegate.drawImage(img, x, y, width, height, observer);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int x, int y, int width, int height, Color bgcolor, ImageObserver observer) {
-            return delegate.drawImage(img, x, y, width, height, bgcolor, observer);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
-                                 int sx1, int sy1, int sx2, int sy2, ImageObserver observer) {
-            return delegate.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
-                                 int sx1, int sy1, int sx2, int sy2, Color bgcolor, ImageObserver observer) {
-            return delegate.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, bgcolor, observer);
-        }
-
-        @Override
-        public void drawLine(int x1, int y1, int x2, int y2) {
-            delegate.drawLine(x1, y1, x2, y2);
-        }
-
-        @Override
-        public void drawOval(int x, int y, int width, int height) {
-            delegate.drawOval(x, y, width, height);
-        }
-
-        @Override
-        public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) {
-            delegate.drawPolyline(xPoints, yPoints, nPoints);
-        }
-
-        @Override
-        public void drawRect(int x, int y, int width, int height) {
-            delegate.drawRect(x, y, width, height);
-        }
-
-        @Override
-        public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) {
-            delegate.drawRoundRect(x, y, width, height, arcWidth, arcHeight);
-        }
-
-        @Override
-        public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-            delegate.fillArc(x, y, width, height, startAngle, arcAngle);
-        }
-
-        @Override
-        public void fillOval(int x, int y, int width, int height) {
-            delegate.fillOval(x, y, width, height);
-        }
-
-        @Override
-        public void fillRect(int x, int y, int width, int height) {
-            delegate.fillRect(x, y, width, height);
-        }
-
-        @Override
-        public void fillRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) {
-            delegate.fillRoundRect(x, y, width, height, arcWidth, arcHeight);
-        }
-
-        @Override
-        public Shape getClip() {
-            return delegate.getClip();
-        }
-
-        @Override
-        public Rectangle getClipBounds() {
-            return delegate.getClipBounds();
-        }
-
-        @Override
-        public Color getColor() {
-            return delegate.getColor();
-        }
-
-        @Override
-        public Font getFont() {
-            return delegate.getFont();
-        }
-
-        @Override
-        public FontMetrics getFontMetrics(Font f) {
-            return delegate.getFontMetrics(f);
-        }
-
-        @Override
-        public void setClip(int x, int y, int width, int height) {
-            delegate.setClip(x, y, width, height);
-        }
-
-        @Override
-        public void setClip(Shape clip) {
-            delegate.setClip(clip);
-        }
-
-        @Override
-        public void setFont(Font font) {
-            delegate.setFont(font);
-        }
-
-        @Override
-        public void setPaintMode() {
-            delegate.setPaintMode();
-        }
-
-        @Override
-        public void setXORMode(Color c1) {
-            delegate.setXORMode(c1);
-        }
-
-        @Override
-        public void drawChars(char[] data, int offset, int length, int x, int y) {
-            delegate.drawChars(data, offset, length, x, y);
-        }
-
-        @Override
-        public void drawBytes(byte[] data, int offset, int length, int x, int y) {
-            delegate.drawBytes(data, offset, length, x, y);
-        }
-
-    }
-}

src/test/java/ovh/gasser/newshapes/ui/visitors/HTMLDraftmanTest.java

@@ -11,7 +11,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 class HTMLDraftmanTest {
 
@@ -250,152 +249,6 @@ class HTMLDraftmanTest {
         }
     }
 
-    // ── visitPolygon ────────────────────────────────────────────────
-
-    @Nested
-    class VisitPolygonTests {
-
-        private static final String POLYGON_CLASS = "ovh.gasser.newshapes.shapes.SPolygon";
-
-        @Test
-        void testPolygonProducesSvgElement() {
-            assumeTrue(isPolygonFeatureAvailable(), "SPolygon/visitPolygon is not present in this checkout");
-
-            Object polygon = createPolygon(
-                    new Point(10, 20),
-                    new Point(60, 20),
-                    new Point(40, 80)
-            );
-
-            invokeVisitPolygon(polygon);
-
-            String html = html();
-            assertTrue(html.contains("<svg") && html.contains("class=\"poly"), "HTML should contain svg element with poly class");
-            assertTrue(html.contains("<polygon"), "HTML should contain polygon element");
-            assertTrue(html.contains("</svg>"), "HTML should close svg element");
-        }
-
-        @Test
-        void testPolygonSvgContainsCorrectPoints() {
-            assumeTrue(isPolygonFeatureAvailable(), "SPolygon/visitPolygon is not present in this checkout");
-
-            Object polygon = createPolygon(
-                    new Point(10, 20),
-                    new Point(60, 20),
-                    new Point(40, 80)
-            );
-
-            invokeVisitPolygon(polygon);
-
-            String html = html();
-            assertTrue(html.contains("points=\"10,20 60,20 40,80\""), "SVG polygon should contain correct points");
-        }
-
-        @Test
-        void testPolygonCssContainsCorrectPosition() {
-            assumeTrue(isPolygonFeatureAvailable(), "SPolygon/visitPolygon is not present in this checkout");
-
-            Object polygon = createPolygon(
-                    new Point(10, 20),
-                    new Point(60, 20),
-                    new Point(40, 80)
-            );
-
-            invokeVisitPolygon(polygon);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("position:"), "CSS should contain position");
-            assertTrue(cssOut.contains("top:"), "CSS should contain top position");
-            assertTrue(cssOut.contains("left:"), "CSS should contain left position");
-            assertTrue(cssOut.contains("width:"), "CSS should contain width");
-            assertTrue(cssOut.contains("height:"), "CSS should contain height");
-        }
-
-        @Test
-        void testPolygonSvgContainsFillAndStrokeAttributes() {
-            assumeTrue(isPolygonFeatureAvailable(), "SPolygon/visitPolygon is not present in this checkout");
-
-            Object polygon = createPolygon(
-                    new Point(10, 20),
-                    new Point(60, 20),
-                    new Point(40, 80)
-            );
-            addColorAttributes(polygon, new ColorAttributes(true, true, Color.RED, Color.BLUE));
-
-            invokeVisitPolygon(polygon);
-
-            String html = html();
-            assertTrue(html.contains("fill=\"#ff0000\""), "SVG polygon should contain fill color");
-            assertTrue(html.contains("stroke=\"#0000ff\""), "SVG polygon should contain stroke color");
-        }
-
-        private static boolean isPolygonFeatureAvailable() {
-            try {
-                Class.forName(POLYGON_CLASS);
-            } catch (ClassNotFoundException e) {
-                return false;
-            }
-
-            for (var method : HTMLDraftman.class.getMethods()) {
-                if (method.getName().equals("visitPolygon") && method.getParameterCount() == 1) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private Object createPolygon(Point... points) {
-            return createPolygon(java.util.List.of(points));
-        }
-
-        private Object createPolygon(java.util.List<Point> points) {
-            try {
-                Class<?> polygonClass = Class.forName(POLYGON_CLASS);
-                try {
-                    return polygonClass.getMethod("create", java.util.List.class).invoke(null, points);
-                } catch (NoSuchMethodException ignored) {
-                    return polygonClass.getMethod("create", Point[].class).invoke(null, (Object) points.toArray(new Point[0]));
-                }
-            } catch (java.lang.reflect.InvocationTargetException e) {
-                if (e.getCause() instanceof RuntimeException runtimeException) {
-                    throw runtimeException;
-                }
-                throw new IllegalStateException(e.getCause());
-            } catch (ReflectiveOperationException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-
-        private void addColorAttributes(Object polygon, ColorAttributes attrs) {
-            for (var method : polygon.getClass().getMethods()) {
-                if (method.getName().equals("addAttributes") && method.getParameterCount() == 1) {
-                    try {
-                        method.invoke(polygon, attrs);
-                        return;
-                    } catch (ReflectiveOperationException e) {
-                        throw new IllegalStateException(e);
-                    }
-                }
-            }
-
-            throw new IllegalStateException("No addAttributes method found on polygon");
-        }
-
-        private void invokeVisitPolygon(Object polygon) {
-            try {
-                for (var method : draftman.getClass().getMethods()) {
-                    if (method.getName().equals("visitPolygon") && method.getParameterCount() == 1) {
-                        method.invoke(draftman, polygon);
-                        return;
-                    }
-                }
-                throw new IllegalStateException("No visitPolygon method found on HTMLDraftman");
-            } catch (ReflectiveOperationException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-    }
-
     // ── visitText ───────────────────────────────────────────────────
 
     @Nested

src/test/java/ovh/gasser/newshapes/ui/visitors/SVGDraftmanTest.java

@@ -1,18 +1,14 @@
 package ovh.gasser.newshapes.ui.visitors;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import ovh.gasser.newshapes.attributes.Attributes;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
 import ovh.gasser.newshapes.shapes.*;
 
 import java.awt.*;
-import java.lang.reflect.Method;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -212,107 +208,6 @@ class SVGDraftmanTest {
         }
     }
 
-    @Nested
-    class VisitPolygonTests {
-
-        private Object createPolygon(Point... points) {
-            try {
-                Class<?> polygonClass = Class.forName("ovh.gasser.newshapes.shapes.SPolygon");
-                try {
-                    Method createWithList = polygonClass.getMethod("create", List.class);
-                    return createWithList.invoke(null, List.of(points));
-                } catch (NoSuchMethodException ignored) {
-                    Method createWithVarargs = polygonClass.getMethod("create", Point[].class);
-                    return createWithVarargs.invoke(null, (Object) points);
-                }
-            } catch (ClassNotFoundException e) {
-                Assumptions.assumeTrue(false, "SPolygon is not available locally");
-                return null;
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        private void visitPolygon(Object polygon) {
-            try {
-                Method visitPolygon = null;
-                for (Method method : draftman.getClass().getMethods()) {
-                    if (method.getName().equals("visitPolygon")
-                            && method.getParameterCount() == 1
-                            && method.getParameterTypes()[0].isAssignableFrom(polygon.getClass())) {
-                        visitPolygon = method;
-                        break;
-                    }
-                }
-                if (visitPolygon == null) {
-                    Assumptions.assumeTrue(false, "SVGDraftman.visitPolygon is not available locally");
-                    return;
-                }
-                visitPolygon.invoke(draftman, polygon);
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Test
-        void testPolygonElementWithCorrectPoints() {
-            Object polygon = createPolygon(new Point(10, 20), new Point(30, 40), new Point(50, 60));
-            visitPolygon(polygon);
-
-            String svg = output();
-            assertTrue(svg.contains("<polygon"), "Should produce a <polygon> element");
-            assertTrue(svg.contains("points=\"10,20 30,40 50,60\""), "Should contain the correct points");
-        }
-
-        @Test
-        void testPolygonFilledOnly() {
-            Object polygon = createPolygon(new Point(0, 0), new Point(20, 0), new Point(10, 10));
-            try {
-                Method addAttributes = polygon.getClass().getMethod("addAttributes", Attributes.class);
-                addAttributes.invoke(polygon, new ColorAttributes(true, false, Color.RED, Color.BLACK));
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-            visitPolygon(polygon);
-
-            String svg = output();
-            assertTrue(svg.contains("fill:#ff0000"), "Should contain fill style");
-            assertFalse(svg.contains("stroke:"), "Should not contain stroke style when not stroked");
-        }
-
-        @Test
-        void testPolygonStrokedOnly() {
-            Object polygon = createPolygon(new Point(0, 0), new Point(20, 0), new Point(10, 10));
-            try {
-                Method addAttributes = polygon.getClass().getMethod("addAttributes", Attributes.class);
-                addAttributes.invoke(polygon, new ColorAttributes(false, true, Color.RED, Color.BLUE));
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-            visitPolygon(polygon);
-
-            String svg = output();
-            assertTrue(svg.contains("stroke:#0000ff"), "Should contain stroke style");
-            assertTrue(svg.contains("fill:none"), "Should have fill:none when not filled");
-        }
-
-        @Test
-        void testPolygonFilledAndStroked() {
-            Object polygon = createPolygon(new Point(0, 0), new Point(20, 0), new Point(10, 10));
-            try {
-                Method addAttributes = polygon.getClass().getMethod("addAttributes", Attributes.class);
-                addAttributes.invoke(polygon, new ColorAttributes(true, true, Color.YELLOW, Color.BLACK));
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-            visitPolygon(polygon);
-
-            String svg = output();
-            assertTrue(svg.contains("fill:#ffff00"), "Should contain fill style");
-            assertTrue(svg.contains("stroke:#000000"), "Should contain stroke style");
-        }
-    }
-
     // ── visitText ───────────────────────────────────────────────────
 
     @Nested