From 66528a3e0b045dd1b97896256407e000ef870669 Mon Sep 17 00:00:00 2001
From: Thomas Fabre <tfabre@takima.fr>
Date: Fri, 23 Jun 2023 13:26:47 +0200
Subject: [PATCH] Refactor twos with Roll
---
src/main/java/io/takima/Yatzy.java | 20 ++------------------
src/test/java/io/takima/YatzyTest.java | 4 ++--
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/src/main/java/io/takima/Yatzy.java b/src/main/java/io/takima/Yatzy.java
index 14fd3a4..b5daead 100644
--- a/src/main/java/io/takima/Yatzy.java
+++ b/src/main/java/io/takima/Yatzy.java
@@ -23,24 +23,8 @@ public final class Yatzy {
return roll.toStream().filter(i -> i == 1).sum();
}
- public static int twos(int d1, int d2, int d3, int d4, int d5) {
- int sum = 0;
- if (d1 == 2) {
- sum += 2;
- }
- if (d2 == 2) {
- sum += 2;
- }
- if (d3 == 2) {
- sum += 2;
- }
- if (d4 == 2) {
- sum += 2;
- }
- if (d5 == 2) {
- sum += 2;
- }
- return sum;
+ public static int twos(Roll roll) {
+ return roll.toStream().filter(i -> i == 2).sum();
}
public static int threes(int d1, int d2, int d3, int d4, int d5) {
diff --git a/src/test/java/io/takima/YatzyTest.java b/src/test/java/io/takima/YatzyTest.java
index 7f68795..8084ca9 100644
--- a/src/test/java/io/takima/YatzyTest.java
+++ b/src/test/java/io/takima/YatzyTest.java
@@ -41,8 +41,8 @@ class YatzyTest {
@Test
void twosShouldSumAllTwoDices() {
assertAll(
- () -> assertEquals(4, Yatzy.twos(1, 2, 3, 2, 6)),
- () -> assertEquals(10, Yatzy.twos(2, 2, 2, 2, 2))
+ () -> assertEquals(4, Yatzy.twos(roll(1, 2, 3, 2, 6))),
+ () -> assertEquals(10, Yatzy.twos(roll(2, 2, 2, 2, 2)))
);
}
--
GitLab