Fix say exercise (exercism#2006)

mirkoperillo · web-flow · commit 0ffaadc9c509 · 2021-09-07T13:18:30.000+02:00
* Upgrade junit version

* Move assertions to assertj
diff --git a/exercises/practice/say/build.gradle b/exercises/practice/say/build.gradle
@@ -2,17 +2,23 @@ apply plugin: "java"
 apply plugin: "eclipse"
 apply plugin: "idea"
 
+// set default encoding to UTF-8
+compileJava.options.encoding = "UTF-8"
+compileTestJava.options.encoding = "UTF-8"
+
 repositories {
   mavenCentral()
 }
 
 dependencies {
-  testImplementation "junit:junit:4.12"
+  testImplementation "junit:junit:4.13"
+  testImplementation "org.assertj:assertj-core:3.15.0"
 }
 
 test {
   testLogging {
-    exceptionFormat = 'full'
+    exceptionFormat = 'short'
+    showStandardStreams = true
     events = ["passed", "failed", "skipped"]
   }
 }
diff --git a/exercises/practice/say/src/test/java/SayTest.java b/exercises/practice/say/src/test/java/SayTest.java
@@ -1,88 +1,89 @@
 import org.junit.Test;
 import org.junit.Ignore;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.*;
 
 public class SayTest {
 
     private Say say = new Say();
     
     @Test
     public void zero() {
-        assertEquals("zero", say.say(0));
+        assertThat(say.say(0)).isEqualTo("zero");
     }
     
     @Ignore("Remove to run test")
     @Test
     public void one() {
-        assertEquals("one", say.say(1));
+        assertThat(say.say(1)).isEqualTo("one");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void fourteen() {
-        assertEquals("fourteen", say.say(14));
+        assertThat(say.say(14)).isEqualTo("fourteen");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void twenty() {
-        assertEquals("twenty", say.say(20));
+        assertThat(say.say(20)).isEqualTo("twenty");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void twentyTwo() {
-        assertEquals("twenty-two", say.say(22));
+        assertThat(say.say(22)).isEqualTo("twenty-two");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void oneHundred() {
-        assertEquals("one hundred", say.say(100));
+        assertThat(say.say(100)).isEqualTo("one hundred");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void oneHundredTwentyThree() {
-        assertEquals("one hundred twenty-three", say.say(123));
+        assertThat(say.say(123)).isEqualTo("one hundred twenty-three");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void oneThousand() {
-        assertEquals("one thousand", say.say(1_000));
+        assertThat(say.say(1_000)).isEqualTo("one thousand");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void oneThousandTwoHundredThirtyFour() {
-        assertEquals("one thousand two hundred thirty-four", say.say(1_234));
+        assertThat(say.say(1_234)).isEqualTo("one thousand two hundred thirty-four");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void oneMillion() {
-        assertEquals("one million", say.say(1_000_000));
+        assertThat(say.say(1_000_000)).isEqualTo("one million");
     }
     
     @Ignore("Remove to run test")
     @Test
     public void oneMillionTwoThousandThreeHundredFortyFive() {
-        assertEquals("one million two thousand three hundred forty-five", say.say(1_002_345));
+        assertThat(say.say(1_002_345)).isEqualTo("one million two thousand three hundred forty-five");
     }
     
     @Ignore("Remove to run test")
     @Test
     public void oneBillion() {
-        assertEquals("one billion", say.say(1_000_000_000));
+        assertThat(say.say(1_000_000_000)).isEqualTo("one billion");
     }
     
     @Ignore("Remove to run test")
     @Test
     public void nineHundredEightySevenBillionSixHundredFiftyFourThreeHundredTwentyOneThousandOneHundredTwentyThree() {
-        assertEquals("nine hundred eighty-seven billion six hundred fifty-four million" +
-                     " three hundred twenty-one thousand one hundred twenty-three", say.say(987_654_321_123L));
+        assertThat(say.say(987_654_321_123L))
+            .isEqualTo("nine hundred eighty-seven billion six hundred fifty-four million" + 
+                       " three hundred twenty-one thousand one hundred twenty-three");
     }
     
     @Ignore("Remove to run test")

Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,23 @@ apply plugin: "java"`
`2`	`2`	`apply plugin: "eclipse"`
`3`	`3`	`apply plugin: "idea"`
`4`	`4`
	`5`	`+// set default encoding to UTF-8`
	`6`	`+compileJava.options.encoding = "UTF-8"`
	`7`	`+compileTestJava.options.encoding = "UTF-8"`
	`8`	`+`
`5`	`9`	`repositories {`
`6`	`10`	`mavenCentral()`
`7`	`11`	`}`
`8`	`12`
`9`	`13`	`dependencies {`
`10`		`- testImplementation "junit:junit:4.12"`
	`14`	`+ testImplementation "junit:junit:4.13"`
	`15`	`+ testImplementation "org.assertj:assertj-core:3.15.0"`
`11`	`16`	`}`
`12`	`17`
`13`	`18`	`test {`
`14`	`19`	`testLogging {`
`15`		`- exceptionFormat = 'full'`
	`20`	`+ exceptionFormat = 'short'`
	`21`	`+ showStandardStreams = true`
`16`	`22`	`events = ["passed", "failed", "skipped"]`
`17`	`23`	`}`
`18`	`24`	`}`