From 3cb865c59fb215a8ddcb6ebd8a494585cc57a185 Mon Sep 17 00:00:00 2001
From: Thomas Fabre <tfabre@takima.fr>
Date: Fri, 23 Jun 2023 12:23:44 +0200
Subject: [PATCH] Change junit version
---
pom.xml | 7 +++--
src/test/java/io/takima/YatzyTest.java | 38 ++++++++++++++------------
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9e22fa6..042619a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,13 +12,14 @@
<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <junit-jupiter.version>5.9.2</junit-jupiter.version>
</properties>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/java/io/takima/YatzyTest.java b/src/test/java/io/takima/YatzyTest.java
index 4c4ab77..113cdfc 100644
--- a/src/test/java/io/takima/YatzyTest.java
+++ b/src/test/java/io/takima/YatzyTest.java
@@ -1,19 +1,21 @@
package io.takima;
-import org.junit.*;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
-public class YatzyTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class YatzyTest {
@Test
- public void chance_scores_sum_of_all_dice() {
+ void chance_scores_sum_of_all_dice() {
int expected = 15;
int actual = Yatzy.chance(2,3,4,5,1);
assertEquals(expected, actual);
assertEquals(16, Yatzy.chance(3,3,4,5,1));
}
- @Test public void yatzy_scores_50() {
+ @Test void yatzy_scores_50() {
int expected = 50;
int actual = Yatzy.yatzy(4,4,4,4,4);
assertEquals(expected, actual);
@@ -21,7 +23,7 @@ public class YatzyTest {
assertEquals(0, Yatzy.yatzy(6,6,6,6,3));
}
- @Test public void test_1s() {
+ @Test void test_1s() {
assertTrue(Yatzy.ones(1,2,3,4,5) == 1);
assertEquals(2, Yatzy.ones(1,2,1,4,5));
assertEquals(0, Yatzy.ones(6,2,2,4,5));
@@ -29,19 +31,19 @@ public class YatzyTest {
}
@Test
- public void test_2s() {
+ void test_2s() {
assertEquals(4, Yatzy.twos(1,2,3,2,6));
assertEquals(10, Yatzy.twos(2,2,2,2,2));
}
@Test
- public void test_threes() {
+ void test_threes() {
assertEquals(6, Yatzy.threes(1,2,3,2,3));
assertEquals(12, Yatzy.threes(2,3,3,3,3));
}
@Test
- public void fours_test()
+ void fours_test()
{
assertEquals(12, new Yatzy(4,4,4,5,5).fours());
assertEquals(8, new Yatzy(4,4,5,5,5).fours());
@@ -49,34 +51,34 @@ public class YatzyTest {
}
@Test
- public void fives() {
+ void fives() {
assertEquals(10, new Yatzy(4,4,4,5,5).fives());
assertEquals(15, new Yatzy(4,4,5,5,5).fives());
assertEquals(20, new Yatzy(4,5,5,5,5).fives());
}
@Test
- public void sixes_test() {
+ void sixes_test() {
assertEquals(0, new Yatzy(4,4,4,5,5).sixes());
assertEquals(6, new Yatzy(4,4,6,5,5).sixes());
assertEquals(18, new Yatzy(6,5,6,6,5).sixes());
}
@Test
- public void one_pair() {
+ void one_pair() {
assertEquals(6, Yatzy.score_pair(3,4,3,5,6));
assertEquals(10, Yatzy.score_pair(5,3,3,3,5));
assertEquals(12, Yatzy.score_pair(5,3,6,6,5));
}
@Test
- public void two_Pair() {
+ void two_Pair() {
assertEquals(16, Yatzy.two_pair(3,3,5,4,5));
assertEquals(16, Yatzy.two_pair(3,3,5,5,5));
}
@Test
- public void three_of_a_kind()
+ void three_of_a_kind()
{
assertEquals(9, Yatzy.three_of_a_kind(3,3,3,4,5));
assertEquals(15, Yatzy.three_of_a_kind(5,3,5,4,5));
@@ -84,28 +86,28 @@ public class YatzyTest {
}
@Test
- public void four_of_a_knd() {
+ void four_of_a_knd() {
assertEquals(12, Yatzy.four_of_a_kind(3,3,3,3,5));
assertEquals(20, Yatzy.four_of_a_kind(5,5,5,4,5));
assertEquals(9, Yatzy.three_of_a_kind(3,3,3,3,3));
}
@Test
- public void smallStraight() {
+ void smallStraight() {
assertEquals(15, Yatzy.smallStraight(1,2,3,4,5));
assertEquals(15, Yatzy.smallStraight(2,3,4,5,1));
assertEquals(0, Yatzy.smallStraight(1,2,2,4,5));
}
@Test
- public void largeStraight() {
+ void largeStraight() {
assertEquals(20, Yatzy.largeStraight(6,2,3,4,5));
assertEquals(20, Yatzy.largeStraight(2,3,4,5,6));
assertEquals(0, Yatzy.largeStraight(1,2,2,4,5));
}
@Test
- public void fullHouse() {
+ void fullHouse() {
assertEquals(18, Yatzy.fullHouse(6,2,2,2,6));
assertEquals(0, Yatzy.fullHouse(2,3,4,5,6));
}
--
GitLab