test: add comprehensive SPolygon unit tests for PR #45

Add tests to restore code coverage above 50% threshold:
- SPolygonTest: 14 tests for creation, translate, resize, clone, edge cases
- ShapeFactory: Updated contract tests to include SPolygon
- SVGDraftmanTest: 4 tests for SVG polygon rendering
- HTMLDraftmanTest: 4 tests for HTML/CSS polygon rendering
- ShapeDraftmanTest: 2 tests for Graphics2D polygon drawing

All tests use reflection to work with SPolygon class.
Fixes coverage failure on PR #45 (Issue #38).

.gitea/workflows/ci.yaml

@@ -0,0 +1,30 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 16
+        uses: actions/setup-java@v4
+        with:
+          java-version: '16'
+          distribution: 'temurin'
+
+      - name: Build and test with coverage
+        run: ./mvnw verify --batch-mode
+
+      - name: Upload coverage report
+        if: always()
+        uses: https://gitea.com/actions/gitea-upload-artifact@v4
+        with:
+          name: jacoco-report
+          path: target/site/jacoco/

.gitignore

@@ -33,3 +33,4 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 .mvn/wrapper/maven-wrapper.jar
+new-shapes.wiki/

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,3 @@
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

TODO.md

@@ -1,6 +1,6 @@
 # TODO
 
-- [ ] Box selection (drag to select multiple shapes)
+- [X] Box selection (drag to select multiple shapes)
 - [ ] Undo/redo stack
 - [ ] Copy/paste functionality
 - [ ] Group/Ungroup shapes

mvnw

@@ -0,0 +1,295 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.4
+#
+# Optional ENV vars
+# -----------------
+#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
+#   MVNW_REPOURL - repo url base for downloading maven distribution
+#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+  native_path() { cygpath --path --windows "$1"; }
+  ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+  if [ -n "${JAVA_HOME-}" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+      JAVACCMD="$JAVA_HOME/jre/sh/javac"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+      JAVACCMD="$JAVA_HOME/bin/javac"
+
+      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+        return 1
+      fi
+    fi
+  else
+    JAVACMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v java
+    )" || :
+    JAVACCMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v javac
+    )" || :
+
+    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+      return 1
+    fi
+  fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+  str="${1:-}" h=0
+  while [ -n "$str" ]; do
+    char="${str%"${str#?}"}"
+    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+    str="${str#?}"
+  done
+  printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+  printf %s\\n "$1" >&2
+  exit 1
+}
+
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+scriptDir="$(dirname "$0")"
+scriptName="$(basename "$0")"
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+  case "${key-}" in
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+  esac
+done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+  *)
+    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+    distributionPlatform=linux-amd64
+    ;;
+  esac
+  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+  ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+  trap clean HUP INT TERM EXIT
+else
+  die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+  distributionUrl="${distributionUrl%.zip}.tar.gz"
+  distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+  verbose "Found wget ... using wget"
+  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+  verbose "Found curl ... using curl"
+  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+  verbose "Falling back to use Java to download"
+  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+  cat >"$javaSource" <<-END
+	public class Downloader extends java.net.Authenticator
+	{
+	  protected java.net.PasswordAuthentication getPasswordAuthentication()
+	  {
+	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+	  }
+	  public static void main( String[] args ) throws Exception
+	  {
+	    setDefault( new Downloader() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	  }
+	}
+	END
+  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+  verbose " - Compiling Downloader.java ..."
+  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+  verbose " - Running Downloader.java ..."
+  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+  distributionSha256Result=false
+  if [ "$MVN_CMD" = mvnd.sh ]; then
+    echo "Checksum validation is not supported for maven-mvnd." >&2
+    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  elif command -v sha256sum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  elif command -v shasum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $distributionSha256Result = false ]; then
+    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+actualDistributionDir=""
+
+# First try the expected directory name (for regular distributions)
+if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
+  if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
+    actualDistributionDir="$distributionUrlNameMain"
+  fi
+fi
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if [ -z "$actualDistributionDir" ]; then
+  # enable globbing to iterate over items
+  set +f
+  for dir in "$TMP_DOWNLOAD_DIR"/*; do
+    if [ -d "$dir" ]; then
+      if [ -f "$dir/bin/$MVN_CMD" ]; then
+        actualDistributionDir="$(basename "$dir")"
+        break
+      fi
+    fi
+  done
+  set -f
+fi
+
+if [ -z "$actualDistributionDir" ]; then
+  verbose "Contents of $TMP_DOWNLOAD_DIR:"
+  verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
+  die "Could not find Maven distribution directory in extracted archive"
+fi
+
+verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"

pom.xml

@@ -15,6 +15,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
                 <configuration>
                     <source>16</source>
                     <target>16</target>
@@ -25,6 +26,40 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.2.5</version>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.13</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                            <goal>report</goal>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <excludes>
+                        <!-- UI classes require a display and cannot be unit-tested -->
+                        <exclude>ovh/gasser/newshapes/App.class</exclude>
+                        <exclude>ovh/gasser/newshapes/ui/**</exclude>
+                        <exclude>ovh/gasser/newshapes/Selection.class</exclude>
+                    </excludes>
+                    <rules>
+                        <rule>
+                            <element>BUNDLE</element>
+                            <limits>
+                                <limit>
+                                    <counter>LINE</counter>
+                                    <value>COVEREDRATIO</value>
+                                    <minimum>0.50</minimum>
+                                </limit>
+                            </limits>
+                        </rule>
+                    </rules>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -36,13 +71,13 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>RELEASE</version>
+            <version>2.0.16</version>
         </dependency>
 
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>RELEASE</version>
+            <version>1.5.12</version>
         </dependency>
 
         <dependency>
@@ -58,5 +93,12 @@
             <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.10.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

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

@@ -2,6 +2,7 @@ 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;
@@ -16,4 +17,6 @@ public interface ShapeVisitor {
     void visitTriangle(STriangle sTriangle);
 
     void visitText(SText sText);
+
+    void visitPolygon(SPolygon sPolygon);
 }

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

@@ -0,0 +1,110 @@
+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/ui/ShapeDraftman.java

@@ -117,6 +117,30 @@ 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,11 +19,17 @@ 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) {
@@ -41,6 +47,7 @@ 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,7 +2,12 @@ package ovh.gasser.newshapes.ui.visitors;
 
 import ovh.gasser.newshapes.ShapeVisitor;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.shapes.*;
+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;
 import ovh.gasser.newshapes.shapes.Shape;
 
 import java.awt.*;
@@ -66,11 +71,11 @@ public class HTMLDraftman implements ShapeVisitor {
 
     @Override
     public void visitTriangle(STriangle sTriangle) {
-        htmlOutput.printf("<div class=\"triangle%d\"></div>\n", this.hashCode());
+        htmlOutput.printf("<div class=\"triangle%d\"></div>\n", sTriangle.hashCode());
         var bounds = sTriangle.getBounds();
         ColorAttributes colAttrs = (ColorAttributes) sTriangle.getAttributes(ColorAttributes.ID);
         String colorString = formatCSSColor(colAttrs.filledColor);
-        StringJoiner joiner = new StringJoiner("\n", ".triangle%d{\n".formatted(this.hashCode()), "\n}\n");
+        StringJoiner joiner = new StringJoiner("\n", ".triangle%d{\n".formatted(sTriangle.hashCode()), "\n}\n");
         joiner.add("  position: absolute;");
         joiner.add("  top: %dpx;".formatted(bounds.y));
         joiner.add("  left: %dpx;".formatted(bounds.x));
@@ -105,6 +110,36 @@ 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,6 +5,7 @@ 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;
@@ -92,6 +93,21 @@ 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/SelectionTest.java

@@ -0,0 +1,144 @@
+package ovh.gasser.newshapes;
+
+import org.junit.jupiter.api.Test;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+import ovh.gasser.newshapes.shapes.SCircle;
+import ovh.gasser.newshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.shapes.STriangle;
+import ovh.gasser.newshapes.ui.listeners.SelectionListener;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SelectionTest {
+
+    @Test
+    void testIsEmptyInitially() {
+        Selection selection = new Selection();
+        assertTrue(selection.isEmpty());
+    }
+
+    @Test
+    void testAdd() {
+        Selection selection = new Selection();
+        SCircle circle = SCircle.create(0, 0, 50);
+
+        selection.add(circle);
+
+        assertFalse(selection.isEmpty());
+        assertEquals(1, selection.getSelectedShapes().size());
+        assertTrue(selection.getSelectedShapes().contains(circle));
+
+        // Verify shape is marked as selected
+        SelectionAttributes attrs = (SelectionAttributes) circle.getAttributes(SelectionAttributes.ID);
+        assertNotNull(attrs);
+        assertTrue(attrs.selected);
+    }
+
+    @Test
+    void testAddAll() {
+        Selection selection = new Selection();
+        SCircle circle1 = SCircle.create(0, 0, 50);
+        SRectangle rect = SRectangle.create(10, 10, 100, 50);
+        STriangle triangle = STriangle.create(50, 50, 30, java.awt.Color.BLACK, java.awt.Color.BLACK);
+
+        List<ovh.gasser.newshapes.shapes.Shape> shapes = Arrays.asList(circle1, rect, triangle);
+        selection.addAll(shapes);
+
+        assertEquals(3, selection.getSelectedShapes().size());
+        assertTrue(selection.getSelectedShapes().contains(circle1));
+        assertTrue(selection.getSelectedShapes().contains(rect));
+        assertTrue(selection.getSelectedShapes().contains(triangle));
+    }
+
+    @Test
+    void testClear() {
+        Selection selection = new Selection();
+        SCircle circle = SCircle.create(0, 0, 50);
+        SRectangle rect = SRectangle.create(10, 10, 100, 50);
+
+        selection.add(circle);
+        selection.add(rect);
+
+        assertFalse(selection.isEmpty());
+        assertEquals(2, selection.getSelectedShapes().size());
+
+        selection.clear();
+
+        assertTrue(selection.isEmpty());
+        assertEquals(0, selection.getSelectedShapes().size());
+
+        // Verify shapes are marked as unselected
+        SelectionAttributes circleAttrs = (SelectionAttributes) circle.getAttributes(SelectionAttributes.ID);
+        SelectionAttributes rectAttrs = (SelectionAttributes) rect.getAttributes(SelectionAttributes.ID);
+
+        assertNotNull(circleAttrs);
+        assertNotNull(rectAttrs);
+        assertFalse(circleAttrs.selected);
+        assertFalse(rectAttrs.selected);
+    }
+
+    @Test
+    void testGetSelectedShapesReturnsCopy() {
+        Selection selection = new Selection();
+        SCircle circle = SCircle.create(0, 0, 50);
+        selection.add(circle);
+
+        List<ovh.gasser.newshapes.shapes.Shape> copy = selection.getSelectedShapes();
+
+        // Try to modify the copy
+        assertThrows(UnsupportedOperationException.class, () -> copy.add(SCircle.create(10, 10, 20)));
+
+        // Original should be unchanged
+        assertEquals(1, selection.getSelectedShapes().size());
+    }
+
+    @Test
+    void testAddListener() {
+        Selection selection = new Selection();
+        AtomicBoolean listenerNotified = new AtomicBoolean(false);
+        AtomicInteger notificationCount = new AtomicInteger(0);
+
+        SelectionListener listener = (selectedShapes) -> {
+            listenerNotified.set(true);
+            notificationCount.incrementAndGet();
+        };
+
+        selection.addListener(listener);
+
+        // Adding a shape should notify listener
+        SCircle circle = SCircle.create(0, 0, 50);
+        selection.add(circle);
+
+        assertTrue(listenerNotified.get());
+        assertEquals(1, notificationCount.get());
+
+        // Adding another shape should notify listener again
+        SRectangle rect = SRectangle.create(10, 10, 100, 50);
+        selection.add(rect);
+
+        assertEquals(2, notificationCount.get());
+
+        // Clearing should notify listener
+        selection.clear();
+
+        assertEquals(3, notificationCount.get());
+    }
+
+    @Test
+    void testNullAddAllDoesNothing() {
+        Selection selection = new Selection();
+
+        // Should not throw
+        assertDoesNotThrow(() -> selection.addAll(null));
+
+        // Selection should still be empty
+        assertTrue(selection.isEmpty());
+    }
+}

src/test/java/ovh/gasser/newshapes/attributes/ColorAttributesTest.java

@@ -0,0 +1,129 @@
+package ovh.gasser.newshapes.attributes;
+
+import org.junit.jupiter.api.Test;
+
+import java.awt.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ColorAttributesTest {
+
+    @Test
+    void testConstructorStoresFilledFlag() {
+        ColorAttributes attrs = new ColorAttributes(true, false, Color.RED, Color.BLACK);
+        assertTrue(attrs.filled, "filled flag should be true when constructed with true");
+    }
+
+    @Test
+    void testConstructorStoresStrokedFlag() {
+        ColorAttributes attrs = new ColorAttributes(false, true, Color.RED, Color.BLACK);
+        assertTrue(attrs.stroked, "stroked flag should be true when constructed with true");
+    }
+
+    @Test
+    void testConstructorStoresFilledColor() {
+        ColorAttributes attrs = new ColorAttributes(true, false, Color.BLUE, Color.BLACK);
+        assertEquals(Color.BLUE, attrs.filledColor, "filledColor should match the constructor argument");
+    }
+
+    @Test
+    void testConstructorStoresStrokedColor() {
+        ColorAttributes attrs = new ColorAttributes(false, true, Color.RED, Color.GREEN);
+        assertEquals(Color.GREEN, attrs.strokedColor, "strokedColor should match the constructor argument");
+    }
+
+    @Test
+    void testFilledAndStrokedBothTrue() {
+        ColorAttributes attrs = new ColorAttributes(true, true, Color.RED, Color.BLUE);
+        assertTrue(attrs.filled);
+        assertTrue(attrs.stroked);
+    }
+
+    @Test
+    void testFilledAndStrokedBothFalse() {
+        ColorAttributes attrs = new ColorAttributes(false, false, Color.RED, Color.BLUE);
+        assertFalse(attrs.filled);
+        assertFalse(attrs.stroked);
+    }
+
+    @Test
+    void testNullFilledColor() {
+        ColorAttributes attrs = new ColorAttributes(true, false, null, Color.BLACK);
+        assertNull(attrs.filledColor, "filledColor should accept null");
+    }
+
+    @Test
+    void testNullStrokedColor() {
+        ColorAttributes attrs = new ColorAttributes(false, true, Color.RED, null);
+        assertNull(attrs.strokedColor, "strokedColor should accept null");
+    }
+
+    @Test
+    void testBothColorsNull() {
+        ColorAttributes attrs = new ColorAttributes(false, false, null, null);
+        assertNull(attrs.filledColor);
+        assertNull(attrs.strokedColor);
+    }
+
+    @Test
+    void testGetIDReturnsCorrectValue() {
+        ColorAttributes attrs = new ColorAttributes(false, false, Color.RED, Color.BLACK);
+        assertEquals(ColorAttributes.ID, attrs.getID());
+    }
+
+    @Test
+    void testIDConstant() {
+        assertEquals("COLOR_ATTRS", ColorAttributes.ID);
+    }
+
+    @Test
+    void testImplementsAttributes() {
+        ColorAttributes attrs = new ColorAttributes(false, false, Color.RED, Color.BLACK);
+        assertInstanceOf(Attributes.class, attrs);
+    }
+
+    @Test
+    void testToStringContainsAllFields() {
+        ColorAttributes attrs = new ColorAttributes(true, false, Color.RED, Color.BLUE);
+        String str = attrs.toString();
+        assertTrue(str.contains("filled=true"), "toString should contain filled value");
+        assertTrue(str.contains("stroked=false"), "toString should contain stroked value");
+        assertTrue(str.contains("filledColor"), "toString should contain filledColor");
+        assertTrue(str.contains("strokedColor"), "toString should contain strokedColor");
+    }
+
+    @Test
+    void testToStringWithNullColors() {
+        ColorAttributes attrs = new ColorAttributes(false, false, null, null);
+        String str = attrs.toString();
+        assertNotNull(str, "toString should not throw with null colors");
+        assertTrue(str.contains("filledColor=null"), "toString should show null filledColor");
+        assertTrue(str.contains("strokedColor=null"), "toString should show null strokedColor");
+    }
+
+    @Test
+    void testTwoInstancesAreIndependent() {
+        ColorAttributes attrs1 = new ColorAttributes(true, false, Color.RED, Color.BLACK);
+        ColorAttributes attrs2 = new ColorAttributes(false, true, Color.BLUE, Color.GREEN);
+
+        assertTrue(attrs1.filled);
+        assertFalse(attrs2.filled);
+        assertFalse(attrs1.stroked);
+        assertTrue(attrs2.stroked);
+        assertEquals(Color.RED, attrs1.filledColor);
+        assertEquals(Color.BLUE, attrs2.filledColor);
+    }
+
+    @Test
+    void testFieldsAreImmutable() {
+        Color fillColor = Color.RED;
+        Color strokeColor = Color.BLACK;
+        ColorAttributes attrs = new ColorAttributes(true, true, fillColor, strokeColor);
+
+        // Since fields are final, verify they retain their values
+        assertEquals(Color.RED, attrs.filledColor);
+        assertEquals(Color.BLACK, attrs.strokedColor);
+        assertTrue(attrs.filled);
+        assertTrue(attrs.stroked);
+    }
+}

src/test/java/ovh/gasser/newshapes/attributes/SelectionAttributesTest.java

@@ -0,0 +1,72 @@
+package ovh.gasser.newshapes.attributes;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SelectionAttributesTest {
+
+    @Test
+    void testDefaultConstructorIsUnselected() {
+        SelectionAttributes attrs = new SelectionAttributes();
+        assertFalse(attrs.selected, "Default constructor should create unselected state");
+    }
+
+    @Test
+    void testConstructorWithTrue() {
+        SelectionAttributes attrs = new SelectionAttributes(true);
+        assertTrue(attrs.selected, "Constructor with true should create selected state");
+    }
+
+    @Test
+    void testConstructorWithFalse() {
+        SelectionAttributes attrs = new SelectionAttributes(false);
+        assertFalse(attrs.selected, "Constructor with false should create unselected state");
+    }
+
+    @Test
+    void testGetIDReturnsCorrectValue() {
+        SelectionAttributes attrs = new SelectionAttributes();
+        assertEquals(SelectionAttributes.ID, attrs.getID());
+    }
+
+    @Test
+    void testIDConstant() {
+        assertEquals("SELECTION_ATTRS", SelectionAttributes.ID);
+    }
+
+    @Test
+    void testImplementsAttributes() {
+        SelectionAttributes attrs = new SelectionAttributes();
+        assertInstanceOf(Attributes.class, attrs);
+    }
+
+    @Test
+    void testSelectedFieldCanBeToggled() {
+        SelectionAttributes attrs = new SelectionAttributes(false);
+        assertFalse(attrs.selected);
+
+        attrs.selected = true;
+        assertTrue(attrs.selected);
+
+        attrs.selected = false;
+        assertFalse(attrs.selected);
+    }
+
+    @Test
+    void testTwoInstancesAreIndependent() {
+        SelectionAttributes attrs1 = new SelectionAttributes(true);
+        SelectionAttributes attrs2 = new SelectionAttributes(false);
+
+        assertNotEquals(attrs1.selected, attrs2.selected);
+
+        attrs2.selected = true;
+        assertTrue(attrs1.selected);
+        assertTrue(attrs2.selected);
+
+        // Mutating one doesn't affect the other
+        attrs1.selected = false;
+        assertFalse(attrs1.selected);
+        assertTrue(attrs2.selected);
+    }
+}

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

@@ -0,0 +1,94 @@
+package ovh.gasser.newshapes.shapes;
+
+import org.junit.jupiter.api.Test;
+import java.awt.Cursor;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ResizeHandleTest {
+
+    @Test
+    void testEightHandlesExist() {
+        assertEquals(8, ResizeHandle.values().length,
+                "ResizeHandle enum should define exactly 8 handles");
+    }
+
+    @Test
+    void testAllHandleNamesExist() {
+        assertNotNull(ResizeHandle.valueOf("NW"), "Handle NW should exist");
+        assertNotNull(ResizeHandle.valueOf("N"),  "Handle N should exist");
+        assertNotNull(ResizeHandle.valueOf("NE"), "Handle NE should exist");
+        assertNotNull(ResizeHandle.valueOf("E"),  "Handle E should exist");
+        assertNotNull(ResizeHandle.valueOf("SE"), "Handle SE should exist");
+        assertNotNull(ResizeHandle.valueOf("S"),  "Handle S should exist");
+        assertNotNull(ResizeHandle.valueOf("SW"), "Handle SW should exist");
+        assertNotNull(ResizeHandle.valueOf("W"),  "Handle W should exist");
+    }
+
+    @Test
+    void testNwMapsToCorrectCursorType() {
+        assertEquals(Cursor.NW_RESIZE_CURSOR, ResizeHandle.NW.getCursorType(),
+                "NW handle should map to Cursor.NW_RESIZE_CURSOR");
+    }
+
+    @Test
+    void testNMapsToCorrectCursorType() {
+        assertEquals(Cursor.N_RESIZE_CURSOR, ResizeHandle.N.getCursorType(),
+                "N handle should map to Cursor.N_RESIZE_CURSOR");
+    }
+
+    @Test
+    void testNeMapsToCorrectCursorType() {
+        assertEquals(Cursor.NE_RESIZE_CURSOR, ResizeHandle.NE.getCursorType(),
+                "NE handle should map to Cursor.NE_RESIZE_CURSOR");
+    }
+
+    @Test
+    void testEMapsToCorrectCursorType() {
+        assertEquals(Cursor.E_RESIZE_CURSOR, ResizeHandle.E.getCursorType(),
+                "E handle should map to Cursor.E_RESIZE_CURSOR");
+    }
+
+    @Test
+    void testSeMapsToCorrectCursorType() {
+        assertEquals(Cursor.SE_RESIZE_CURSOR, ResizeHandle.SE.getCursorType(),
+                "SE handle should map to Cursor.SE_RESIZE_CURSOR");
+    }
+
+    @Test
+    void testSMapsToCorrectCursorType() {
+        assertEquals(Cursor.S_RESIZE_CURSOR, ResizeHandle.S.getCursorType(),
+                "S handle should map to Cursor.S_RESIZE_CURSOR");
+    }
+
+    @Test
+    void testSwMapsToCorrectCursorType() {
+        assertEquals(Cursor.SW_RESIZE_CURSOR, ResizeHandle.SW.getCursorType(),
+                "SW handle should map to Cursor.SW_RESIZE_CURSOR");
+    }
+
+    @Test
+    void testWMapsToCorrectCursorType() {
+        assertEquals(Cursor.W_RESIZE_CURSOR, ResizeHandle.W.getCursorType(),
+                "W handle should map to Cursor.W_RESIZE_CURSOR");
+    }
+
+    @Test
+    void testValueOfReturnsCorrectConstant() {
+        assertSame(ResizeHandle.NW, ResizeHandle.valueOf("NW"), "valueOf(\"NW\") should return ResizeHandle.NW");
+        assertSame(ResizeHandle.N,  ResizeHandle.valueOf("N"),  "valueOf(\"N\") should return ResizeHandle.N");
+        assertSame(ResizeHandle.NE, ResizeHandle.valueOf("NE"), "valueOf(\"NE\") should return ResizeHandle.NE");
+        assertSame(ResizeHandle.E,  ResizeHandle.valueOf("E"),  "valueOf(\"E\") should return ResizeHandle.E");
+        assertSame(ResizeHandle.SE, ResizeHandle.valueOf("SE"), "valueOf(\"SE\") should return ResizeHandle.SE");
+        assertSame(ResizeHandle.S,  ResizeHandle.valueOf("S"),  "valueOf(\"S\") should return ResizeHandle.S");
+        assertSame(ResizeHandle.SW, ResizeHandle.valueOf("SW"), "valueOf(\"SW\") should return ResizeHandle.SW");
+        assertSame(ResizeHandle.W,  ResizeHandle.valueOf("W"),  "valueOf(\"W\") should return ResizeHandle.W");
+    }
+
+    @Test
+    void testValueOfWithInvalidNameThrowsIllegalArgumentException() {
+        assertThrows(IllegalArgumentException.class,
+                () -> ResizeHandle.valueOf("INVALID"),
+                "valueOf() with an unknown name should throw IllegalArgumentException");
+    }
+}

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

@@ -0,0 +1,176 @@
+package ovh.gasser.newshapes.shapes;
+
+import org.junit.jupiter.api.Test;
+import ovh.gasser.newshapes.App;
+import ovh.gasser.newshapes.attributes.ColorAttributes;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+
+import java.awt.Color;
+import java.awt.Rectangle;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SCollectionTest {
+
+    @Test
+    void testCreateWithShapes() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        SCircle circle = SCircle.create(50, 50, 25);
+        
+        SCollection collection = SCollection.of(rect, circle);
+        
+        assertNotNull(collection);
+        assertEquals(2, collection.stream().count());
+    }
+
+    @Test
+    void testAdd() {
+        SCollection collection = SCollection.of();
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        
+        collection.add(rect);
+        
+        assertEquals(1, collection.stream().count());
+        assertSame(rect, collection.iterator().next());
+    }
+
+    @Test
+    void testRemove() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        SCollection collection = SCollection.of(rect);
+        
+        collection.remove(rect);
+        
+        assertEquals(0, collection.stream().count());
+    }
+
+    @Test
+    void testIterator() {
+        SRectangle rect1 = SRectangle.create(10, 20, 100, 50);
+        SRectangle rect2 = SRectangle.create(30, 40, 60, 70);
+        SCollection collection = SCollection.of(rect1, rect2);
+        
+        Iterator<Shape> iterator = collection.iterator();
+        
+        assertTrue(iterator.hasNext());
+        assertSame(rect1, iterator.next());
+        assertTrue(iterator.hasNext());
+        assertSame(rect2, iterator.next());
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    void testStream() {
+        SRectangle rect1 = SRectangle.create(10, 20, 100, 50);
+        SRectangle rect2 = SRectangle.create(30, 40, 60, 70);
+        SCircle circle = SCircle.create(50, 50, 25);
+        SCollection collection = SCollection.of(rect1, rect2, circle);
+        
+        List<Shape> shapes = collection.stream().collect(Collectors.toList());
+        
+        assertEquals(3, shapes.size());
+        assertTrue(shapes.contains(rect1));
+        assertTrue(shapes.contains(rect2));
+        assertTrue(shapes.contains(circle));
+    }
+
+    @Test
+    void testGetBoundsEmptyCollection() {
+        SCollection collection = SCollection.of();
+        
+        Rectangle bounds = collection.getBounds();
+        
+        assertEquals(App.WIN_SIZE.width, bounds.width);
+        assertEquals(App.WIN_SIZE.height, bounds.height);
+    }
+
+    @Test
+    void testGetBoundsWithChildren() {
+        SRectangle rect1 = SRectangle.create(10, 10, 50, 50);
+        SRectangle rect2 = SRectangle.create(100, 100, 80, 40);
+        SCollection collection = SCollection.of(rect1, rect2);
+        
+        Rectangle bounds = collection.getBounds();
+        
+        // Union should cover from (10,10) to (180,140)
+        assertEquals(10, bounds.x);
+        assertEquals(10, bounds.y);
+        assertEquals(170, bounds.width);  // 100+80-10 = 170
+        assertEquals(130, bounds.height); // 100+40-10 = 130
+    }
+
+    @Test
+    void testTranslate() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        SCollection collection = SCollection.of(rect);
+        
+        collection.translate(5, 10);
+        
+        Rectangle bounds = rect.getBounds();
+        assertEquals(15, bounds.x);
+        assertEquals(30, bounds.y);
+    }
+
+    @Test
+    void testClone() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        SCollection original = SCollection.of(rect);
+        
+        SCollection cloned = (SCollection) original.clone();
+        
+        assertNotSame(original, cloned);
+        assertEquals(original.stream().count(), cloned.stream().count());
+        
+        // Verify SelectionAttributes is added to clone
+        assertNotNull(cloned.getAttributes(SelectionAttributes.ID));
+        
+        // Verify deep copy - modifying clone doesn't affect original
+        Iterator<Shape> clonedIterator = cloned.iterator();
+        Shape clonedChild = clonedIterator.next();
+        clonedChild.translate(100, 100);
+        
+        Rectangle originalBounds = rect.getBounds();
+        assertEquals(10, originalBounds.x);
+        assertEquals(20, originalBounds.y);
+    }
+
+    @Test
+    void testToString() {
+        SCollection collection = SCollection.of();
+        
+        String str = collection.toString();
+        
+        assertTrue(str.contains("SCollection"));
+    }
+
+    @Test
+    void testAddAttributesPropagatesToChildren() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        SCollection collection = SCollection.of(rect);
+        
+        ColorAttributes attrs = new ColorAttributes(true, true, Color.RED, Color.BLUE);
+        collection.addAttributes(attrs);
+        
+        ColorAttributes childAttrs = (ColorAttributes) rect.getAttributes(ColorAttributes.ID);
+        
+        assertNotNull(childAttrs);
+        assertEquals(Color.RED, childAttrs.filledColor);
+        assertEquals(Color.BLUE, childAttrs.strokedColor);
+    }
+
+    @Test
+    void testGetAttributesReturnsChildColor() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50, Color.GREEN);
+        SCircle circle = SCircle.create(50, 50, 25);
+        SCollection collection = SCollection.of(rect, circle);
+        
+        ColorAttributes attrs = (ColorAttributes) collection.getAttributes(ColorAttributes.ID);
+        
+        assertNotNull(attrs);
+        // First child's color should be returned (strokedColor for SRectangle)
+        assertEquals(Color.GREEN, attrs.strokedColor);
+    }
+}

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

@@ -0,0 +1,142 @@
+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/ShapeContractTest.java

@@ -0,0 +1,73 @@
+package ovh.gasser.newshapes.shapes;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.awt.Rectangle;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Parameterized contract tests verifying Shape interface invariants
+ * across all implementations (SRectangle, SCircle, STriangle, SText, SCollection).
+ */
+class ShapeContractTest {
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("ovh.gasser.newshapes.shapes.ShapeFactory#allShapes")
+    void cloneReturnsIndependentCopy(Shape shape) {
+        Shape cloned = shape.clone();
+
+        // clone must not be the same instance
+        assertNotSame(shape, cloned, "clone() must return a new instance");
+
+        // clone must have equal bounds
+        assertEquals(shape.getBounds(), cloned.getBounds(),
+                "clone() must preserve bounds");
+
+        // mutating the clone must not affect the original
+        Rectangle originalBounds = shape.getBounds();
+        cloned.translate(999, 999);
+        assertEquals(originalBounds, shape.getBounds(),
+                "Translating the clone must not affect the original's bounds");
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("ovh.gasser.newshapes.shapes.ShapeFactory#allShapes")
+    void getBoundsReturnsCopy(Shape shape) {
+        Rectangle bounds1 = shape.getBounds();
+        Rectangle bounds2 = shape.getBounds();
+
+        // successive calls must return equal bounds
+        assertEquals(bounds1, bounds2,
+                "getBounds() must return consistent values");
+
+        // but not the same object (defensive copy)
+        assertNotSame(bounds1, bounds2,
+                "getBounds() must return a copy, not internal state");
+
+        // mutating the returned Rectangle must not affect the shape
+        bounds1.translate(500, 500);
+        assertEquals(bounds2, shape.getBounds(),
+                "Mutating the returned Rectangle must not affect the shape");
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("ovh.gasser.newshapes.shapes.ShapeFactory#allShapes")
+    void translateMutatesInPlace(Shape shape) {
+        Rectangle before = shape.getBounds();
+        int dx = 7, dy = -3;
+
+        shape.translate(dx, dy);
+
+        Rectangle after = shape.getBounds();
+        assertEquals(before.x + dx, after.x,
+                "translate() must shift x by dx");
+        assertEquals(before.y + dy, after.y,
+                "translate() must shift y by dy");
+        assertEquals(before.width, after.width,
+                "translate() must not change width");
+        assertEquals(before.height, after.height,
+                "translate() must not change height");
+    }
+}

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

@@ -0,0 +1,120 @@
+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;
+
+/**
+ * Provides Shape instances for parameterized contract tests.
+ */
+public final class ShapeFactory {
+
+    private ShapeFactory() {}
+
+    static Stream<Shape> allShapes() {
+        return Stream.of(
+                SRectangle.create(10, 20, 100, 50),
+                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

@@ -0,0 +1,507 @@
+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

@@ -0,0 +1,556 @@
+package ovh.gasser.newshapes.ui.visitors;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import ovh.gasser.newshapes.attributes.ColorAttributes;
+import ovh.gasser.newshapes.shapes.*;
+
+import java.awt.*;
+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 {
+
+    private StringWriter htmlBuffer;
+    private StringWriter cssBuffer;
+    private PrintWriter htmlWriter;
+    private PrintWriter cssWriter;
+    private HTMLDraftman draftman;
+
+    @BeforeEach
+    void setUp() {
+        htmlBuffer = new StringWriter();
+        cssBuffer = new StringWriter();
+        htmlWriter = new PrintWriter(htmlBuffer);
+        cssWriter = new PrintWriter(cssBuffer);
+        draftman = new HTMLDraftman(htmlWriter, cssWriter);
+    }
+
+    private String html() {
+        htmlWriter.flush();
+        return htmlBuffer.toString();
+    }
+
+    private String css() {
+        cssWriter.flush();
+        return cssBuffer.toString();
+    }
+
+    // ── visitRectangle ──────────────────────────────────────────────
+
+    @Nested
+    class VisitRectangleTests {
+
+        @Test
+        void testRectangleProducesDivWithId() {
+            SRectangle rect = SRectangle.create(10, 20, 100, 50);
+            draftman.visitRectangle(rect);
+
+            assertTrue(html().contains("<div id=\"rec"), "Should produce a div with rec id");
+        }
+
+        @Test
+        void testRectangleCssContainsCorrectPosition() {
+            SRectangle rect = SRectangle.create(10, 20, 100, 50);
+            draftman.visitRectangle(rect);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("top:20px"), "CSS should contain correct top");
+            assertTrue(cssOut.contains("left:10px"), "CSS should contain correct left");
+        }
+
+        @Test
+        void testRectangleCssContainsCorrectDimensions() {
+            SRectangle rect = SRectangle.create(10, 20, 100, 50);
+            draftman.visitRectangle(rect);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("width:100px"), "CSS should contain correct width");
+            assertTrue(cssOut.contains("height:50px"), "CSS should contain correct height");
+        }
+
+        @Test
+        void testRectangleCssPositionIsAbsolute() {
+            SRectangle rect = SRectangle.create(0, 0, 30, 30);
+            draftman.visitRectangle(rect);
+
+            assertTrue(css().contains("position:absolute"), "CSS should use absolute positioning");
+        }
+
+        @Test
+        void testRectangleHtmlIdMatchesCssSelector() {
+            SRectangle rect = SRectangle.create(0, 0, 30, 30);
+            draftman.visitRectangle(rect);
+
+            String id = "rec" + rect.hashCode();
+            assertTrue(html().contains("id=\"" + id + "\""), "HTML should contain div with correct id");
+            assertTrue(css().contains("#" + id), "CSS should reference same id");
+        }
+
+        @Test
+        void testRectangleFilledAndStroked() {
+            SRectangle rect = SRectangle.create(0, 0, 30, 30);
+            rect.addAttributes(new ColorAttributes(true, true, Color.RED, Color.BLUE));
+            draftman.visitRectangle(rect);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("background:"), "CSS should contain background");
+            assertTrue(cssOut.contains("border:"), "CSS should contain border");
+        }
+
+        @Test
+        void testRectangleFilledOnly() {
+            SRectangle rect = SRectangle.create(0, 0, 30, 30);
+            rect.addAttributes(new ColorAttributes(true, false, Color.RED, Color.BLACK));
+            draftman.visitRectangle(rect);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("background:"), "CSS should contain background for filled");
+            assertFalse(cssOut.contains("border:"), "CSS should not contain border when not stroked");
+        }
+
+        @Test
+        void testRectangleStrokedOnly() {
+            SRectangle rect = SRectangle.create(0, 0, 30, 30);
+            rect.addAttributes(new ColorAttributes(false, true, Color.RED, Color.BLUE));
+            draftman.visitRectangle(rect);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("border:"), "CSS should contain border for stroked");
+            assertTrue(cssOut.contains("background:#ffffff"), "CSS should have white background when not filled");
+        }
+
+        @Test
+        void testRectangleNeitherFilledNorStroked() {
+            SRectangle rect = SRectangle.create(0, 0, 30, 30);
+            rect.addAttributes(new ColorAttributes(false, false, Color.RED, Color.BLUE));
+            draftman.visitRectangle(rect);
+
+            String cssOut = css();
+            assertFalse(cssOut.contains("background:"), "CSS should not contain background");
+            assertFalse(cssOut.contains("border:"), "CSS should not contain border");
+        }
+    }
+
+    // ── visitCircle ─────────────────────────────────────────────────
+
+    @Nested
+    class VisitCircleTests {
+
+        @Test
+        void testCircleProducesDivWithClass() {
+            SCircle circle = SCircle.create(50, 60, 30);
+            draftman.visitCircle(circle);
+
+            assertTrue(html().contains("circle"), "HTML should contain circle class div");
+        }
+
+        @Test
+        void testCircleCssContainsBorderRadius() {
+            SCircle circle = SCircle.create(50, 60, 30);
+            draftman.visitCircle(circle);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("border-radius:"), "CSS should contain border-radius");
+            assertTrue(cssOut.contains("-webkit-border-radius:"), "CSS should contain webkit prefix");
+            assertTrue(cssOut.contains("-moz-border-radius:"), "CSS should contain moz prefix");
+        }
+
+        @Test
+        void testCircleCssContainsCorrectPosition() {
+            SCircle circle = SCircle.create(50, 60, 30);
+            draftman.visitCircle(circle);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("top:60px"), "CSS should contain correct top");
+            assertTrue(cssOut.contains("left:50px"), "CSS should contain correct left");
+        }
+
+        @Test
+        void testCircleHtmlClassMatchesCssSelector() {
+            SCircle circle = SCircle.create(0, 0, 20);
+            draftman.visitCircle(circle);
+
+            String className = "circle" + circle.hashCode();
+            assertTrue(html().contains(className), "HTML should have circle class");
+            assertTrue(css().contains("." + className), "CSS should reference same class");
+        }
+    }
+
+    // ── visitTriangle ───────────────────────────────────────────────
+
+    @Nested
+    class VisitTriangleTests {
+
+        @Test
+        void testTriangleProducesDivWithClass() {
+            STriangle tri = STriangle.create(10, 20, 40, Color.RED, Color.BLACK);
+            draftman.visitTriangle(tri);
+
+            assertTrue(html().contains("triangle"), "HTML should contain triangle class div");
+        }
+
+        @Test
+        void testTriangleCssContainsBorderTrick() {
+            STriangle tri = STriangle.create(10, 20, 40, Color.RED, Color.BLACK);
+            draftman.visitTriangle(tri);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("border-left-width:"), "CSS should use border-left-width");
+            assertTrue(cssOut.contains("border-right-width:"), "CSS should use border-right-width");
+            assertTrue(cssOut.contains("border-bottom:"), "CSS should use border-bottom");
+            assertTrue(cssOut.contains("width: 0px"), "CSS should set width to 0");
+            assertTrue(cssOut.contains("height: 0px"), "CSS should set height to 0");
+        }
+
+        @Test
+        void testTriangleCssContainsCorrectPosition() {
+            STriangle tri = STriangle.create(10, 20, 40, Color.RED, Color.BLACK);
+            draftman.visitTriangle(tri);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("top: 20px"), "CSS should contain correct top");
+            assertTrue(cssOut.contains("left: 10px"), "CSS should contain correct left");
+        }
+
+        @Test
+        void testTriangleCssContainsFillColor() {
+            STriangle tri = STriangle.create(0, 0, 20, Color.BLUE, Color.BLACK);
+            tri.addAttributes(new ColorAttributes(true, false, Color.BLUE, Color.BLACK));
+            draftman.visitTriangle(tri);
+
+            assertTrue(css().contains("#0000ff"), "CSS should contain the triangle fill color");
+        }
+
+        @Test
+        void testTriangleHtmlClassMatchesCssSelector_regressionHashCode() {
+            // Regression test: visitTriangle previously used this.hashCode()
+            // instead of sTriangle.hashCode(), causing HTML class and CSS
+            // selector mismatch when rendered by a different draftman instance.
+            STriangle tri = STriangle.create(5, 5, 30, Color.RED, Color.BLACK);
+            draftman.visitTriangle(tri);
+
+            String htmlOut = html();
+            String cssOut = css();
+
+            // Extract the class name from HTML: class="triangleNNN"
+            int classStart = htmlOut.indexOf("triangle");
+            assertNotEquals(-1, classStart, "HTML should contain triangle class");
+            int classEnd = htmlOut.indexOf("\"", classStart);
+            String htmlClassName = htmlOut.substring(classStart, classEnd);
+
+            // CSS should use the same class name
+            assertTrue(cssOut.contains("." + htmlClassName),
+                    "CSS selector should match HTML class — " +
+                    "if this fails, visitTriangle may be using this.hashCode() instead of sTriangle.hashCode()");
+        }
+    }
+
+    // ── 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
+    class VisitTextTests {
+
+        @Test
+        void testTextProducesDivWithContent() {
+            SText text = SText.create(10, 20, "Hello");
+            draftman.visitText(text);
+
+            assertTrue(html().contains(">Hello</div>"), "HTML should contain text content in div");
+        }
+
+        @Test
+        void testTextHtmlIdMatchesCssSelector() {
+            SText text = SText.create(0, 0, "Test");
+            draftman.visitText(text);
+
+            String id = "txt" + text.hashCode();
+            assertTrue(html().contains("id=\"" + id + "\""), "HTML should contain text div with correct id");
+            assertTrue(css().contains("#" + id), "CSS should reference same text id");
+        }
+
+        @Test
+        void testTextCssContainsPosition() {
+            SText text = SText.create(15, 25, "Pos");
+            draftman.visitText(text);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("top:25px"), "CSS should contain correct top");
+            assertTrue(cssOut.contains("left:15px"), "CSS should contain correct left");
+        }
+
+        @Test
+        void testTextCssContainsDefaultFontAttributes() {
+            SText text = SText.create(0, 0, "Font");
+            draftman.visitText(text);
+
+            String cssOut = css();
+            assertTrue(cssOut.contains("font-family:"), "CSS should contain font-family");
+            assertTrue(cssOut.contains("font-size:16px"), "CSS should contain default font size");
+            assertTrue(cssOut.contains("font-style:normal"), "CSS should contain normal font style");
+            assertTrue(cssOut.contains("font-weight:normal"), "CSS should contain normal font weight");
+        }
+
+        @Test
+        void testTextCssContainsColor() {
+            SText text = SText.create(0, 0, "Colored");
+            text.addAttributes(new ColorAttributes(true, false, Color.RED, Color.BLACK));
+            draftman.visitText(text);
+
+            assertTrue(css().contains("color:#ff0000"), "CSS should contain fill color as text color");
+        }
+
+        @Test
+        void testTextCssWhiteSpaceNowrap() {
+            SText text = SText.create(0, 0, "NoWrap");
+            draftman.visitText(text);
+
+            assertTrue(css().contains("white-space: nowrap"), "CSS should prevent text wrapping");
+        }
+
+        @Test
+        void testTextWithNullColorAttributesFallsBackToBlack() {
+            SText text = SText.create(0, 0, "Fallback");
+            text.addAttributes(new ColorAttributes(false, false, null, null));
+            draftman.visitText(text);
+
+            assertTrue(css().contains("color:#000000"), "Should fall back to black with null colors");
+        }
+    }
+
+    // ── visitCollection ─────────────────────────────────────────────
+
+    @Nested
+    class VisitCollectionTests {
+
+        @Test
+        void testEmptyCollection() {
+            SCollection empty = SCollection.of();
+            draftman.visitCollection(empty);
+
+            assertEquals("", html(), "Empty collection should produce no HTML");
+            assertEquals("", css(), "Empty collection should produce no CSS");
+        }
+
+        @Test
+        void testCollectionVisitsAllChildren() {
+            SCollection coll = SCollection.of(
+                    SRectangle.create(0, 0, 10, 10),
+                    SCircle.create(20, 20, 5)
+            );
+            draftman.visitCollection(coll);
+
+            assertTrue(html().contains("rec"), "Should visit rectangle");
+            assertTrue(html().contains("circle"), "Should visit circle");
+        }
+
+        @Test
+        void testNestedCollectionVisitsAllDescendants() {
+            SCollection inner = SCollection.of(
+                    SRectangle.create(0, 0, 5, 5)
+            );
+            SCollection outer = SCollection.of(
+                    inner,
+                    SCircle.create(10, 10, 3)
+            );
+            draftman.visitCollection(outer);
+
+            assertTrue(html().contains("rec"), "Should visit nested rectangle");
+            assertTrue(html().contains("circle"), "Should visit circle at outer level");
+        }
+    }
+
+    // ── generateHTML ────────────────────────────────────────────────
+
+    @Nested
+    class GenerateHTMLTests {
+
+        @Test
+        void testGenerateHTMLIncludesDoctype() {
+            SCollection model = SCollection.of();
+            draftman.generateHTML(model);
+
+            assertTrue(html().contains("<!DOCTYPE html>"), "Should include DOCTYPE");
+        }
+
+        @Test
+        void testGenerateHTMLIncludesHtmlStructure() {
+            SCollection model = SCollection.of();
+            draftman.generateHTML(model);
+
+            String htmlOut = html();
+            assertTrue(htmlOut.contains("<html"), "Should include html tag");
+            assertTrue(htmlOut.contains("<head>"), "Should include head tag");
+            assertTrue(htmlOut.contains("<body>"), "Should include body tag");
+            assertTrue(htmlOut.contains("</body>"), "Should close body tag");
+        }
+
+        @Test
+        void testGenerateHTMLReferencesStylesheet() {
+            SCollection model = SCollection.of();
+            draftman.generateHTML(model);
+
+            assertTrue(html().contains("style.css"), "Should reference CSS stylesheet");
+        }
+
+        @Test
+        void testGenerateHTMLIncludesShapeContent() {
+            SCollection model = SCollection.of(
+                    SRectangle.create(1, 2, 3, 4)
+            );
+            draftman.generateHTML(model);
+
+            assertTrue(html().contains("<div id=\"rec"), "Should include shape elements");
+        }
+    }
+}

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

@@ -0,0 +1,475 @@
+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.*;
+
+class SVGDraftmanTest {
+
+    private StringWriter buffer;
+    private PrintWriter writer;
+    private SVGDraftman draftman;
+
+    @BeforeEach
+    void setUp() {
+        buffer = new StringWriter();
+        writer = new PrintWriter(buffer);
+        draftman = new SVGDraftman(writer);
+    }
+
+    private String output() {
+        writer.flush();
+        return buffer.toString();
+    }
+
+    // ── visitRectangle ──────────────────────────────────────────────
+
+    @Nested
+    class VisitRectangleTests {
+
+        @Test
+        void testRectangleElementWithCorrectDimensions() {
+            SRectangle rect = SRectangle.create(10, 20, 100, 50);
+            draftman.visitRectangle(rect);
+
+            String svg = output();
+            assertTrue(svg.contains("<rect"), "Should produce a <rect> element");
+            assertTrue(svg.contains("width=\"100\""), "Should have correct width");
+            assertTrue(svg.contains("height=\"50\""), "Should have correct height");
+            assertTrue(svg.contains("x=\"10\""), "Should have correct x");
+            assertTrue(svg.contains("y=\"20\""), "Should have correct y");
+        }
+
+        @Test
+        void testRectangleFilledOnly() {
+            SRectangle rect = SRectangle.create(0, 0, 30, 30);
+            rect.addAttributes(new ColorAttributes(true, false, Color.RED, Color.BLACK));
+            draftman.visitRectangle(rect);
+
+            String svg = output();
+            assertTrue(svg.contains("fill=\"#ff0000\""), "Should contain fill color");
+            assertFalse(svg.contains("stroke="), "Should not contain stroke when stroked=false");
+        }
+
+        @Test
+        void testRectangleStrokedOnly() {
+            SRectangle rect = SRectangle.create(0, 0, 30, 30);
+            rect.addAttributes(new ColorAttributes(false, true, Color.RED, Color.BLUE));
+            draftman.visitRectangle(rect);
+
+            String svg = output();
+            assertTrue(svg.contains("stroke=\"#0000ff\""), "Should contain stroke color");
+            assertTrue(svg.contains("stroke-width=\"1\""), "Should contain stroke-width");
+            assertTrue(svg.contains("fill=\"none\""), "Should have fill=none when not filled");
+        }
+
+        @Test
+        void testRectangleFilledAndStroked() {
+            SRectangle rect = SRectangle.create(0, 0, 30, 30);
+            rect.addAttributes(new ColorAttributes(true, true, Color.RED, Color.BLUE));
+            draftman.visitRectangle(rect);
+
+            String svg = output();
+            assertTrue(svg.contains("fill=\"#ff0000\""), "Should contain fill color");
+            assertTrue(svg.contains("stroke=\"#0000ff\""), "Should contain stroke color");
+        }
+
+        @Test
+        void testRectangleNeitherFilledNorStroked() {
+            SRectangle rect = SRectangle.create(0, 0, 30, 30);
+            rect.addAttributes(new ColorAttributes(false, false, Color.RED, Color.BLUE));
+            draftman.visitRectangle(rect);
+
+            String svg = output();
+            assertTrue(svg.contains("fill=\"none\""), "Should have fill=none");
+            assertFalse(svg.contains("stroke="), "Should not have stroke attribute");
+        }
+    }
+
+    // ── visitCircle ─────────────────────────────────────────────────
+
+    @Nested
+    class VisitCircleTests {
+
+        @Test
+        void testCircleElementWithCorrectAttributes() {
+            SCircle circle = SCircle.create(50, 60, 30);
+            draftman.visitCircle(circle);
+
+            String svg = output();
+            assertTrue(svg.contains("<circle"), "Should produce a <circle> element");
+            // cx = x + r = 50 + 30 = 80, cy = y + r = 60 + 30 = 90
+            assertTrue(svg.contains("cx=\"80\""), "cx should be x + radius");
+            assertTrue(svg.contains("cy=\"90\""), "cy should be y + radius");
+            assertTrue(svg.contains("r=\"30\""), "Should have correct radius");
+        }
+
+        @Test
+        void testCircleFilledOnly() {
+            SCircle circle = SCircle.create(0, 0, 20);
+            circle.addAttributes(new ColorAttributes(true, false, Color.GREEN, Color.BLACK));
+            draftman.visitCircle(circle);
+
+            String svg = output();
+            assertTrue(svg.contains("fill=\"#00ff00\""), "Should contain fill color");
+            assertFalse(svg.contains("stroke="), "Should not contain stroke");
+        }
+
+        @Test
+        void testCircleStrokedOnly() {
+            SCircle circle = SCircle.create(0, 0, 20);
+            circle.addAttributes(new ColorAttributes(false, true, Color.RED, Color.MAGENTA));
+            draftman.visitCircle(circle);
+
+            String svg = output();
+            assertTrue(svg.contains("stroke=\"#ff00ff\""), "Should contain stroke color");
+            assertTrue(svg.contains("fill=\"none\""), "Should have fill=none");
+        }
+
+        @Test
+        void testCircleFilledAndStroked() {
+            SCircle circle = SCircle.create(0, 0, 15);
+            circle.addAttributes(new ColorAttributes(true, true, Color.YELLOW, Color.BLACK));
+            draftman.visitCircle(circle);
+
+            String svg = output();
+            assertTrue(svg.contains("fill=\"#ffff00\""), "Should contain fill color");
+            assertTrue(svg.contains("stroke=\"#000000\""), "Should contain stroke color");
+        }
+    }
+
+    // ── visitTriangle ───────────────────────────────────────────────
+
+    @Nested
+    class VisitTriangleTests {
+
+        @Test
+        void testTriangleProducesPolygonElement() {
+            STriangle tri = STriangle.create(10, 20, 40, Color.RED, Color.BLACK);
+            draftman.visitTriangle(tri);
+
+            String svg = output();
+            assertTrue(svg.contains("<polygon"), "Should produce a <polygon> element");
+            assertTrue(svg.contains("points="), "Should have points attribute");
+        }
+
+        @Test
+        void testTrianglePointsAreCorrect() {
+            STriangle tri = STriangle.create(10, 20, 40, Color.RED, Color.BLACK);
+            draftman.visitTriangle(tri);
+
+            String svg = output();
+            // bottom-left: (x, y+size) = (10, 60)
+            assertTrue(svg.contains("10,60"), "Should contain bottom-left point");
+            // top-center: (x + size/2, y) = (30, 20)
+            assertTrue(svg.contains("30,20"), "Should contain top-center point");
+            // bottom-right: (x + size, y + size) = (50, 60)
+            assertTrue(svg.contains("50,60"), "Should contain bottom-right point");
+        }
+
+        @Test
+        void testTriangleFilledOnly() {
+            STriangle tri = STriangle.create(0, 0, 20, Color.BLUE, Color.BLACK);
+            tri.addAttributes(new ColorAttributes(true, false, Color.BLUE, Color.BLACK));
+            draftman.visitTriangle(tri);
+
+            String svg = output();
+            assertTrue(svg.contains("fill:#0000ff"), "Should contain fill style");
+            assertFalse(svg.contains("stroke:"), "Should not contain stroke style when not stroked");
+        }
+
+        @Test
+        void testTriangleStrokedAndFilled() {
+            STriangle tri = STriangle.create(0, 0, 20, Color.RED, Color.GREEN);
+            tri.addAttributes(new ColorAttributes(true, true, Color.RED, Color.GREEN));
+            draftman.visitTriangle(tri);
+
+            String svg = output();
+            assertTrue(svg.contains("fill:#ff0000"), "Should contain fill style");
+            assertTrue(svg.contains("stroke:#00ff00"), "Should contain stroke style");
+        }
+
+        @Test
+        void testTriangleNotFilled() {
+            STriangle tri = STriangle.create(0, 0, 20, Color.RED, Color.BLACK);
+            tri.addAttributes(new ColorAttributes(false, true, Color.RED, Color.BLACK));
+            draftman.visitTriangle(tri);
+
+            String svg = output();
+            assertTrue(svg.contains("fill:none"), "Should have fill:none when not filled");
+        }
+    }
+
+    @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
+    class VisitTextTests {
+
+        @Test
+        void testTextElementWithCorrectContent() {
+            SText text = SText.create(10, 20, "Hello");
+            draftman.visitText(text);
+
+            String svg = output();
+            assertTrue(svg.contains("<text"), "Should produce a <text> element");
+            assertTrue(svg.contains(">Hello</text>"), "Should contain the text content");
+        }
+
+        @Test
+        void testTextPositionIncludesFontSizeOffset() {
+            SText text = SText.create(10, 20, "Hi");
+            draftman.visitText(text);
+
+            String svg = output();
+            assertTrue(svg.contains("x=\"10\""), "x should match bounds.x");
+            // y = bounds.y + fontSize = 20 + 16 = 36
+            assertTrue(svg.contains("y=\"36\""), "y should be bounds.y + fontSize");
+        }
+
+        @Test
+        void testTextDefaultFontAttributes() {
+            SText text = SText.create(0, 0, "Test");
+            draftman.visitText(text);
+
+            String svg = output();
+            assertTrue(svg.contains("font-family=\"SansSerif\""), "Should use default font family");
+            assertTrue(svg.contains("font-size=\"16\""), "Should use default font size");
+            assertTrue(svg.contains("font-style=\"normal\""), "Default style should be normal");
+            assertTrue(svg.contains("font-weight=\"normal\""), "Default weight should be normal");
+        }
+
+        @Test
+        void testTextDefaultColorIsBlack() {
+            SText text = SText.create(0, 0, "Test");
+            // default ColorAttributes: filled=true, filledColor=BLACK
+            draftman.visitText(text);
+
+            String svg = output();
+            assertTrue(svg.contains("fill=\"#000000\""), "Default text color should be black");
+        }
+
+        @Test
+        void testTextWithCustomFillColor() {
+            SText text = SText.create(0, 0, "Colored");
+            text.addAttributes(new ColorAttributes(true, false, Color.RED, Color.BLACK));
+            draftman.visitText(text);
+
+            String svg = output();
+            assertTrue(svg.contains("fill=\"#ff0000\""), "Text should use filledColor");
+        }
+
+        @Test
+        void testTextWithNullColorAttributesFallsBackToBlack() {
+            SText text = SText.create(0, 0, "NoColor");
+            text.addAttributes(new ColorAttributes(false, false, null, null));
+            draftman.visitText(text);
+
+            String svg = output();
+            assertTrue(svg.contains("fill=\"#000000\""), "Should fall back to black with null colors");
+        }
+    }
+
+    // ── visitCollection ─────────────────────────────────────────────
+
+    @Nested
+    class VisitCollectionTests {
+
+        @Test
+        void testEmptyCollection() {
+            SCollection empty = SCollection.of();
+            draftman.visitCollection(empty);
+
+            String svg = output();
+            assertEquals("", svg, "Empty collection should produce no output");
+        }
+
+        @Test
+        void testCollectionVisitsAllChildren() {
+            SCollection coll = SCollection.of(
+                    SRectangle.create(0, 0, 10, 10),
+                    SCircle.create(20, 20, 5)
+            );
+            draftman.visitCollection(coll);
+
+            String svg = output();
+            assertTrue(svg.contains("<rect"), "Should visit rectangle");
+            assertTrue(svg.contains("<circle"), "Should visit circle");
+        }
+
+        @Test
+        void testNestedCollectionVisitsAllDescendants() {
+            SCollection inner = SCollection.of(
+                    SRectangle.create(0, 0, 5, 5)
+            );
+            SCollection outer = SCollection.of(
+                    inner,
+                    SCircle.create(10, 10, 3)
+            );
+            draftman.visitCollection(outer);
+
+            String svg = output();
+            assertTrue(svg.contains("<rect"), "Should visit nested rectangle");
+            assertTrue(svg.contains("<circle"), "Should visit circle at outer level");
+        }
+    }
+
+    // ── generateSVG ─────────────────────────────────────────────────
+
+    @Nested
+    class GenerateSVGTests {
+
+        @Test
+        void testGenerateSVGIncludesXmlDeclaration() {
+            SCollection model = SCollection.of();
+            draftman.generateSVG(model);
+
+            String svg = output();
+            assertTrue(svg.contains("<?xml version=\"1.0\" encoding=\"utf-8\"?>"),
+                    "Should include XML declaration");
+        }
+
+        @Test
+        void testGenerateSVGIncludesSvgNamespace() {
+            SCollection model = SCollection.of();
+            draftman.generateSVG(model);
+
+            String svg = output();
+            assertTrue(svg.contains("xmlns=\"http://www.w3.org/2000/svg\""),
+                    "Should include SVG namespace");
+        }
+
+        @Test
+        void testGenerateSVGClosesSvgTag() {
+            SCollection model = SCollection.of();
+            draftman.generateSVG(model);
+
+            String svg = output();
+            assertTrue(svg.contains("</svg>"), "Should close <svg> tag");
+        }
+
+        @Test
+        void testGenerateSVGIncludesShapeContent() {
+            SCollection model = SCollection.of(
+                    SRectangle.create(1, 2, 3, 4)
+            );
+            draftman.generateSVG(model);
+
+            String svg = output();
+            assertTrue(svg.contains("<rect"), "Should include shape elements");
+            assertTrue(svg.contains("</svg>"), "Should close SVG after shapes");
+        }
+    }
+}

src/test/java/ovh/gasser/newshapes/util/StreamableTest.java

@@ -0,0 +1,48 @@
+package ovh.gasser.newshapes.util;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class StreamableTest {
+
+    private static class TestStreamable implements Streamable<String> {
+        private final List<String> elements;
+
+        TestStreamable(List<String> elements) {
+            this.elements = new ArrayList<>(elements);
+        }
+
+        @Override
+        public java.util.Iterator<String> iterator() {
+            return elements.iterator();
+        }
+    }
+
+    @Test
+    void testStreamReturnsStreamOfElements() {
+        List<String> testData = Arrays.asList("a", "b", "c");
+        Streamable<String> streamable = new TestStreamable(testData);
+
+        Stream<String> result = streamable.stream();
+
+        assertNotNull(result);
+        assertEquals(testData, result.toList());
+    }
+
+    @Test
+    void testStreamEmptyCollection() {
+        List<String> emptyData = new ArrayList<>();
+        Streamable<String> streamable = new TestStreamable(emptyData);
+
+        Stream<String> result = streamable.stream();
+
+        assertNotNull(result);
+        assertTrue(result.toList().isEmpty());
+    }
+}