From 3086cc00d5b1d366ff74eb385dd28c0d242c4cc9 Mon Sep 17 00:00:00 2001
From: Thomas Fabre <tfabre@takima.fr>
Date: Fri, 23 Jun 2023 14:29:51 +0200
Subject: [PATCH] Refactor largeStraight with Roll
---
src/main/java/io/takima/Yatzy.java | 17 ++++-------------
src/test/java/io/takima/YatzyTest.java | 8 ++++----
2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/main/java/io/takima/Yatzy.java b/src/main/java/io/takima/Yatzy.java
index c75cead..6150c2f 100644
--- a/src/main/java/io/takima/Yatzy.java
+++ b/src/main/java/io/takima/Yatzy.java
@@ -6,6 +6,7 @@ import java.util.stream.IntStream;
public final class Yatzy {
private static final List<Integer> SMALL_STRAIGHT = IntStream.range(1, 6).boxed().toList();
+ private static final List<Integer> LARGE_STRAIGHT = IntStream.range(2, 7).boxed().toList();
private Yatzy() {
// This his a utility class which only implements static methods
@@ -94,19 +95,9 @@ public final class Yatzy {
return 0;
}
- public static int largeStraight(int d1, int d2, int d3, int d4, int d5) {
- int[] counts;
- counts = new int[6];
- counts[d1 - 1] += 1;
- counts[d2 - 1] += 1;
- counts[d3 - 1] += 1;
- counts[d4 - 1] += 1;
- counts[d5 - 1] += 1;
- if (counts[1] == 1 &&
- counts[2] == 1 &&
- counts[3] == 1 &&
- counts[4] == 1
- && counts[5] == 1) {
+ public static int largeStraight(Roll roll) {
+ List<Integer> sortedRoll = roll.toStream().sorted().boxed().toList();
+ if (sortedRoll.equals(LARGE_STRAIGHT)) {
return 20;
}
return 0;
diff --git a/src/test/java/io/takima/YatzyTest.java b/src/test/java/io/takima/YatzyTest.java
index 2a741e1..45b0ff7 100644
--- a/src/test/java/io/takima/YatzyTest.java
+++ b/src/test/java/io/takima/YatzyTest.java
@@ -151,16 +151,16 @@ class YatzyTest {
@Test
void largeStraightShouldReturnTwentyIfDicesAreFromTwoToSix() {
assertAll(
- () -> assertEquals(20, Yatzy.largeStraight(6, 2, 3, 4, 5)),
- () -> assertEquals(20, Yatzy.largeStraight(2, 3, 4, 5, 6))
+ () -> assertEquals(20, Yatzy.largeStraight(roll(6, 2, 3, 4, 5))),
+ () -> assertEquals(20, Yatzy.largeStraight(roll(2, 3, 4, 5, 6)))
);
}
@Test
void largeStraightShouldReturnZeroIfDicesAreNotFromTwoToSix() {
assertAll(
- () -> assertEquals(0, Yatzy.largeStraight(1, 2, 2, 4, 5)),
- () -> assertEquals(0, Yatzy.largeStraight(2, 4, 6, 5, 1))
+ () -> assertEquals(0, Yatzy.largeStraight(roll(1, 2, 2, 4, 5))),
+ () -> assertEquals(0, Yatzy.largeStraight(roll(2, 4, 6, 5, 1)))
);
}
--
GitLab