Add SelectionAttributes unit tests

Test core data type for selected/unselected state, default values,
ID constant, interface compliance, and instance independence.

8 tests covering all public API of SelectionAttributes.

Closes #6

TODO.md

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

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

@@ -11,8 +11,6 @@ import ovh.gasser.newshapes.ui.listeners.MenuEditListener;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
 import java.io.FileNotFoundException;
 
 public class App {
@@ -21,8 +19,6 @@ public class App {
     private SCollection model;
     private JCheckBoxMenuItem editFill;
     private JCheckBoxMenuItem editBorder;
-    private JMenuItem editGroup;
-    private JMenuItem editUngroup;
 
     private App() throws HeadlessException {
         final JFrame frame = new JFrame("Reactive shapes");
@@ -75,38 +71,12 @@ public class App {
 
     private JMenu buildFileMenu(ShapesView sview) {
         JMenu menuFile = new JMenu("File");
-        JMenuItem openItem = new JMenuItem("Open");
-        JMenuItem saveItem = new JMenuItem("Save");
         JMenuItem addRectItem = new JMenuItem("Add SRectangle");
         JMenuItem addCircleItem = new JMenuItem("Add SCircle");
         JMenuItem addTextItem = new JMenuItem("Add Text");
         JMenuItem htmlExportItem = new JMenuItem("Export to HTML");
         JMenuItem svgExportItem = new JMenuItem("Export to SVG");
         JMenuItem exitItem = new JMenuItem("Exit");
-
-        openItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK));
-        saveItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK));
-
-        openItem.addActionListener(evt -> {
-            JFileChooser chooser = new JFileChooser();
-            chooser.setFileFilter(new javax.swing.filechooser.FileNameExtensionFilter("JSON Files", "json"));
-            if (chooser.showOpenDialog(sview) == JFileChooser.APPROVE_OPTION) {
-                sview.getController().loadDrawing(chooser.getSelectedFile());
-            }
-        });
-
-        saveItem.addActionListener(evt -> {
-            JFileChooser chooser = new JFileChooser();
-            chooser.setFileFilter(new javax.swing.filechooser.FileNameExtensionFilter("JSON Files", "json"));
-            if (chooser.showSaveDialog(sview) == JFileChooser.APPROVE_OPTION) {
-                java.io.File file = chooser.getSelectedFile();
-                if (!file.getName().endsWith(".json")) {
-                    file = new java.io.File(file.getAbsolutePath() + ".json");
-                }
-                sview.getController().saveDrawing(file);
-            }
-        });
-
         addRectItem.addActionListener(new MenuAddListener("SRectangle", model, sview));
         addCircleItem.addActionListener(new MenuAddListener("SCircle", model, sview));
         addTextItem.addActionListener(evt -> sview.getController().enterTextMode());
@@ -125,10 +95,6 @@ public class App {
             }
         });
         exitItem.addActionListener(evt -> System.exit(0));
-
-        menuFile.add(openItem);
-        menuFile.add(saveItem);
-        menuFile.addSeparator();
         menuFile.add(addRectItem);
         menuFile.add(addCircleItem);
         menuFile.add(addTextItem);
@@ -142,62 +108,32 @@ public class App {
     private JMenu buildEditMenu(ShapesView sview) {
         MenuEditListener editListener = new MenuEditListener(model, sview, sview.getController());
         JMenu menuEdit = new JMenu("Edit");
-        JMenuItem cutItem = new JMenuItem("Cut");
-        JMenuItem copyItem = new JMenuItem("Copy");
-        JMenuItem pasteItem = new JMenuItem("Paste");
         JMenuItem editColor = new JMenuItem("Change color");
         JMenuItem editBorderColor = new JMenuItem("Change border color");
         JMenuItem deleteItem = new JMenuItem("Delete");
-        editGroup = new JMenuItem("Group");
-        editUngroup = new JMenuItem("Ungroup");
         editFill = new JCheckBoxMenuItem("Fill Shape");
         editBorder = new JCheckBoxMenuItem("Draw border");
-
-        cutItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_DOWN_MASK));
-        copyItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK));
-        pasteItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_DOWN_MASK));
-        editGroup.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_DOWN_MASK));
-        editUngroup.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
-
-        cutItem.addActionListener(evt -> sview.getController().cutSelection());
-        copyItem.addActionListener(evt -> sview.getController().copySelection());
-        pasteItem.addActionListener(evt -> sview.getController().pasteClipboard());
         editColor.addActionListener(editListener);
         editBorderColor.addActionListener(editListener);
         deleteItem.addActionListener(editListener);
-        editGroup.addActionListener(evt -> sview.getController().group());
-        editUngroup.addActionListener(evt -> sview.getController().ungroup());
         editFill.addActionListener(editListener);
         editBorder.addActionListener(editListener);
-        editGroup.setEnabled(false);
-        editUngroup.setEnabled(false);
 
-        menuEdit.add(cutItem);
-        menuEdit.add(copyItem);
-        menuEdit.add(pasteItem);
-        menuEdit.addSeparator();
         menuEdit.add(editColor);
         menuEdit.add(editBorderColor);
         menuEdit.add(deleteItem);
         menuEdit.addSeparator();
-        menuEdit.add(editGroup);
-        menuEdit.add(editUngroup);
-        menuEdit.addSeparator();
         menuEdit.add(editBorder);
         menuEdit.add(editFill);
         return menuEdit;
     }
 
     private void updateMenuState(Iterable<Shape> selectedShapes) {
-        int selectionCount = 0;
-        boolean singleCollectionSelected = false;
         boolean hasToggleableShapes = false;
         boolean allFilled = true;
         boolean allStroked = true;
 
         for (Shape s : selectedShapes) {
-            selectionCount++;
-            singleCollectionSelected = selectionCount == 1 && s instanceof SCollection;
             if (s instanceof SText) {
                 continue;
             }
@@ -209,8 +145,6 @@ public class App {
             }
         }
 
-        editGroup.setEnabled(selectionCount > 1);
-        editUngroup.setEnabled(selectionCount == 1 && singleCollectionSelected);
         updateMenuItem(editFill, hasToggleableShapes, allFilled);
         updateMenuItem(editBorder, hasToggleableShapes, allStroked);
     }

src/main/java/ovh/gasser/newshapes/command/AddShapeCommand.java

@@ -1,54 +0,0 @@
-package ovh.gasser.newshapes.command;
-
-import ovh.gasser.newshapes.shapes.SCollection;
-import ovh.gasser.newshapes.shapes.Shape;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-
-public class AddShapeCommand implements Command {
-    private final SCollection model;
-    private final List<IndexedShape> shapes;
-
-    public AddShapeCommand(SCollection model, Shape shape) {
-        this(model, List.of(shape));
-    }
-
-    public AddShapeCommand(SCollection model, Collection<? extends Shape> shapes) {
-        this.model = model;
-        int baseIndex = model.size();
-        List<IndexedShape> indexedShapes = new ArrayList<>();
-        int offset = 0;
-        for (Shape shape : shapes) {
-            indexedShapes.add(new IndexedShape(baseIndex + offset, shape));
-            offset++;
-        }
-        this.shapes = List.copyOf(indexedShapes);
-    }
-
-    @Override
-    public void execute() {
-        shapes.stream()
-                .sorted(Comparator.comparingInt(IndexedShape::index))
-                .forEach(entry -> {
-                    if (!model.contains(entry.shape())) {
-                        model.insert(entry.index(), entry.shape());
-                    }
-                });
-    }
-
-    @Override
-    public void undo() {
-        List<IndexedShape> reversed = new ArrayList<>(shapes);
-        reversed.sort(Comparator.comparingInt(IndexedShape::index).reversed());
-        reversed.forEach(entry -> {
-            if (model.contains(entry.shape())) {
-                model.remove(entry.shape());
-            }
-        });
-    }
-
-    private record IndexedShape(int index, Shape shape) {}
-}

src/main/java/ovh/gasser/newshapes/command/ChangeColorCommand.java

@@ -1,44 +0,0 @@
-package ovh.gasser.newshapes.command;
-
-import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.shapes.Shape;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-public class ChangeColorCommand implements Command {
-    private final List<ShapeColor> before;
-    private final List<ShapeColor> after;
-
-    public ChangeColorCommand(Collection<? extends Shape> shapes, Map<Shape, ColorAttributes> before, Map<Shape, ColorAttributes> after) {
-        this.before = snapshots(shapes, before);
-        this.after = snapshots(shapes, after);
-    }
-
-    @Override
-    public void execute() {
-        apply(after);
-    }
-
-    @Override
-    public void undo() {
-        apply(before);
-    }
-
-    private static List<ShapeColor> snapshots(Collection<? extends Shape> shapes, Map<Shape, ColorAttributes> colors) {
-        return shapes.stream()
-                .map(shape -> new ShapeColor(shape, copy(colors.get(shape))))
-                .toList();
-    }
-
-    private void apply(List<ShapeColor> colors) {
-        colors.forEach(shapeColor -> shapeColor.shape().addAttributes(shapeColor.attributes()));
-    }
-
-    private static ColorAttributes copy(ColorAttributes attrs) {
-        return new ColorAttributes(attrs.filled, attrs.stroked, attrs.filledColor, attrs.strokedColor);
-    }
-
-    private record ShapeColor(Shape shape, ColorAttributes attributes) {}
-}

src/main/java/ovh/gasser/newshapes/command/Command.java

@@ -1,11 +0,0 @@
-package ovh.gasser.newshapes.command;
-
-public interface Command {
-    void execute();
-
-    void undo();
-
-    default void redo() {
-        execute();
-    }
-}

src/main/java/ovh/gasser/newshapes/command/CommandHistory.java

@@ -1,85 +0,0 @@
-package ovh.gasser.newshapes.command;
-
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.List;
-
-public class CommandHistory {
-    public static final int DEFAULT_LIMIT = 100;
-
-    private final Deque<Command> undoStack = new ArrayDeque<>();
-    private final Deque<Command> redoStack = new ArrayDeque<>();
-    private final List<CommandHistoryListener> listeners = new ArrayList<>();
-    private final int limit;
-
-    public CommandHistory() {
-        this(DEFAULT_LIMIT);
-    }
-
-    public CommandHistory(int limit) {
-        this.limit = Math.max(1, limit);
-    }
-
-    public void execute(Command command) {
-        command.execute();
-        undoStack.push(command);
-        trimUndoStack();
-        redoStack.clear();
-        notifyListeners();
-    }
-
-    public void undo() {
-        if (!canUndo()) {
-            return;
-        }
-
-        Command command = undoStack.pop();
-        command.undo();
-        redoStack.push(command);
-        notifyListeners();
-    }
-
-    public void redo() {
-        if (!canRedo()) {
-            return;
-        }
-
-        Command command = redoStack.pop();
-        command.redo();
-        undoStack.push(command);
-        trimUndoStack();
-        notifyListeners();
-    }
-
-    public boolean canUndo() {
-        return !undoStack.isEmpty();
-    }
-
-    public boolean canRedo() {
-        return !redoStack.isEmpty();
-    }
-
-    public void clear() {
-        undoStack.clear();
-        redoStack.clear();
-        notifyListeners();
-    }
-
-    public void addListener(CommandHistoryListener listener) {
-        listeners.add(listener);
-        listener.onHistoryChanged(canUndo(), canRedo());
-    }
-
-    private void trimUndoStack() {
-        while (undoStack.size() > limit) {
-            undoStack.removeLast();
-        }
-    }
-
-    private void notifyListeners() {
-        boolean canUndo = canUndo();
-        boolean canRedo = canRedo();
-        listeners.forEach(listener -> listener.onHistoryChanged(canUndo, canRedo));
-    }
-}

src/main/java/ovh/gasser/newshapes/command/CommandHistoryListener.java

@@ -1,5 +0,0 @@
-package ovh.gasser.newshapes.command;
-
-public interface CommandHistoryListener {
-    void onHistoryChanged(boolean canUndo, boolean canRedo);
-}

src/main/java/ovh/gasser/newshapes/command/MoveShapeCommand.java

@@ -1,28 +0,0 @@
-package ovh.gasser.newshapes.command;
-
-import ovh.gasser.newshapes.shapes.Shape;
-
-import java.util.Collection;
-import java.util.List;
-
-public class MoveShapeCommand implements Command {
-    private final List<Shape> shapes;
-    private final int dx;
-    private final int dy;
-
-    public MoveShapeCommand(Collection<? extends Shape> shapes, int dx, int dy) {
-        this.shapes = List.copyOf(shapes);
-        this.dx = dx;
-        this.dy = dy;
-    }
-
-    @Override
-    public void execute() {
-        shapes.forEach(shape -> shape.translate(dx, dy));
-    }
-
-    @Override
-    public void undo() {
-        shapes.forEach(shape -> shape.translate(-dx, -dy));
-    }
-}

src/main/java/ovh/gasser/newshapes/command/RemoveShapeCommand.java

@@ -1,49 +0,0 @@
-package ovh.gasser.newshapes.command;
-
-import ovh.gasser.newshapes.shapes.SCollection;
-import ovh.gasser.newshapes.shapes.Shape;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-
-public class RemoveShapeCommand implements Command {
-    private final SCollection model;
-    private final List<IndexedShape> shapes;
-
-    public RemoveShapeCommand(SCollection model, Shape shape) {
-        this(model, List.of(shape));
-    }
-
-    public RemoveShapeCommand(SCollection model, Collection<? extends Shape> shapes) {
-        this.model = model;
-        this.shapes = shapes.stream()
-                .map(shape -> new IndexedShape(model.indexOf(shape), shape))
-                .filter(entry -> entry.index() >= 0)
-                .sorted(Comparator.comparingInt(IndexedShape::index))
-                .toList();
-    }
-
-    @Override
-    public void execute() {
-        List<IndexedShape> reversed = new ArrayList<>(shapes);
-        reversed.sort(Comparator.comparingInt(IndexedShape::index).reversed());
-        reversed.forEach(entry -> {
-            if (model.contains(entry.shape())) {
-                model.remove(entry.shape());
-            }
-        });
-    }
-
-    @Override
-    public void undo() {
-        shapes.forEach(entry -> {
-            if (!model.contains(entry.shape())) {
-                model.insert(entry.index(), entry.shape());
-            }
-        });
-    }
-
-    private record IndexedShape(int index, Shape shape) {}
-}

src/main/java/ovh/gasser/newshapes/command/ResizeShapeCommand.java

@@ -1,51 +0,0 @@
-package ovh.gasser.newshapes.command;
-
-import ovh.gasser.newshapes.shapes.AbstractShape;
-import ovh.gasser.newshapes.shapes.Shape;
-
-import java.awt.*;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-public class ResizeShapeCommand implements Command {
-    private final List<ShapeBounds> before;
-    private final List<ShapeBounds> after;
-
-    public ResizeShapeCommand(Collection<? extends Shape> shapes, Map<Shape, Rectangle> before, Map<Shape, Rectangle> after) {
-        this.before = snapshots(shapes, before);
-        this.after = snapshots(shapes, after);
-    }
-
-    @Override
-    public void execute() {
-        apply(after);
-    }
-
-    @Override
-    public void undo() {
-        apply(before);
-    }
-
-    private static List<ShapeBounds> snapshots(Collection<? extends Shape> shapes, Map<Shape, Rectangle> states) {
-        return shapes.stream()
-                .map(shape -> new ShapeBounds(shape, states.get(shape)))
-                .toList();
-    }
-
-    private void apply(List<ShapeBounds> states) {
-        states.forEach(state -> {
-            if (!(state.shape() instanceof AbstractShape abstractShape)) {
-                throw new IllegalArgumentException("Resize commands support AbstractShape instances only");
-            }
-            abstractShape.setBounds(state.bounds());
-        });
-    }
-
-    private record ShapeBounds(Shape shape, Rectangle bounds) {
-        private ShapeBounds(Shape shape, Rectangle bounds) {
-            this.shape = shape;
-            this.bounds = new Rectangle(bounds);
-        }
-    }
-}

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

@@ -5,15 +5,6 @@ import org.slf4j.LoggerFactory;
 import ovh.gasser.newshapes.HTMLExporter;
 import ovh.gasser.newshapes.Selection;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.persistence.DrawingSerializer;
-import ovh.gasser.newshapes.command.AddShapeCommand;
-import ovh.gasser.newshapes.command.ChangeColorCommand;
-import ovh.gasser.newshapes.command.Command;
-import ovh.gasser.newshapes.command.CommandHistory;
-import ovh.gasser.newshapes.command.CommandHistoryListener;
-import ovh.gasser.newshapes.command.MoveShapeCommand;
-import ovh.gasser.newshapes.command.RemoveShapeCommand;
-import ovh.gasser.newshapes.command.ResizeShapeCommand;
 import ovh.gasser.newshapes.shapes.ResizeHandle;
 import ovh.gasser.newshapes.shapes.SCollection;
 import ovh.gasser.newshapes.shapes.SText;
@@ -22,28 +13,18 @@ import ovh.gasser.newshapes.ui.listeners.SelectionListener;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.function.Function;
 
 public class Controller {
-    private static final Logger logger = LoggerFactory.getLogger(Controller.class);
-
+    private final static Logger logger = LoggerFactory.getLogger(Controller.class);
     private final ShapesView view;
     private final SCollection model;
     private final Selection selection;
-    private final CommandHistory commandHistory;
 
     private Point lastMousePos;
     private boolean addingText;
@@ -54,24 +35,11 @@ public class Controller {
     private Point selectionBoxStart;
     private Point selectionBoxEnd;
     private boolean boxSelecting;
-    private Point dragStartMousePos;
-    private Map<Shape, Rectangle> dragStartBounds = Map.of();
-    private final Runnable onModelChanged;
-    private java.util.List<Shape> clipboard = java.util.List.of();
-    private int pasteCount = 0;
-    private static final int PASTE_OFFSET = 20;
-    private boolean additiveBoxSelection;
 
     Controller(ShapesView view, SCollection model) {
-        this(view, model, () -> { });
-    }
-
-    Controller(ShapesView view, SCollection model, Runnable onModelChanged) {
         this.view = view;
         this.model = model;
-        this.onModelChanged = onModelChanged;
         this.selection = new Selection();
-        this.commandHistory = new CommandHistory();
 
         var adapter = new MouseAdapter() {
             @Override
@@ -86,7 +54,14 @@ public class Controller {
 
             @Override
             public void mouseReleased(MouseEvent evt) {
-                handleMouseReleased(evt);
+                resizing = false;
+                activeHandle = null;
+                resizeOrigin = null;
+                boxSelecting = false;
+                selectionBoxStart = null;
+                selectionBoxEnd = null;
+                view.setCurrentSelectionBox(null);
+                view.repaint();
             }
         };
         this.view.addMouseMotionListener(adapter);
@@ -99,249 +74,6 @@ public class Controller {
         });
     }
 
-    public void addShape(Shape shape) {
-        executeAndRefresh(new AddShapeCommand(model, shape));
-    }
-
-    public void addSelectionChangeListener(SelectionListener listener) {
-        selection.addListener(listener);
-    }
-
-    public void addHistoryChangeListener(CommandHistoryListener listener) {
-        commandHistory.addListener(listener);
-    }
-
-    public boolean canUndo() {
-        return commandHistory.canUndo();
-    }
-
-    public boolean canRedo() {
-        return commandHistory.canRedo();
-    }
-
-    public void undo() {
-        if (!commandHistory.canUndo()) {
-            return;
-        }
-
-        resetSelection();
-        commandHistory.undo();
-        view.repaint();
-    }
-
-    public void redo() {
-        if (!commandHistory.canRedo()) {
-            return;
-        }
-
-        resetSelection();
-        commandHistory.redo();
-        view.repaint();
-    }
-
-    public void saveDrawing(java.io.File file) {
-        try {
-            new DrawingSerializer().save(model, file);
-            logger.info("Saved drawing to {}", file.getAbsolutePath());
-        } catch (java.io.IOException e) {
-            logger.error("Failed to save drawing: {}", e.getMessage());
-            JOptionPane.showMessageDialog(view, "Failed to save: " + e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);
-        }
-    }
-
-    public void loadDrawing(java.io.File file) {
-        try {
-            SCollection loaded = new DrawingSerializer().load(file);
-            model.stream().toList().forEach(model::remove);
-            loaded.forEach(model::add);
-            resetSelection();
-            view.repaint();
-            logger.info("Loaded drawing from {}", file.getAbsolutePath());
-        } catch (java.io.IOException e) {
-            logger.error("Failed to load drawing: {}", e.getMessage());
-            JOptionPane.showMessageDialog(view, "Failed to load: " + e.getMessage(), "Load Error", JOptionPane.ERROR_MESSAGE);
-        }
-    }
-
-    public void enterTextMode() {
-        addingText = true;
-    }
-
-    public void deleteSelected() {
-        List<Shape> selectedShapes = selection.getSelectedShapes();
-        if (selectedShapes.isEmpty()) {
-            return;
-        }
-
-        logger.debug("Deleting selected shape(s)");
-        executeAndRefresh(new RemoveShapeCommand(model, selectedShapes));
-        resetSelection();
-    }
-
-    public void copySelection() {
-        List<Shape> selectedShapes = selection.getSelectedShapes();
-        if (selectedShapes.isEmpty()) {
-            logger.debug("No selection to copy");
-            return;
-        }
-
-        clipboard = selectedShapes.stream()
-                .map(Shape::clone)
-                .toList();
-        pasteCount = 0;
-    }
-
-    public void cutSelection() {
-        List<Shape> selectedShapes = selection.getSelectedShapes();
-        if (selectedShapes.isEmpty()) {
-            logger.debug("No selection to cut");
-            return;
-        }
-
-        clipboard = selectedShapes.stream()
-                .map(Shape::clone)
-                .toList();
-        pasteCount = 0;
-
-        for (Shape shape : selectedShapes) {
-            model.remove(shape);
-        }
-        resetSelection();
-        onModelChanged.run();
-        view.repaint();
-    }
-
-    public void pasteClipboard() {
-        if (clipboard.isEmpty()) {
-            logger.debug("Clipboard is empty");
-            return;
-        }
-
-        pasteCount++;
-        int offset = PASTE_OFFSET * pasteCount;
-
-        resetSelection();
-
-        for (Shape original : clipboard) {
-            Shape clone = original.clone();
-            clone.translate(offset, offset);
-            model.add(clone);
-            selection.add(clone);
-        }
-
-        onModelChanged.run();
-        view.repaint();
-    }
-
-    public void group() {
-        List<Shape> selectedShapes = selection.getSelectedShapes();
-        if (selectedShapes.size() < 2) {
-            logger.debug("Need at least 2 shapes to group");
-            return;
-        }
-
-        int minIndex = selectedShapes.stream()
-                .mapToInt(model::indexOf)
-                .min()
-                .orElse(0);
-
-        for (Shape shape : selectedShapes) {
-            model.remove(shape);
-            shape.addAttributes(new ovh.gasser.newshapes.attributes.SelectionAttributes(false));
-        }
-
-        Shape[] shapesArray = selectedShapes.toArray(new Shape[0]);
-        SCollection group = SCollection.of(shapesArray);
-
-        model.insert(minIndex, group);
-        resetSelection();
-        selection.add(group);
-        onModelChanged.run();
-        view.repaint();
-    }
-
-    public void ungroup() {
-        List<Shape> selectedShapes = selection.getSelectedShapes();
-        if (selectedShapes.size() != 1) {
-            logger.debug("Can only ungroup a single selected group");
-            return;
-        }
-
-        Shape selected = selectedShapes.get(0);
-        if (!(selected instanceof SCollection group)) {
-            logger.debug("Selected shape is not a group");
-            return;
-        }
-
-        List<Shape> children = new ArrayList<>();
-        group.forEach(children::add);
-
-        model.remove(group);
-
-        for (Shape child : children) {
-            model.add(child);
-        }
-
-        resetSelection();
-        for (Shape child : children) {
-            selection.add(child);
-        }
-        onModelChanged.run();
-        view.repaint();
-    }
-
-    public void changeSelectionColor() {
-        changeColors(shape -> new ColorAttributes(false, true, Color.BLACK, randomColor()));
-    }
-
-    public void changeSelectionFillColor(Color filledColor) {
-        if (filledColor == null) {
-            return;
-        }
-
-        changeColors(shape -> {
-            ColorAttributes current = currentColor(shape);
-            if (shape instanceof SText) {
-                return new ColorAttributes(current.filled, current.stroked, filledColor, filledColor);
-            }
-            return new ColorAttributes(true, current.stroked, filledColor, current.strokedColor);
-        });
-    }
-
-    public void changeSelectionBorderColor(Color strokedColor) {
-        if (strokedColor == null) {
-            return;
-        }
-
-        changeColors(shape -> {
-            ColorAttributes current = currentColor(shape);
-            if (shape instanceof SText) {
-                return new ColorAttributes(current.filled, current.stroked, strokedColor, strokedColor);
-            }
-            return new ColorAttributes(current.filled, true, current.filledColor, strokedColor);
-        });
-    }
-
-    public void setSelectionBorder(boolean state) {
-        changeColors(shape -> {
-            if (shape instanceof SText) {
-                return null;
-            }
-            ColorAttributes current = currentColor(shape);
-            return new ColorAttributes(current.filled, state, current.filledColor, current.strokedColor);
-        });
-    }
-
-    public void setSelectionFilled(boolean state) {
-        changeColors(shape -> {
-            if (shape instanceof SText) {
-                return null;
-            }
-            ColorAttributes current = currentColor(shape);
-            return new ColorAttributes(state, current.stroked, current.filledColor, current.strokedColor);
-        });
-    }
-
     private void handleMouseDragged(MouseEvent evt) {
         if (boxSelecting) {
             selectionBoxEnd = evt.getPoint();
@@ -352,19 +84,35 @@ public class Controller {
             return;
         }
 
+        boxSelecting = false;
+
         if (resizeMode && resizing && activeHandle != null) {
+            logger.debug("RESIZING with handle {} at ({}, {})", activeHandle, evt.getX(), evt.getY());
             int dx = evt.getX() - resizeOrigin.x;
             int dy = evt.getY() - resizeOrigin.y;
+            logger.debug("About to resize {} shapes, dx={}, dy={}", selection.getSelectedShapes().size(), dx, dy);
             for (Shape shape : selection) {
+                logger.debug("Calling resize on shape: {}", shape);
                 shape.resize(activeHandle, dx, dy);
             }
             resizeOrigin = evt.getPoint();
-        } else if (!selection.isEmpty()) {
+        } else if (resizeMode && !selection.isEmpty()) {
+            lastMousePos = evt.getPoint();
+            ResizeHandle handle = getHandleAt(evt.getPoint());
+            if (handle != null) {
+                resizing = true;
+                activeHandle = handle;
+                resizeOrigin = evt.getPoint();
+            }
+        } else {
+            resizing = false;
+            activeHandle = null;
             if (lastMousePos == null) {
                 lastMousePos = evt.getPoint();
             }
             int dx = evt.getX() - lastMousePos.x;
             int dy = evt.getY() - lastMousePos.y;
+            logger.debug("MOVING shapes with delta ({}, {})", dx, dy);
             for (Shape shape : selection) {
                 shape.translate(dx, dy);
             }
@@ -379,17 +127,18 @@ public class Controller {
             return;
         }
 
-        resizeDragState();
-        boxSelecting = false;
-        view.setCurrentSelectionBox(null);
+        resizing = false;
+        activeHandle = null;
+        resizeOrigin = null;
+        boxSelecting = false; // Clear box selection mode when clicking
 
         if (resizeMode && !selection.isEmpty()) {
             ResizeHandle handle = getHandleAt(evt.getPoint());
+            logger.debug("In resize mode, checking handle at ({}, {}): {}", evt.getX(), evt.getY(), handle);
             if (handle != null) {
                 resizing = true;
                 activeHandle = handle;
                 resizeOrigin = evt.getPoint();
-                beginDrag(evt.getPoint());
                 view.repaint();
                 return;
             }
@@ -402,86 +151,96 @@ public class Controller {
                                 resetSelection();
                             }
                             if (!selection.getSelectedShapes().contains(s)) {
+                                lastMousePos = evt.getPoint();
                                 selection.add(s);
+                                logger.debug("Selecting {}", s);
                             }
-                            beginDrag(evt.getPoint());
                         },
                         () -> {
-                            additiveBoxSelection = evt.isShiftDown();
-                            if (!additiveBoxSelection) {
+                            // Clicked on empty space - start box selection
                             resetSelection();
-                            }
                             selectionBoxStart = evt.getPoint();
-                            selectionBoxEnd = evt.getPoint();
                             boxSelecting = true;
-                            dragStartMousePos = null;
-                            dragStartBounds = Map.of();
                         }
                 );
     }
 
-    private void handleMouseReleased(MouseEvent evt) {
-        finishDragCommand();
-        resizeDragState();
-        boxSelecting = false;
-        selectionBoxStart = null;
-        selectionBoxEnd = null;
-        dragStartMousePos = null;
-        dragStartBounds = Map.of();
-        view.setCurrentSelectionBox(null);
+    private void placeTextAt(Point point) {
+        String input = JOptionPane.showInputDialog(view, "Enter text:", "Add text", JOptionPane.PLAIN_MESSAGE);
+        addingText = false;
+        if (input == null) {
+            return;
+        }
+
+        model.add(SText.create(point.x, point.y, input));
+        resetSelection();
         view.repaint();
     }
 
+    public void enterTextMode() {
+        addingText = true;
+    }
+
+    private ResizeHandle getHandleAt(Point point) {
+        final int handleSize = 10;
+        for (Shape shape : selection) {
+            Rectangle bounds = shape.getBounds();
+            
+            // Always-present SE corner handle
+            if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
+                point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
+                return ResizeHandle.SE;
+            }
+
+            // Resize handles are only active in resize mode
+            if (resizeMode) {
+                // NW corner
+                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
+                    point.y >= bounds.y - handleSize && point.y <= bounds.y) {
+                    return ResizeHandle.NW;
+                }
+                // NE corner
+                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
+                    point.y >= bounds.y - handleSize && point.y <= bounds.y) {
+                    return ResizeHandle.NE;
+                }
+                // SW corner
+                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
+                    point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
+                    return ResizeHandle.SW;
+                }
+                // N edge
+                int edgeX = bounds.x + bounds.width / 2 - handleSize / 2;
+                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
+                    point.y >= bounds.y - handleSize && point.y <= bounds.y) {
+                    return ResizeHandle.N;
+                }
+                // S edge
+                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
+                    point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
+                    return ResizeHandle.S;
+                }
+                // W edge
+                int edgeY = bounds.y + bounds.height / 2 - handleSize / 2;
+                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
+                    point.y >= edgeY && point.y <= edgeY + handleSize) {
+                    return ResizeHandle.W;
+                }
+                // E edge
+                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
+                    point.y >= edgeY && point.y <= edgeY + handleSize) {
+                    return ResizeHandle.E;
+                }
+            }
+        }
+        return null;
+    }
+
     private void handleKeyPressed(KeyEvent evt) {
-        int modifiers = evt.getModifiersEx();
-
-        if ((modifiers & InputEvent.CTRL_DOWN_MASK) != 0) {
-            switch (evt.getKeyCode()) {
-                case KeyEvent.VK_Z -> {
-                    if ((modifiers & InputEvent.SHIFT_DOWN_MASK) != 0) {
-                        redo();
-                    } else {
-                        undo();
-                    }
-                    evt.consume();
-                    return;
-                }
-                case KeyEvent.VK_Y -> {
-                    redo();
-                    evt.consume();
-                    return;
-                }
-                case KeyEvent.VK_C -> {
-                    copySelection();
-                    evt.consume();
-                    return;
-                }
-                case KeyEvent.VK_X -> {
-                    cutSelection();
-                    evt.consume();
-                    return;
-                }
-                case KeyEvent.VK_V -> {
-                    pasteClipboard();
-                    evt.consume();
-                    return;
-                }
-                case KeyEvent.VK_G -> {
-                    group();
-                    evt.consume();
-                    return;
-                }
-                case KeyEvent.VK_U -> {
-                    ungroup();
-                    evt.consume();
-                    return;
-                }
-            }
-        }
-
         switch (evt.getKeyCode()) {
             case KeyEvent.VK_R -> toggleResizeMode();
             case KeyEvent.VK_DELETE -> deleteSelected();
+            case KeyEvent.VK_C -> copySelection();
             case KeyEvent.VK_A -> changeSelectionColor();
             case KeyEvent.VK_H -> exportHtml();
             default -> logger.warn("Pressed unhandled key: {}", evt.getKeyChar());
@@ -505,134 +264,55 @@ public class Controller {
         }
     }
 
-    private void placeTextAt(Point point) {
-        String input = JOptionPane.showInputDialog(view, "Enter text:", "Add text", JOptionPane.PLAIN_MESSAGE);
-        addingText = false;
-        if (input == null) {
+    private void changeSelectionColor(){
+        if (selection == null) {
+            logger.debug("No selection to change color of");
             return;
         }
 
-        addShape(SText.create(point.x, point.y, input));
-        resetSelection();
+        for (Shape s : selection) {
+            if (s instanceof SCollection collection) {
+                collection.forEach(shape -> shape.addAttributes(new ColorAttributes(false, true, Color.BLACK, new Color((int) (Math.random() * 0x1000000)))));
+            } else {
+                s.addAttributes(new ColorAttributes(false, true, Color.BLACK, new Color((int) (Math.random() * 0x1000000))));
+            }
+        }
+
+        view.repaint();
+    }
+
+    private void copySelection() {
+        if (selection == null) {
+            logger.debug("No selection to copy");
+            return;
         }
 
-    private ResizeHandle getHandleAt(Point point) {
-        final int handleSize = 10;
         for (Shape shape : selection) {
-            Rectangle bounds = shape.getBounds();
-
-            if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
-                    point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
-                return ResizeHandle.SE;
+            this.model.add(shape.clone());
         }
 
-            if (resizeMode) {
-                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
-                        point.y >= bounds.y - handleSize && point.y <= bounds.y) {
-                    return ResizeHandle.NW;
-                }
-                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
-                        point.y >= bounds.y - handleSize && point.y <= bounds.y) {
-                    return ResizeHandle.NE;
-                }
-                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
-                        point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
-                    return ResizeHandle.SW;
-                }
-                int edgeX = bounds.x + bounds.width / 2 - handleSize / 2;
-                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
-                        point.y >= bounds.y - handleSize && point.y <= bounds.y) {
-                    return ResizeHandle.N;
-                }
-                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
-                        point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
-                    return ResizeHandle.S;
-                }
-                int edgeY = bounds.y + bounds.height / 2 - handleSize / 2;
-                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
-                        point.y >= edgeY && point.y <= edgeY + handleSize) {
-                    return ResizeHandle.W;
-                }
-                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
-                        point.y >= edgeY && point.y <= edgeY + handleSize) {
-                    return ResizeHandle.E;
-                }
-            }
-        }
-        return null;
+        view.repaint();
     }
 
-    private void changeColors(Function<Shape, ColorAttributes> updater) {
-        Map<Shape, ColorAttributes> before = new LinkedHashMap<>();
-        Map<Shape, ColorAttributes> after = new LinkedHashMap<>();
-        List<Shape> targets = flattenSelection(selection.getSelectedShapes());
-
-        for (Shape shape : targets) {
-            ColorAttributes current = currentColor(shape);
-            if (current == null) {
-                continue;
+    public void deleteSelected() {
+        if (selection == null) return;
+        logger.debug("Deleting selected shape(s)");
+        for (Shape s : selection) {
+            this.model.remove(s);
         }
-
-            ColorAttributes updated = updater.apply(shape);
-            if (updated == null || sameColor(current, updated)) {
-                continue;
-            }
-
-            before.put(shape, copy(current));
-            after.put(shape, copy(updated));
-        }
-
-        if (before.isEmpty()) {
-            return;
-        }
-
-        executeAndRefresh(new ChangeColorCommand(before.keySet(), before, after));
-    }
-
-    private void beginDrag(Point point) {
-        lastMousePos = point;
-        dragStartMousePos = point;
-        dragStartBounds = captureBounds(selection.getSelectedShapes());
-    }
-
-    private void finishDragCommand() {
-        if (boxSelecting || dragStartBounds.isEmpty()) {
-            return;
-        }
-
-        List<Shape> selectedShapes = selection.getSelectedShapes();
-        if (selectedShapes.isEmpty()) {
-            return;
-        }
-
-        if (resizing && boundsChanged(selectedShapes, dragStartBounds)) {
-            Map<Shape, Rectangle> afterBounds = captureBounds(selectedShapes);
-            Command command = new ResizeShapeCommand(selectedShapes, dragStartBounds, afterBounds);
-            command.undo();
-            executeAndRefresh(command);
-            return;
-        }
-
-        if (boundsChanged(selectedShapes, dragStartBounds)) {
-            Shape reference = selectedShapes.get(0);
-            Rectangle before = dragStartBounds.get(reference);
-            Rectangle after = reference.getBounds();
-            Command command = new MoveShapeCommand(selectedShapes, after.x - before.x, after.y - before.y);
-            command.undo();
-            executeAndRefresh(command);
-        }
-    }
-
-    private void executeAndRefresh(Command command) {
-        commandHistory.execute(command);
-        onModelChanged.run();
+        resetSelection();
         view.repaint();
     }
 
     private void resetSelection() {
+        logger.debug("Resetting selection");
         selection.clear();
     }
 
+    public void addSelectionChangeListener(SelectionListener listener) {
+        selection.addListener(listener);
+    }
+
     private Optional<Shape> getTarget(MouseEvent evt, SCollection sc) {
         return sc.stream()
                 .filter(s -> s.getBounds().contains(evt.getPoint()))
@@ -648,71 +328,9 @@ public class Controller {
     }
 
     private void updateSelectionFromBox(Rectangle box) {
-        if (!additiveBoxSelection) {
         resetSelection();
-        }
         model.stream()
                 .filter(s -> s.getBounds().intersects(box))
                 .forEach(selection::add);
     }
-
-    private void resizeDragState() {
-        resizing = false;
-        activeHandle = null;
-        resizeOrigin = null;
-        lastMousePos = null;
-    }
-
-    private Map<Shape, Rectangle> captureBounds(Collection<Shape> shapes) {
-        Map<Shape, Rectangle> bounds = new LinkedHashMap<>();
-        for (Shape shape : shapes) {
-            bounds.put(shape, shape.getBounds());
-        }
-        return bounds;
-    }
-
-    private boolean boundsChanged(Collection<Shape> shapes, Map<Shape, Rectangle> before) {
-        for (Shape shape : shapes) {
-            Rectangle previous = before.get(shape);
-            if (previous != null && !previous.equals(shape.getBounds())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private List<Shape> flattenSelection(Collection<Shape> selectedShapes) {
-        LinkedHashSet<Shape> flattened = new LinkedHashSet<>();
-        for (Shape shape : selectedShapes) {
-            flattenShape(shape, flattened);
-        }
-        return new ArrayList<>(flattened);
-    }
-
-    private void flattenShape(Shape shape, Collection<Shape> flattened) {
-        if (shape instanceof SCollection collection) {
-            collection.forEach(child -> flattenShape(child, flattened));
-            return;
-        }
-        flattened.add(shape);
-    }
-
-    private ColorAttributes currentColor(Shape shape) {
-        return (ColorAttributes) shape.getAttributes(ColorAttributes.ID);
-    }
-
-    private ColorAttributes copy(ColorAttributes attrs) {
-        return new ColorAttributes(attrs.filled, attrs.stroked, attrs.filledColor, attrs.strokedColor);
-    }
-
-    private boolean sameColor(ColorAttributes left, ColorAttributes right) {
-        return left.filled == right.filled
-                && left.stroked == right.stroked
-                && left.filledColor.equals(right.filledColor)
-                && left.strokedColor.equals(right.strokedColor);
-    }
-
-    private Color randomColor() {
-        return new Color((int) (Math.random() * 0x1000000));
-    }
 }

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

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

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

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

@@ -1,370 +0,0 @@
-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 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");
-        }
-    }
-
-    // ── 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");
-        }
-    }
-}