Skip to content

finished with adding @DisplayName to yacht , zebraPuzzle and Zipper #2988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

finished with adding @DisplayName to yacht , zebraPuzzle and Zipper #2988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions exercises/practice/yacht/src/test/java/YachtTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,207 +1,237 @@
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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
}

@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);
Expand Down
3 changes: 3 additions & 0 deletions exercises/practice/zebra-puzzle/src/test/java/ZebraPuzzleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,20 @@
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.DisplayName;
Comment on lines 2 to +5
Copy link
Member

@jagdish-15 jagdish-15 Aug 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;


public class ZebraPuzzleTest {

@Test
@DisplayName("resident who drinks water")
public void residentWhoDrinksWater() {
ZebraPuzzle zebraPuzzle = new ZebraPuzzle();
assertThat(zebraPuzzle.getWaterDrinker()).isEqualTo("Norwegian");
}

@Disabled("Remove to run test")
@Test
@DisplayName("resident who owns zebra")
public void residentWhoOwnsZebra() {
ZebraPuzzle zebraPuzzle = new ZebraPuzzle();
assertThat(zebraPuzzle.getZebraOwner()).isEqualTo("Japanese");
Expand Down
Loading