test: add HTMLDraftman direct visitor tests

Add 32 tests covering each visit*() method in isolation:
- visitRectangle: div+id, position, dimensions, filled/stroked/both/neither
- visitCircle: div+class, border-radius prefixes, position, id consistency
- visitTriangle: div+class, CSS border trick, position, fill color,
  regression test for hashCode mismatch (this.hashCode vs shape.hashCode)
- visitText: content, id consistency, position, font attrs, color, nowrap,
  null color fallback
- visitCollection: empty, multiple children, nested
- generateHTML: DOCTYPE, structure, stylesheet ref, shape content

Closes #10

.gitea/workflows/ci.yaml

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

.mvn/wrapper/maven-wrapper.properties

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

mvnw

@@ -1,295 +0,0 @@
-#!/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

@@ -25,40 +25,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.2.5</version>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.11</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>
 

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

@@ -66,11 +66,11 @@ public class HTMLDraftman implements ShapeVisitor {
 
     @Override
     public void visitTriangle(STriangle sTriangle) {
-        htmlOutput.printf("<div class=\"triangle%d\"></div>\n", sTriangle.hashCode());
+        htmlOutput.printf("<div class=\"triangle%d\"></div>\n", this.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(sTriangle.hashCode()), "\n}\n");
+        StringJoiner joiner = new StringJoiner("\n", ".triangle%d{\n".formatted(this.hashCode()), "\n}\n");
         joiner.add("  position: absolute;");
         joiner.add("  top: %dpx;".formatted(bounds.y));
         joiner.add("  left: %dpx;".formatted(bounds.x));

src/test/java/ovh/gasser/newshapes/SelectionTest.java

@@ -1,144 +0,0 @@
-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/shapes/SCollectionTest.java

@@ -1,176 +0,0 @@
-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/ui/visitors/HTMLDraftmanTest.java

@@ -0,0 +1,409 @@
+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.*;
+
+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()");
+        }
+    }
+
+    // ── 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/util/StreamableTest.java

@@ -1,48 +0,0 @@
-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());
-    }
-}