Merge pull request iluwatar#1529 from mookkiah/issue_1500

iluwatar · web-flow · commit f0067828058d · 2020-10-17T18:02:56.000+03:00
issue 1500 - using JUnit 5 and resolved a build issue
diff --git a/trampoline/pom.xml b/trampoline/pom.xml
@@ -35,11 +35,6 @@
     </parent>
     <artifactId>trampoline</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/trampoline/src/main/java/com/iluwatar/trampoline/Trampoline.java b/trampoline/src/main/java/com/iluwatar/trampoline/Trampoline.java
@@ -98,12 +98,12 @@ public T get() {
         return trampoline(this);
       }
 
-      T trampoline(final Trampoline<T> trampoline) {
+      private T trampoline(final Trampoline<T> trampoline) {
         return Stream.iterate(trampoline, Trampoline::jump)
             .filter(Trampoline::complete)
             .findFirst()
             .map(Trampoline::result)
-            .orElseThrow();
+            .get();
       }
     };
   }
diff --git a/trampoline/src/test/java/com/iluwatar/trampoline/TrampolineAppTest.java b/trampoline/src/test/java/com/iluwatar/trampoline/TrampolineAppTest.java
@@ -23,10 +23,9 @@
 
 package com.iluwatar.trampoline;
 
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for trampoline pattern.
@@ -37,7 +36,7 @@ public class TrampolineAppTest {
   @Test
   public void testTrampolineWithFactorialFunction() {
     long result = TrampolineApp.loop(10, 1).result();
-    assertEquals("Be equal", 3628800, result);
+    assertEquals(3_628_800, result);
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -98,12 +98,12 @@ public T get() {`
`98`	`98`	`return trampoline(this);`
`99`	`99`	`}`
`100`	`100`
`101`		`- T trampoline(final Trampoline<T> trampoline) {`
	`101`	`+ private T trampoline(final Trampoline<T> trampoline) {`
`102`	`102`	`return Stream.iterate(trampoline, Trampoline::jump)`
`103`	`103`	`.filter(Trampoline::complete)`
`104`	`104`	`.findFirst()`
`105`	`105`	`.map(Trampoline::result)`
`106`		`- .orElseThrow();`
	`106`	`+ .get();`
`107`	`107`	`}`
`108`	`108`	`};`
`109`	`109`	`}`