3 Commits

Author SHA1 Message Date
6cc6fbbfe8 test: add edge case tests for shapes
All checks were successful
CI / build-and-test (pull_request) Successful in 17s
Add 19 tests covering edge cases across all shape types:
- Negative coordinates: SRectangle, SCircle, STriangle, translate
- Zero dimensions: zero width/height rectangle, zero radius circle
- Resize clamping: verify width/height minimum enforcement
- Null handling: null/blank text normalization, unknown attribute key, empty collection
- Large values: Integer.MAX_VALUE/2 coords, MAX/MIN_VALUE translate

Closes #13
2026-03-27 23:23:17 +00:00
5415c10c26 Merge pull request 'fix: SText.updateMeasuredBounds() mutates defensive copy instead of internal state' (#32) from fix/issue-27-stext-update-measured-bounds into master
All checks were successful
CI / build-and-test (push) Successful in 16s
Reviewed-on: #32
2026-03-27 23:22:20 +00:00
873f5d2711 fix: SText.updateMeasuredBounds() must mutate internal bounds, not defensive copy
All checks were successful
CI / build-and-test (pull_request) Successful in 17s
Closes #27
2026-03-27 23:22:08 +00:00
7 changed files with 261 additions and 184 deletions

View File

@@ -77,14 +77,6 @@ public abstract class AbstractShape implements Shape {
return new Rectangle(this.bounds); return new Rectangle(this.bounds);
} }
public void setBounds(Rectangle newBounds) {
this.bounds.setBounds(newBounds);
onBoundsChanged();
}
protected void onBoundsChanged() {
}
@Override @Override
public String toString() { public String toString() {
return String.format("x=%d, y=%d, width=%d, height=%d", bounds.x, bounds.y, bounds.width, bounds.height); return String.format("x=%d, y=%d, width=%d, height=%d", bounds.x, bounds.y, bounds.width, bounds.height);

View File

@@ -53,14 +53,6 @@ public class SCircle extends AbstractShape {
return radius; return radius;
} }
@Override
protected void onBoundsChanged() {
int diameter = Math.max(bounds.width, bounds.height);
bounds.width = diameter;
bounds.height = diameter;
this.radius = diameter / 2;
}
public static SCircle create(int x, int y, int radius) { public static SCircle create(int x, int y, int radius) {
return create(x, y, radius, Color.BLACK); return create(x, y, radius, Color.BLACK);
} }

View File

@@ -9,6 +9,7 @@ import ovh.gasser.newshapes.attributes.ColorAttributes;
import ovh.gasser.newshapes.attributes.SelectionAttributes; import ovh.gasser.newshapes.attributes.SelectionAttributes;
import ovh.gasser.newshapes.util.Streamable; import ovh.gasser.newshapes.util.Streamable;
import javax.swing.text.html.Option;
import java.awt.*; import java.awt.*;
import java.util.*; import java.util.*;
import java.util.List; import java.util.List;
@@ -18,7 +19,6 @@ public class SCollection extends AbstractShape implements Streamable<Shape> {
private final List<Shape> children; private final List<Shape> children;
private SCollection(Shape... shapes) { private SCollection(Shape... shapes) {
super(new Rectangle());
this.children = new ArrayList<>(List.of(shapes)); this.children = new ArrayList<>(List.of(shapes));
} }
@@ -57,29 +57,6 @@ public class SCollection extends AbstractShape implements Streamable<Shape> {
children.forEach(s -> s.translate(dx, dy)); children.forEach(s -> s.translate(dx, dy));
} }
@Override
public void resize(ResizeHandle handle, int dx, int dy) {
if (children.isEmpty()) {
return;
}
Rectangle currentBounds = getBounds();
Rectangle resizedBounds = resizeBounds(currentBounds, handle, dx, dy);
double scaleX = resizedBounds.width / (double) currentBounds.width;
double scaleY = resizedBounds.height / (double) currentBounds.height;
for (Shape child : children) {
Rectangle childBounds = child.getBounds();
Rectangle targetChildBounds = new Rectangle(
resizedBounds.x + (int) Math.round((childBounds.x - currentBounds.x) * scaleX),
resizedBounds.y + (int) Math.round((childBounds.y - currentBounds.y) * scaleY),
Math.max(1, (int) Math.round(childBounds.width * scaleX)),
Math.max(1, (int) Math.round(childBounds.height * scaleY))
);
resizeChild(child, targetChildBounds);
}
}
@Override @Override
public Iterator<Shape> iterator() { public Iterator<Shape> iterator() {
return children.iterator(); return children.iterator();
@@ -94,45 +71,12 @@ public class SCollection extends AbstractShape implements Streamable<Shape> {
children.add(s); children.add(s);
} }
public void clear() {
children.clear();
}
public void replaceWith(SCollection other) {
if (other == this) {
return;
}
clear();
other.stream().forEach(children::add);
}
public void add(int index, Shape s) {
children.add(index, s);
}
public void insert(int index, Shape s) {
children.add(Math.max(0, Math.min(index, children.size())), s);
}
public void remove(Shape s) { public void remove(Shape s) {
if (!children.remove(s)) { if (!children.remove(s)) {
logger.error("Unable to delete shape: {}", s); logger.error("Unable to delete shape: {}", s);
} }
} }
public int indexOf(Shape s) {
return children.indexOf(s);
}
public int size() {
return children.size();
}
public boolean contains(Shape s) {
return children.contains(s);
}
@Override @Override
public Attributes getAttributes(String key) { public Attributes getAttributes(String key) {
if (key.equals(ColorAttributes.ID)) { if (key.equals(ColorAttributes.ID)) {
@@ -166,69 +110,4 @@ public class SCollection extends AbstractShape implements Streamable<Shape> {
collection.addAttributes(new SelectionAttributes()); collection.addAttributes(new SelectionAttributes());
return collection; return collection;
} }
private static Rectangle resizeBounds(Rectangle bounds, ResizeHandle handle, int dx, int dy) {
Rectangle resizedBounds = new Rectangle(bounds);
switch (handle) {
case E -> resizedBounds.width += dx;
case W -> {
resizedBounds.x += dx;
resizedBounds.width -= dx;
}
case S -> resizedBounds.height += dy;
case N -> {
resizedBounds.y += dy;
resizedBounds.height -= dy;
}
case SE -> {
resizedBounds.width += dx;
resizedBounds.height += dy;
}
case SW -> {
resizedBounds.x += dx;
resizedBounds.width -= dx;
resizedBounds.height += dy;
}
case NE -> {
resizedBounds.width += dx;
resizedBounds.y += dy;
resizedBounds.height -= dy;
}
case NW -> {
resizedBounds.x += dx;
resizedBounds.width -= dx;
resizedBounds.y += dy;
resizedBounds.height -= dy;
}
}
if (resizedBounds.width < 1) {
resizedBounds.width = 1;
}
if (resizedBounds.height < 1) {
resizedBounds.height = 1;
}
return resizedBounds;
}
private static void resizeChild(Shape child, Rectangle targetChildBounds) {
if (child instanceof SCollection collection) {
Rectangle currentBounds = collection.getBounds();
collection.translate(targetChildBounds.x - currentBounds.x, targetChildBounds.y - currentBounds.y);
Rectangle translatedBounds = collection.getBounds();
collection.resize(
ResizeHandle.SE,
targetChildBounds.width - translatedBounds.width,
targetChildBounds.height - translatedBounds.height
);
return;
}
if (child instanceof AbstractShape abstractShape) {
abstractShape.setBounds(targetChildBounds);
}
}
} }

View File

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

View File

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

View File

@@ -114,51 +114,6 @@ class SCollectionTest {
assertEquals(30, bounds.y); assertEquals(30, bounds.y);
} }
@Test
void testResizeEmptyCollectionIsNoOp() {
SCollection collection = SCollection.of();
assertDoesNotThrow(() -> collection.resize(ResizeHandle.SE, 25, 25));
assertEquals(new Rectangle(App.WIN_SIZE), collection.getBounds());
}
@Test
void testResizeSingleChildResizesChildAndCollection() {
SRectangle rect = SRectangle.create(10, 20, 100, 50);
SCollection collection = SCollection.of(rect);
collection.resize(ResizeHandle.E, 20, 0);
assertEquals(new Rectangle(10, 20, 120, 50), rect.getBounds());
assertEquals(new Rectangle(10, 20, 120, 50), collection.getBounds());
}
@Test
void testResizeMultipleChildrenScalesChildrenProportionally() {
SRectangle rect1 = SRectangle.create(0, 0, 10, 10);
SRectangle rect2 = SRectangle.create(20, 10, 20, 10);
SCollection collection = SCollection.of(rect1, rect2);
collection.resize(ResizeHandle.SE, 20, 10);
assertEquals(new Rectangle(0, 0, 15, 15), rect1.getBounds());
assertEquals(new Rectangle(30, 15, 30, 15), rect2.getBounds());
assertEquals(new Rectangle(0, 0, 60, 30), collection.getBounds());
}
@Test
void testResizeFromNorthWestRepositionsAndScalesChildren() {
SRectangle rect1 = SRectangle.create(0, 0, 10, 10);
SRectangle rect2 = SRectangle.create(10, 10, 10, 10);
SCollection collection = SCollection.of(rect1, rect2);
collection.resize(ResizeHandle.NW, 10, 10);
assertEquals(new Rectangle(10, 10, 5, 5), rect1.getBounds());
assertEquals(new Rectangle(15, 15, 5, 5), rect2.getBounds());
assertEquals(new Rectangle(10, 10, 10, 10), collection.getBounds());
}
@Test @Test
void testClone() { void testClone() {
SRectangle rect = SRectangle.create(10, 20, 100, 50); SRectangle rect = SRectangle.create(10, 20, 100, 50);

View File

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