From ad435dd2fd079563ad1c3a7bd5c3f2379393ef50 Mon Sep 17 00:00:00 2001 From: Mahendran Mookkiah Date: Sun, 27 Sep 2020 09:26:19 -0400 Subject: [PATCH] issue 1500 - using Junit 5 and resolved a build issue --- trampoline/pom.xml | 5 ----- .../src/main/java/com/iluwatar/trampoline/Trampoline.java | 4 ++-- .../java/com/iluwatar/trampoline/TrampolineAppTest.java | 7 +++---- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/trampoline/pom.xml b/trampoline/pom.xml index fff117bf8..d78236473 100644 --- a/trampoline/pom.xml +++ b/trampoline/pom.xml @@ -35,11 +35,6 @@ trampoline - - junit - junit - test - org.junit.jupiter diff --git a/trampoline/src/main/java/com/iluwatar/trampoline/Trampoline.java b/trampoline/src/main/java/com/iluwatar/trampoline/Trampoline.java index 36ad73e3e..16e34ff10 100644 --- 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 interface Trampoline { return trampoline(this); } - T trampoline(final Trampoline trampoline) { + private T trampoline(final Trampoline 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 index c5d6571cd..664a95634 100644 --- 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); } } \ No newline at end of file