Merge branch 'main' into display9

Author: jagdish-15

.github/workflows/java.yml

@@ -39,8 +39,9 @@ jobs:
         run: ./gradlew check --exclude-task test --continue
         working-directory: exercises
 
-  test:
+  test-all:
     name: Test all exercises using java-test-runner
+    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
@@ -52,3 +53,20 @@ jobs:
           name: test-results
           path: exercises/**/build/results.json
         if: failure()
+        
+  test-changed:
+    name: Test changed exercises using java-test-runner
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        with:
+          fetch-depth: 0
+      - name: Test changed exercises using java-test-runner
+        run: bin/test-changed-exercise
+      - name: Archive test results
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+        with:
+          name: test-results
+          path: exercises/**/build/results.json
+        if: failure()

bin/test-changed-exercise

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+# Determine the base branch of the PR
+BASE_BRANCH=${GITHUB_BASE_REF:-main}
+
+# Fetch full history for proper diff
+git fetch origin "$BASE_BRANCH"
+
+# Compute merge base
+MERGE_BASE=$(git merge-base HEAD origin/"$BASE_BRANCH")
+
+# Get changed files relative to merge base
+changed_files=$(git diff --name-only "$MERGE_BASE" HEAD)
+
+# Extract unique exercise directories
+changed_exercises=$(echo "$changed_files" | \
+  grep -E '^exercises/(practice|concept)/[^/]+/.+\.(java|gradle)$' | \
+  cut -d/ -f1-3 | sort -u)
+
+if [ -z "$changed_exercises" ]; then
+  echo "No relevant exercises changed, skipping tests."
+  exit 0
+fi
+
+# Print exercises
+echo "Changed exercises detected:"
+echo "$changed_exercises"
+echo "----------------------------------------"
+
+# Run tests
+for dir in $changed_exercises; do
+  slug=$(basename "$dir")
+
+  echo "========================================"
+  echo "=== Running tests for $slug ==="
+  echo "========================================"
+
+  if [[ $dir == exercises/practice/* ]]; then
+    ./exercises/gradlew -p exercises ":practice:$slug:test"
+  elif [[ $dir == exercises/concept/* ]]; then
+    ./exercises/gradlew -p exercises ":concept:$slug:test"
+  fi
+done

exercises/practice/rectangles/src/test/java/RectangleCounterTest.java

@@ -1,5 +1,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -14,6 +15,7 @@ public void setUp() {
     }
 
     @Test
+    @DisplayName("no rows")
     public void testInputWithNoRowsContainsNoRectangles() {
         String[] inputGrid = new String[]{};
 
@@ -22,6 +24,7 @@ public void testInputWithNoRowsContainsNoRectangles() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("no columns")
     public void testInputWithNoColumnsContainsNoRectangles() {
         String[] inputGrid = new String[]{""};
 
@@ -30,6 +33,7 @@ public void testInputWithNoColumnsContainsNoRectangles() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("no rectangles")
     public void testNonTrivialInputWithNoRectangles() {
         String[] inputGrid = new String[]{" "};
 
@@ -38,6 +42,7 @@ public void testNonTrivialInputWithNoRectangles() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("one rectangle")
     public void testInputWithOneRectangle() {
         String[] inputGrid = new String[]{
             "+-+",
@@ -50,6 +55,7 @@ public void testInputWithOneRectangle() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("two rectangles without shared parts")
     public void testInputWithTwoRectanglesWithoutSharedEdges() {
         String[] inputGrid = new String[]{
             "  +-+",
@@ -64,6 +70,7 @@ public void testInputWithTwoRectanglesWithoutSharedEdges() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("five rectangles with shared parts")
     public void testInputWithFiveRectanglesWithSharedEdges() {
         String[] inputGrid = new String[]{
             "  +-+",
@@ -78,6 +85,7 @@ public void testInputWithFiveRectanglesWithSharedEdges() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("rectangle of height 1 is counted")
     public void testThatRectangleOfHeightOneIsCounted() {
         String[] inputGrid = new String[]{
             "+--+",
@@ -89,6 +97,7 @@ public void testThatRectangleOfHeightOneIsCounted() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("rectangle of width 1 is counted")
     public void testThatRectangleOfWidthOneIsCounted() {
         String[] inputGrid = new String[]{
             "++",
@@ -101,6 +110,7 @@ public void testThatRectangleOfWidthOneIsCounted() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("1x1 square is counted")
     public void testThatOneByOneSquareIsCounted() {
         String[] inputGrid = new String[]{
             "++",
@@ -112,6 +122,7 @@ public void testThatOneByOneSquareIsCounted() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("only complete rectangles are counted")
     public void testThatIncompleteRectanglesAreNotCounted() {
         String[] inputGrid = new String[]{
             "  +-+",
@@ -126,6 +137,7 @@ public void testThatIncompleteRectanglesAreNotCounted() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("rectangles can be of different sizes")
     public void testThatRectanglesOfDifferentSizesAreAllCounted() {
         String[] inputGrid = new String[]{
             "+------+----+",
@@ -140,6 +152,7 @@ public void testThatRectanglesOfDifferentSizesAreAllCounted() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("corner is required for a rectangle to be complete")
     public void testThatIntersectionsWithoutCornerCharacterDoNotCountAsRectangleCorners() {
         String[] inputGrid = new String[]{
             "+------+----+",
@@ -154,6 +167,7 @@ public void testThatIntersectionsWithoutCornerCharacterDoNotCountAsRectangleCorn
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("large input with many rectangles")
     public void testLargeInputWithManyRectangles() {
         String[] inputGrid = new String[]{
             "+---+--+----+",
@@ -171,6 +185,7 @@ public void testLargeInputWithManyRectangles() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("rectangles must have four sides")
     public void testRectanglesMustHaveFourSides() {
         String[] inputGrid = new String[]{
             "+-+ +-+",

exercises/practice/relative-distance/src/test/java/RelativeDistanceTest.java

@@ -1,4 +1,5 @@
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 
@@ -12,6 +13,7 @@
 public class RelativeDistanceTest {
 
     @Test
+    @DisplayName("Direct parent-child relation")
     public void testDirectParentChildRelation() {
         Map<String, List<String>> familyTree = new HashMap<>() {
             {
@@ -26,6 +28,7 @@ public void testDirectParentChildRelation() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("Sibling relationship")
     public void testSiblingRelationship() {
         Map<String, List<String>> familyTree = new HashMap<>() {
             {
@@ -39,6 +42,7 @@ public void testSiblingRelationship() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("Two degrees of separation, grandchild")
     public void testTwoDegreesOfSeparationGrandchild() {
         Map<String, List<String>> familyTree = new HashMap<>() {
             {
@@ -53,6 +57,7 @@ public void testTwoDegreesOfSeparationGrandchild() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("Unrelated individuals")
     public void testUnrelatedIndividuals() {
         Map<String, List<String>> familyTree = new HashMap<>() {
             {
@@ -67,6 +72,7 @@ public void testUnrelatedIndividuals() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("Complex graph, cousins")
     public void testComplexGraphCousins() {
         Map<String, List<String>> familyTree = new HashMap<>() {
             {
@@ -131,6 +137,7 @@ public void testComplexGraphCousins() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("Complex graph, no shortcut, far removed nephew")
     public void testComplexGraphNoShortcutFarRemovedNephew() {
         Map<String, List<String>> familyTree = new HashMap<>() {
             {
@@ -194,6 +201,10 @@ public void testComplexGraphNoShortcutFarRemovedNephew() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName(
+            "Complex graph, some shortcuts, cross-down and cross-up, " +
+                    "cousins several times removed, with unrelated family tree"
+    )
     public void testComplexGraphSomeShortcutsCrossDownAndCrossUpCousinsSeveralTimesRemovedWithUnrelatedFamilyTree() {
         Map<String, List<String>> familyTree = new HashMap<>() {
             {

exercises/practice/resistor-color-duo/src/test/java/ResistorColorDuoTest.java

@@ -1,6 +1,7 @@
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -13,6 +14,7 @@ public void setup() {
     }
 
     @Test
+    @DisplayName("Brown and black")
     public void testBrownAndBlack() {
         assertThat(
                 resistorColorDuo.value(new String[]{"brown", "black"})
@@ -21,6 +23,7 @@ public void testBrownAndBlack() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("Blue and grey")
     public void testBlueAndGrey() {
         assertThat(
                 resistorColorDuo.value(new String[]{ "blue", "grey" })
@@ -29,6 +32,7 @@ public void testBlueAndGrey() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("Yellow and violet")
     public void testYellowAndViolet() {
         assertThat(
                 resistorColorDuo.value(new String[]{ "yellow", "violet" })
@@ -37,6 +41,7 @@ public void testYellowAndViolet() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("Orange and orange")
     public void testOrangeAndOrange() {
         assertThat(
                 resistorColorDuo.value(new String[]{ "orange", "orange" })
@@ -45,6 +50,7 @@ public void testOrangeAndOrange() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("White and red")
     public void testWhiteAndRed() {
         assertThat(
                 resistorColorDuo.value(new String[]{ "white", "red" })
@@ -53,6 +59,7 @@ public void testWhiteAndRed() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("Black and brown, one-digit")
     public void testBlackAndBrownOneDigit() {
         assertThat(
                 resistorColorDuo.value(new String[]{ "black", "brown" })
@@ -61,6 +68,7 @@ public void testBlackAndBrownOneDigit() {
 
     @Disabled("Remove to run test")
     @Test
+    @DisplayName("Ignore additional colors")
     public void testIgnoreAdditionalColors() {
         assertThat(
                 resistorColorDuo.value(new String[]{ "green", "brown", "orange" })