4 Commits

Author SHA1 Message Date
8a64d8ae51 test: add ColorAttributes unit tests
All checks were successful
CI / build-and-test (pull_request) Successful in 18s
Add 16 tests covering constructor behavior, fill/stroke flags and colors,
null color handling, ID constant, Attributes interface, toString output,
and instance independence.

Closes #7
2026-03-27 16:26:06 +00:00
29d202c156 Merge pull request 'Add parameterized ShapeContractTest for Shape interface invariants' (#15) from issue-8/shape-contract-test into master
All checks were successful
CI / build-and-test (push) Successful in 18s
Reviewed-on: #15
2026-03-27 16:21:22 +00:00
7ddef4d8ab Add parameterized ShapeContractTest for Shape interface invariants
All checks were successful
CI / build-and-test (pull_request) Successful in 18s
Verify clone(), getBounds(), and translate() contracts across all Shape
implementations (SRectangle, SCircle, STriangle, SText, SCollection)
using @ParameterizedTest + @MethodSource.

Also adds junit-jupiter-params dependency to pom.xml.

Closes #8
2026-03-27 16:11:55 +00:00
c51ae8cfbb Merge pull request 'fix(ci): use Maven wrapper instead of system mvn' (#26) from issue-25/maven-wrapper into master
All checks were successful
CI / build-and-test (push) Successful in 18s
Reviewed-on: #26
2026-03-27 16:09:54 +00:00
4 changed files with 234 additions and 0 deletions

View File

@@ -92,5 +92,12 @@
<version>5.10.0</version> <version>5.10.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

View File

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

View File

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

View File

@@ -0,0 +1,25 @@
package ovh.gasser.newshapes.shapes;
import java.awt.Color;
import java.util.stream.Stream;
/**
* Provides Shape instances for parameterized contract tests.
*/
public final class ShapeFactory {
private ShapeFactory() {}
static Stream<Shape> allShapes() {
return Stream.of(
SRectangle.create(10, 20, 100, 50),
SCircle.create(5, 5, 30),
STriangle.create(0, 0, 40, Color.RED, Color.BLACK),
SText.create(15, 25, "Hello"),
SCollection.of(
SRectangle.create(0, 0, 20, 20),
SCircle.create(10, 10, 5)
)
);
}
}