From 47c49f2031fa328d015502f8d1e8b30d8c5edd5d Mon Sep 17 00:00:00 2001 From: ArshArora Date: Mon, 25 Aug 2025 23:40:08 -0600 Subject: [PATCH] finished with adding @DisplayName to yacht , zebraPuzzle and Zipper --- .../yacht/src/test/java/YachtTest.java | 34 ++++++- .../src/test/java/ZebraPuzzleTest.java | 3 + .../zipper/src/test/java/ZipperTest.java | 99 +++++++++++-------- 3 files changed, 92 insertions(+), 44 deletions(-) diff --git a/exercises/practice/yacht/src/test/java/YachtTest.java b/exercises/practice/yacht/src/test/java/YachtTest.java index b2792817b..c6963baf9 100644 --- a/exercises/practice/yacht/src/test/java/YachtTest.java +++ b/exercises/practice/yacht/src/test/java/YachtTest.java @@ -1,11 +1,13 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.DisplayName; import static org.assertj.core.api.Assertions.assertThat; public class YachtTest { @Test + @DisplayName("Yacht") public void yacht() { Yacht yacht = new Yacht(new int[]{ 5, 5, 5, 5, 5 }, YachtCategory.YACHT); assertThat(yacht.score()).isEqualTo(50); @@ -13,6 +15,7 @@ public void yacht() { @Disabled("Remove to run test") @Test + @DisplayName("Not Yacht") public void notYacht() { Yacht yacht = new Yacht(new int[]{ 1, 3, 3, 2, 5 }, YachtCategory.YACHT); assertThat(yacht.score()).isEqualTo(0); @@ -20,6 +23,7 @@ public void notYacht() { @Disabled("Remove to run test") @Test + @DisplayName("Ones") public void ones() { Yacht yacht = new Yacht(new int[]{ 1, 1, 1, 3, 5 }, YachtCategory.ONES); assertThat(yacht.score()).isEqualTo(3); @@ -27,6 +31,7 @@ public void ones() { @Disabled("Remove to run test") @Test + @DisplayName("Ones, out of order") public void onesOutOfOrder() { Yacht yacht = new Yacht(new int[]{ 3, 1, 1, 5, 1 }, YachtCategory.ONES); assertThat(yacht.score()).isEqualTo(3); @@ -34,6 +39,7 @@ public void onesOutOfOrder() { @Disabled("Remove to run test") @Test + @DisplayName("No ones") public void noOnes() { Yacht yacht = new Yacht(new int[]{ 4, 3, 6, 5, 5 }, YachtCategory.ONES); assertThat(yacht.score()).isEqualTo(0); @@ -41,6 +47,7 @@ public void noOnes() { @Disabled("Remove to run test") @Test + @DisplayName("Twos") public void twos() { Yacht yacht = new Yacht(new int[]{ 2, 3, 4, 5, 6 }, YachtCategory.TWOS); assertThat(yacht.score()).isEqualTo(2); @@ -48,6 +55,7 @@ public void twos() { @Disabled("Remove to run test") @Test + @DisplayName("Fours") public void fours() { Yacht yacht = new Yacht(new int[]{ 1, 4, 1, 4, 1 }, YachtCategory.FOURS); assertThat(yacht.score()).isEqualTo(8); @@ -55,6 +63,7 @@ public void fours() { @Disabled("Remove to run test") @Test + @DisplayName("Yacht of 3s counted as fives") public void yachtCountedAsThrees() { Yacht yacht = new Yacht(new int[]{ 3, 3, 3, 3, 3 }, YachtCategory.THREES); assertThat(yacht.score()).isEqualTo(15); @@ -62,13 +71,15 @@ public void yachtCountedAsThrees() { @Disabled("Remove to run test") @Test + @DisplayName("Yacht of 3s counted as fives") public void yachtOfThreesCountedAsFives() { Yacht yacht = new Yacht(new int[]{ 3, 3, 3, 3, 3 }, YachtCategory.FIVES); assertThat(yacht.score()).isEqualTo(0); } - + @Disabled("Remove to run test") @Test + @DisplayName("Fives") public void fives() { Yacht yacht = new Yacht(new int[]{ 1, 5, 3, 5, 3 }, YachtCategory.FIVES); assertThat(yacht.score()).isEqualTo(10); @@ -76,6 +87,7 @@ public void fives() { @Disabled("Remove to run test") @Test + @DisplayName("Sixes") public void sixes() { Yacht yacht = new Yacht(new int[]{ 2, 3, 4, 5, 6 }, YachtCategory.SIXES); assertThat(yacht.score()).isEqualTo(6); @@ -83,6 +95,7 @@ public void sixes() { @Disabled("Remove to run test") @Test + @DisplayName("Full house two small, three big") public void fullHouseTwoSmallThreeBig() { Yacht yacht = new Yacht(new int[]{ 2, 2, 4, 4, 4 }, YachtCategory.FULL_HOUSE); assertThat(yacht.score()).isEqualTo(16); @@ -90,6 +103,7 @@ public void fullHouseTwoSmallThreeBig() { @Disabled("Remove to run test") @Test + @DisplayName("Full house three small, two big") public void fullHouseThreeSmallTwoBig() { Yacht yacht = new Yacht(new int[]{ 5, 3, 3, 5, 3 }, YachtCategory.FULL_HOUSE); assertThat(yacht.score()).isEqualTo(19); @@ -97,6 +111,7 @@ public void fullHouseThreeSmallTwoBig() { @Disabled("Remove to run test") @Test + @DisplayName("Two pair is not a full house") public void twoPairIsNotAFullHouse() { Yacht yacht = new Yacht(new int[]{ 2, 2, 4, 4, 5 }, YachtCategory.FULL_HOUSE); assertThat(yacht.score()).isEqualTo(0); @@ -104,6 +119,7 @@ public void twoPairIsNotAFullHouse() { @Disabled("Remove to run test") @Test + @DisplayName("Four of a kind is not a full house") public void fourOfAKindIsNotAFullHouse() { Yacht yacht = new Yacht(new int[]{ 1, 4, 4, 4, 4 }, YachtCategory.FULL_HOUSE); assertThat(yacht.score()).isEqualTo(0); @@ -111,6 +127,7 @@ public void fourOfAKindIsNotAFullHouse() { @Disabled("Remove to run test") @Test + @DisplayName("Yacht is not a full house") public void yachtIsNotAFullHouse() { Yacht yacht = new Yacht(new int[]{ 2, 2, 2, 2, 2 }, YachtCategory.FULL_HOUSE); assertThat(yacht.score()).isEqualTo(0); @@ -118,6 +135,7 @@ public void yachtIsNotAFullHouse() { @Disabled("Remove to run test") @Test + @DisplayName("Four of a Kind") public void fourOfAKind() { Yacht yacht = new Yacht(new int[]{ 6, 6, 4, 6, 6 }, YachtCategory.FOUR_OF_A_KIND); assertThat(yacht.score()).isEqualTo(24); @@ -125,6 +143,7 @@ public void fourOfAKind() { @Disabled("Remove to run test") @Test + @DisplayName("Yacht can be scored as Four of a Kind") public void yachtCanBeScoredAsFourOfAKind() { Yacht yacht = new Yacht(new int[]{ 3, 3, 3, 3, 3 }, YachtCategory.FOUR_OF_A_KIND); assertThat(yacht.score()).isEqualTo(12); @@ -132,6 +151,7 @@ public void yachtCanBeScoredAsFourOfAKind() { @Disabled("Remove to run test") @Test + @DisplayName("Full house is not Four of a Kind") public void fullHouseIsNotFourOfAKind() { Yacht yacht = new Yacht(new int[]{ 3, 3, 3, 5, 5 }, YachtCategory.FOUR_OF_A_KIND); assertThat(yacht.score()).isEqualTo(0); @@ -139,6 +159,7 @@ public void fullHouseIsNotFourOfAKind() { @Disabled("Remove to run test") @Test + @DisplayName("Little Straight") public void littleStraight() { Yacht yacht = new Yacht(new int[]{ 3, 5, 4, 1, 2 }, YachtCategory.LITTLE_STRAIGHT); assertThat(yacht.score()).isEqualTo(30); @@ -146,6 +167,7 @@ public void littleStraight() { @Disabled("Remove to run test") @Test + @DisplayName("Little Straight as Big Straight") public void littleStraightAsBigStraight() { Yacht yacht = new Yacht(new int[]{ 1, 2, 3, 4, 5 }, YachtCategory.BIG_STRAIGHT); assertThat(yacht.score()).isEqualTo(0); @@ -153,6 +175,7 @@ public void littleStraightAsBigStraight() { @Disabled("Remove to run test") @Test + @DisplayName("Four in order but not a little straight") public void fourInOrderButNotALittleStraight() { Yacht yacht = new Yacht(new int[]{ 1, 1, 2, 3, 4 }, YachtCategory.LITTLE_STRAIGHT); assertThat(yacht.score()).isEqualTo(0); @@ -160,6 +183,7 @@ public void fourInOrderButNotALittleStraight() { @Disabled("Remove to run test") @Test + @DisplayName("No pairs but not a little straight") public void noPairsButNotALittleStraight() { Yacht yacht = new Yacht(new int[]{ 1, 2, 3, 4, 6 }, YachtCategory.LITTLE_STRAIGHT); assertThat(yacht.score()).isEqualTo(0); @@ -167,6 +191,7 @@ public void noPairsButNotALittleStraight() { @Disabled("Remove to run test") @Test + @DisplayName("Minimum is 1, maximum is 5, but not a little straight") public void minimumIs1MaximumIs5ButNotALittleStraight() { Yacht yacht = new Yacht(new int[]{ 1, 1, 3, 4, 5 }, YachtCategory.LITTLE_STRAIGHT); assertThat(yacht.score()).isEqualTo(0); @@ -174,6 +199,7 @@ public void minimumIs1MaximumIs5ButNotALittleStraight() { @Disabled("Remove to run test") @Test + @DisplayName("Big Straight") public void bigStraight() { Yacht yacht = new Yacht(new int[]{ 4, 6, 2, 5, 3 }, YachtCategory.BIG_STRAIGHT); assertThat(yacht.score()).isEqualTo(30); @@ -181,13 +207,15 @@ public void bigStraight() { @Disabled("Remove to run test") @Test + @DisplayName("Big Straight as little straight") public void bigStraightAsLittleStraight() { Yacht yacht = new Yacht(new int[]{ 6, 5, 4, 3, 2 }, YachtCategory.LITTLE_STRAIGHT); assertThat(yacht.score()).isEqualTo(0); } - + @Disabled("Remove to run test") @Test + @DisplayName("No pairs but not a big straight") public void noPairsButNotABigStraight() { Yacht yacht = new Yacht(new int[]{ 6, 5, 4, 3, 1 }, YachtCategory.BIG_STRAIGHT); assertThat(yacht.score()).isEqualTo(0); @@ -195,6 +223,7 @@ public void noPairsButNotABigStraight() { @Disabled("Remove to run test") @Test + @DisplayName("Choice") public void choice() { Yacht yacht = new Yacht(new int[]{ 3, 3, 5, 6, 6 }, YachtCategory.CHOICE); assertThat(yacht.score()).isEqualTo(23); @@ -202,6 +231,7 @@ public void choice() { @Disabled("Remove to run test") @Test + @DisplayName("Yacht as choice") public void yachtAsChoice() { Yacht yacht = new Yacht(new int[]{ 2, 2, 2, 2, 2 }, YachtCategory.CHOICE); assertThat(yacht.score()).isEqualTo(10); diff --git a/exercises/practice/zebra-puzzle/src/test/java/ZebraPuzzleTest.java b/exercises/practice/zebra-puzzle/src/test/java/ZebraPuzzleTest.java index 911ebae5c..706488dbf 100644 --- a/exercises/practice/zebra-puzzle/src/test/java/ZebraPuzzleTest.java +++ b/exercises/practice/zebra-puzzle/src/test/java/ZebraPuzzleTest.java @@ -2,10 +2,12 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.DisplayName; public class ZebraPuzzleTest { @Test + @DisplayName("resident who drinks water") public void residentWhoDrinksWater() { ZebraPuzzle zebraPuzzle = new ZebraPuzzle(); assertThat(zebraPuzzle.getWaterDrinker()).isEqualTo("Norwegian"); @@ -13,6 +15,7 @@ public void residentWhoDrinksWater() { @Disabled("Remove to run test") @Test + @DisplayName("resident who owns zebra") public void residentWhoOwnsZebra() { ZebraPuzzle zebraPuzzle = new ZebraPuzzle(); assertThat(zebraPuzzle.getZebraOwner()).isEqualTo("Japanese"); diff --git a/exercises/practice/zipper/src/test/java/ZipperTest.java b/exercises/practice/zipper/src/test/java/ZipperTest.java index 842ca8be2..2912e7141 100644 --- a/exercises/practice/zipper/src/test/java/ZipperTest.java +++ b/exercises/practice/zipper/src/test/java/ZipperTest.java @@ -3,6 +3,7 @@ import org.junit.jupiter.api.BeforeEach; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.DisplayName; public class ZipperTest { @@ -21,12 +22,14 @@ public void setup() { } @Test + @DisplayName("data is retained") public void testToTree() { assertThat(zipper.toTree()).isEqualTo(binaryTree); } @Disabled("Remove to run test") @Test + @DisplayName("left, right and value") public void testLeftRightAndValue() { zipper = binaryTree.getRoot(); assertThat(zipper.left.right.getValue()).isEqualTo(3); @@ -34,6 +37,7 @@ public void testLeftRightAndValue() { @Disabled("Remove to run test") @Test + @DisplayName("dead end") public void testDeadEnd() { zipper = binaryTree.getRoot(); assertThat(zipper.left.left).isNull(); @@ -41,6 +45,7 @@ public void testDeadEnd() { @Disabled("Remove to run test") @Test + @DisplayName("tree from deep focus") public void testToTreeFromDeepFocus() { zipper = binaryTree.getRoot(); assertThat(zipper.left.right.toTree()).isEqualTo(binaryTree); @@ -48,6 +53,7 @@ public void testToTreeFromDeepFocus() { @Disabled("Remove to run test") @Test + @DisplayName("traversing up from top") public void testTraversingUpFromTop() { zipper = binaryTree.getRoot(); assertThat(zipper.up).isNull(); @@ -55,6 +61,7 @@ public void testTraversingUpFromTop() { @Disabled("Remove to run test") @Test + @DisplayName("left, right, and up") public void testLeftRightAndUp() { zipper = binaryTree.getRoot(); assertThat(zipper.left.up.right.up.left.right.getValue()).isEqualTo(3); @@ -62,6 +69,7 @@ public void testLeftRightAndUp() { @Disabled("Remove to run test") @Test + @DisplayName("test ability to descend multiple levels and return") public void testAbilityToReturnAfterMultipleLevelDescend() { zipper = binaryTree.getRoot(); assertThat(zipper.left.right.up.up.getValue()).isEqualTo(1); @@ -69,88 +77,93 @@ public void testAbilityToReturnAfterMultipleLevelDescend() { @Disabled("Remove to run test") @Test + @DisplayName("set_value") public void testSetValue() { zipper = binaryTree.getRoot(); zipper = zipper.left; zipper.setValue(5); String expected = "value: 1, " + - "left: { " + - "value: 5, " + - "left: null, " + - "right: { " + + "left: { " + + "value: 5, " + + "left: null, " + + "right: { " + "value: 3, " + "left: null, " + "right: null } }, " + - "right: { " + - "value: 4, " + - "left: null, " + - "right: null }"; + "right: { " + + "value: 4, " + + "left: null, " + + "right: null }"; assertThat(zipper.toTree().printTree()).isEqualTo(expected); } @Disabled("Remove to run test") @Test + @DisplayName("set_value after traversing up") public void testSetValueAfterTraversingUp() { zipper = binaryTree.getRoot(); zipper = zipper.left.right.up; zipper.setValue(5); String expected = "value: 1, " + - "left: { " + - "value: 5, " + - "left: null, " + - "right: { " + + "left: { " + + "value: 5, " + + "left: null, " + + "right: { " + "value: 3, " + "left: null, " + "right: null } }, " + - "right: { " + - "value: 4, " + - "left: null, " + - "right: null }"; + "right: { " + + "value: 4, " + + "left: null, " + + "right: null }"; assertThat(zipper.toTree().printTree()).isEqualTo(expected); } @Disabled("Remove to run test") @Test + @DisplayName("set_left with leaf") public void testSetLeftWithLeaf() { zipper = binaryTree.getRoot(); zipper = zipper.left; zipper.setLeft(new Zipper(5)); String expected = "value: 1, " + - "left: { " + - "value: 2, " + - "left: { " + + "left: { " + + "value: 2, " + + "left: { " + "value: 5, " + "left: null, " + "right: null }, " + - "right: { " + + "right: { " + "value: 3, " + "left: null, " + "right: null } }, " + - "right: { " + - "value: 4, " + - "left: null, " + - "right: null }"; + "right: { " + + "value: 4, " + + "left: null, " + + "right: null }"; assertThat(zipper.toTree().printTree()).isEqualTo(expected); } @Disabled("Remove to run test") @Test + @DisplayName("set_right with null") public void testSetRightWithNull() { zipper = binaryTree.getRoot(); zipper = zipper.left; zipper.setRight(null); String expected = "value: 1, " + - "left: { value: 2, left: null, right: null }, " + - "right: { value: 4, left: null, right: null }"; + "left: { value: 2, left: null, right: null }, " + + "right: { value: 4, left: null, right: null }"; assertThat(zipper.toTree().printTree()).isEqualTo(expected); } @Disabled("Remove to run test") @Test + @DisplayName("set_right with subtree") public void testSetRightWithSubtree() { BinaryTree subtree = new BinaryTree(6); subtree.getRoot().setLeft(new Zipper(7)); @@ -159,20 +172,20 @@ public void testSetRightWithSubtree() { zipper.setRight(subtree.getRoot()); String expected = "value: 1, " + - "left: { " + - "value: 2, " + - "left: null, " + - "right: { " + + "left: { " + + "value: 2, " + + "left: null, " + + "right: { " + "value: 3, " + "left: null, " + "right: null } }, " + - "right: { " + - "value: 6, " + - "left: { " + + "right: { " + + "value: 6, " + + "left: { " + "value: 7, " + "left: null, " + "right: null }, " + - "right: { " + + "right: { " + "value: 8, " + "left: null, " + "right: null } }"; @@ -181,28 +194,30 @@ public void testSetRightWithSubtree() { @Disabled("Remove to run test") @Test + @DisplayName("set_value on deep focus") public void testSetValueOnDeepFocus() { zipper = binaryTree.getRoot(); zipper = zipper.left.right; zipper.setValue(5); String expected = "value: 1, " + - "left: { " + - "value: 2, " + - "left: null, " + - "right: { " + + "left: { " + + "value: 2, " + + "left: null, " + + "right: { " + "value: 5, " + "left: null, " + "right: null } }, " + - "right: { " + - "value: 4, " + - "left: null, " + - "right: null }"; + "right: { " + + "value: 4, " + + "left: null, " + + "right: null }"; assertThat(zipper.toTree().printTree()).isEqualTo(expected); } @Disabled("Remove to run test") @Test + @DisplayName("different paths to same zipper") public void differentPathToSameZipper() { Zipper zipper1 = binaryTree.getRoot().left.up.right; Zipper zipper2 = binaryTree.getRoot().right;