diff --git a/arrange-act-assert/pom.xml b/arrange-act-assert/pom.xml index c0c60f575..e23237197 100644 --- a/arrange-act-assert/pom.xml +++ b/arrange-act-assert/pom.xml @@ -36,8 +36,8 @@ arrange-act-assert - junit - junit + org.junit.jupiter + junit-jupiter-engine test diff --git a/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAAATest.java b/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAAATest.java index 3e2d90f6f..96c12b478 100644 --- a/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAAATest.java +++ b/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAAATest.java @@ -23,11 +23,11 @@ package com.iluwatar.arrangeactassert; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Arrange/Act/Assert (AAA) is a pattern for organizing unit tests. It is a way to structure your @@ -51,10 +51,11 @@ import org.junit.Test; * change and one reason to fail. In a large and complicated code base, tests that honor the single * responsibility principle are much easier to troubleshoot. */ -public class CashAAATest { + +class CashAAATest { @Test - public void testPlus() { + void testPlus() { //Arrange var cash = new Cash(3); //Act @@ -64,7 +65,7 @@ public class CashAAATest { } @Test - public void testMinus() { + void testMinus() { //Arrange var cash = new Cash(8); //Act @@ -75,7 +76,7 @@ public class CashAAATest { } @Test - public void testInsufficientMinus() { + void testInsufficientMinus() { //Arrange var cash = new Cash(1); //Act @@ -86,7 +87,7 @@ public class CashAAATest { } @Test - public void testUpdate() { + void testUpdate() { //Arrange var cash = new Cash(5); //Act diff --git a/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAntiAAATest.java b/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAntiAAATest.java index 5cad10f9c..9fe52ce4c 100644 --- a/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAntiAAATest.java +++ b/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAntiAAATest.java @@ -23,23 +23,24 @@ package com.iluwatar.arrangeactassert; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * ({@link CashAAATest}) is an anti-example of AAA pattern. This test is functionally correct, but - * with the addition of new feature, it needs refactoring. There are an awful lot of steps in that + * with the addition of a new feature, it needs refactoring. There are an awful lot of steps in that * test method, but it verifies the class' important behavior in just eleven lines. It violates the * single responsibility principle. If this test method failed after a small code change, it might * take some digging to discover why. */ -public class CashAntiAAATest { + +class CashAntiAAATest { @Test - public void testCash() { + void testCash() { //initialize var cash = new Cash(3); //test plus diff --git a/async-method-invocation/pom.xml b/async-method-invocation/pom.xml index a5f34729d..910e350a8 100644 --- a/async-method-invocation/pom.xml +++ b/async-method-invocation/pom.xml @@ -45,11 +45,6 @@ mockito-core test - - junit - junit - test - diff --git a/combinator/pom.xml b/combinator/pom.xml index 3592c5949..8b8750432 100644 --- a/combinator/pom.xml +++ b/combinator/pom.xml @@ -34,12 +34,6 @@ combinator - - junit - junit - test - - org.junit.jupiter junit-jupiter-engine diff --git a/combinator/src/test/java/com/iluwatar/combinator/CombinatorAppTest.java b/combinator/src/test/java/com/iluwatar/combinator/CombinatorAppTest.java index 3aefbf5da..2400496dd 100644 --- a/combinator/src/test/java/com/iluwatar/combinator/CombinatorAppTest.java +++ b/combinator/src/test/java/com/iluwatar/combinator/CombinatorAppTest.java @@ -23,11 +23,11 @@ package com.iluwatar.combinator; -import org.junit.Test; - import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -public class CombinatorAppTest { +import org.junit.jupiter.api.Test; + +class CombinatorAppTest { /** * Issue: Add at least one assertion to this test case. @@ -37,7 +37,7 @@ public class CombinatorAppTest { */ @Test - public void shouldExecuteApplicationWithoutException() { + void shouldExecuteApplicationWithoutException() { assertDoesNotThrow(() -> CombinatorApp.main(new String[]{})); } -} \ No newline at end of file +} diff --git a/combinator/src/test/java/com/iluwatar/combinator/FinderTest.java b/combinator/src/test/java/com/iluwatar/combinator/FinderTest.java index 3cef476b4..bbd6e7f1e 100644 --- a/combinator/src/test/java/com/iluwatar/combinator/FinderTest.java +++ b/combinator/src/test/java/com/iluwatar/combinator/FinderTest.java @@ -23,22 +23,19 @@ package com.iluwatar.combinator; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; -import java.util.List; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; - -public class FinderTest { +class FinderTest { @Test - public void contains() { + void contains() { var example = "the first one \nthe second one \n"; var result = Finder.contains("second").find(example); - Assert.assertEquals(result.size(),1); - Assert.assertEquals(result.get(0),"the second one "); + assertEquals(1, result.size()); + assertEquals("the second one ", result.get(0)); } -} \ No newline at end of file +} diff --git a/combinator/src/test/java/com/iluwatar/combinator/FindersTest.java b/combinator/src/test/java/com/iluwatar/combinator/FindersTest.java index 2827c718b..688ebdf47 100644 --- a/combinator/src/test/java/com/iluwatar/combinator/FindersTest.java +++ b/combinator/src/test/java/com/iluwatar/combinator/FindersTest.java @@ -23,44 +23,44 @@ package com.iluwatar.combinator; -import org.junit.Assert; -import org.junit.Test; +import static com.iluwatar.combinator.Finders.advancedFinder; +import static com.iluwatar.combinator.Finders.expandedFinder; +import static com.iluwatar.combinator.Finders.filteredFinder; +import static com.iluwatar.combinator.Finders.specializedFinder; +import static org.junit.jupiter.api.Assertions.assertEquals; -import java.util.List; +import org.junit.jupiter.api.Test; -import static com.iluwatar.combinator.Finders.*; -import static org.junit.Assert.*; - -public class FindersTest { +class FindersTest { @Test - public void advancedFinderTest() { + void advancedFinderTest() { var res = advancedFinder("it was","kingdom","sea").find(text()); - Assert.assertEquals(res.size(),1); - Assert.assertEquals(res.get(0),"It was many and many a year ago,"); + assertEquals(1, res.size()); + assertEquals("It was many and many a year ago,", res.get(0)); } @Test - public void filteredFinderTest() { + void filteredFinderTest() { var res = filteredFinder(" was ", "many", "child").find(text()); - Assert.assertEquals(res.size(),1); - Assert.assertEquals(res.get(0),"But we loved with a love that was more than love-"); + assertEquals(1, res.size()); + assertEquals("But we loved with a love that was more than love-", res.get(0)); } @Test - public void specializedFinderTest() { + void specializedFinderTest() { var res = specializedFinder("love","heaven").find(text()); - Assert.assertEquals(res.size(),1); - Assert.assertEquals(res.get(0),"With a love that the winged seraphs of heaven"); + assertEquals(1, res.size()); + assertEquals("With a love that the winged seraphs of heaven", res.get(0)); } @Test - public void expandedFinderTest() { + void expandedFinderTest() { var res = expandedFinder("It was","kingdom").find(text()); - Assert.assertEquals(res.size(),3); - Assert.assertEquals(res.get(0),"It was many and many a year ago,"); - Assert.assertEquals(res.get(1),"In a kingdom by the sea,"); - Assert.assertEquals(res.get(2),"In this kingdom by the sea;"); + assertEquals(3, res.size()); + assertEquals("It was many and many a year ago,", res.get(0)); + assertEquals("In a kingdom by the sea,", res.get(1)); + assertEquals("In this kingdom by the sea;", res.get(2)); } @@ -80,4 +80,4 @@ public class FindersTest { + "Coveted her and me."; } -} \ No newline at end of file +} diff --git a/double-buffer/pom.xml b/double-buffer/pom.xml index 06ceff2e7..191076215 100644 --- a/double-buffer/pom.xml +++ b/double-buffer/pom.xml @@ -36,10 +36,6 @@ double-buffer - - junit - junit - org.apache.commons commons-lang3 diff --git a/double-buffer/src/test/java/com/iluwatar/doublebuffer/AppTest.java b/double-buffer/src/test/java/com/iluwatar/doublebuffer/AppTest.java index ceedab0ee..f6e25566f 100644 --- a/double-buffer/src/test/java/com/iluwatar/doublebuffer/AppTest.java +++ b/double-buffer/src/test/java/com/iluwatar/doublebuffer/AppTest.java @@ -23,14 +23,14 @@ package com.iluwatar.doublebuffer; -import org.junit.Test; - import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import org.junit.jupiter.api.Test; + /** * App unit test. */ -public class AppTest { +class AppTest { /** * Issue: Add at least one assertion to this test case. @@ -40,7 +40,7 @@ public class AppTest { */ @Test - public void shouldExecuteApplicationWithoutException() { + void shouldExecuteApplicationWithoutException() { assertDoesNotThrow(() -> App.main(new String[]{})); } diff --git a/double-buffer/src/test/java/com/iluwatar/doublebuffer/FrameBufferTest.java b/double-buffer/src/test/java/com/iluwatar/doublebuffer/FrameBufferTest.java index f0cd6f148..6a0467bec 100644 --- a/double-buffer/src/test/java/com/iluwatar/doublebuffer/FrameBufferTest.java +++ b/double-buffer/src/test/java/com/iluwatar/doublebuffer/FrameBufferTest.java @@ -23,17 +23,19 @@ package com.iluwatar.doublebuffer; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.Arrays; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * FrameBuffer unit test. */ -public class FrameBufferTest { +class FrameBufferTest { @Test - public void testClearAll() { + void testClearAll() { try { var field = FrameBuffer.class.getDeclaredField("pixels"); var pixels = new Pixel[FrameBuffer.HEIGHT * FrameBuffer.WIDTH]; @@ -43,14 +45,14 @@ public class FrameBufferTest { field.setAccessible(true); field.set(frameBuffer, pixels); frameBuffer.clearAll(); - Assert.assertEquals(Pixel.WHITE, frameBuffer.getPixels()[0]); + assertEquals(Pixel.WHITE, frameBuffer.getPixels()[0]); } catch (NoSuchFieldException | IllegalAccessException e) { - Assert.fail("Fail to modify field access."); + fail("Fail to modify field access."); } } @Test - public void testClear() { + void testClear() { try { var field = FrameBuffer.class.getDeclaredField("pixels"); var pixels = new Pixel[FrameBuffer.HEIGHT * FrameBuffer.WIDTH]; @@ -60,21 +62,21 @@ public class FrameBufferTest { field.setAccessible(true); field.set(frameBuffer, pixels); frameBuffer.clear(0, 0); - Assert.assertEquals(Pixel.WHITE, frameBuffer.getPixels()[0]); + assertEquals(Pixel.WHITE, frameBuffer.getPixels()[0]); } catch (NoSuchFieldException | IllegalAccessException e) { - Assert.fail("Fail to modify field access."); + fail("Fail to modify field access."); } } @Test - public void testDraw() { + void testDraw() { var frameBuffer = new FrameBuffer(); frameBuffer.draw(0, 0); - Assert.assertEquals(Pixel.BLACK, frameBuffer.getPixels()[0]); + assertEquals(Pixel.BLACK, frameBuffer.getPixels()[0]); } @Test - public void testGetPixels() { + void testGetPixels() { try { var field = FrameBuffer.class.getDeclaredField("pixels"); var pixels = new Pixel[FrameBuffer.HEIGHT * FrameBuffer.WIDTH]; @@ -83,9 +85,9 @@ public class FrameBufferTest { var frameBuffer = new FrameBuffer(); field.setAccessible(true); field.set(frameBuffer, pixels); - Assert.assertEquals(pixels, frameBuffer.getPixels()); + assertEquals(pixels, frameBuffer.getPixels()); } catch (NoSuchFieldException | IllegalAccessException e) { - Assert.fail("Fail to modify field access."); + fail("Fail to modify field access."); } } diff --git a/double-buffer/src/test/java/com/iluwatar/doublebuffer/SceneTest.java b/double-buffer/src/test/java/com/iluwatar/doublebuffer/SceneTest.java index 892443e9f..5f4296700 100644 --- a/double-buffer/src/test/java/com/iluwatar/doublebuffer/SceneTest.java +++ b/double-buffer/src/test/java/com/iluwatar/doublebuffer/SceneTest.java @@ -23,17 +23,19 @@ package com.iluwatar.doublebuffer; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.ArrayList; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Scene unit tests. */ -public class SceneTest { +class SceneTest { @Test - public void testGetBuffer() { + void testGetBuffer() { try { var scene = new Scene(); var field1 = Scene.class.getDeclaredField("current"); @@ -46,14 +48,14 @@ public class SceneTest { var field2 = Scene.class.getDeclaredField("frameBuffers"); field2.setAccessible(true); field2.set(scene, frameBuffers); - Assert.assertEquals(frameBuffer, scene.getBuffer()); + assertEquals(frameBuffer, scene.getBuffer()); } catch (NoSuchFieldException | IllegalAccessException e) { - Assert.fail("Fail to access private field."); + fail("Fail to access private field."); } } @Test - public void testDraw() { + void testDraw() { try { var scene = new Scene(); var field1 = Scene.class.getDeclaredField("current"); @@ -63,10 +65,10 @@ public class SceneTest { field2.setAccessible(true); field2.set(scene, 1); scene.draw(new ArrayList<>()); - Assert.assertEquals(1, field1.get(scene)); - Assert.assertEquals(0, field2.get(scene)); + assertEquals(1, field1.get(scene)); + assertEquals(0, field2.get(scene)); } catch (NoSuchFieldException | IllegalAccessException e) { - Assert.fail("Fail to access private field"); + fail("Fail to access private field"); } } } diff --git a/factory/pom.xml b/factory/pom.xml index 8167403cd..f6362cf6e 100644 --- a/factory/pom.xml +++ b/factory/pom.xml @@ -38,10 +38,6 @@ junit-jupiter-engine test - - junit - junit - diff --git a/game-loop/pom.xml b/game-loop/pom.xml index 5dba93496..ad6c4986c 100644 --- a/game-loop/pom.xml +++ b/game-loop/pom.xml @@ -35,11 +35,6 @@ game-loop - - junit - junit - - org.junit.jupiter junit-jupiter-engine diff --git a/half-sync-half-async/pom.xml b/half-sync-half-async/pom.xml index 7a383b4f7..a6e71b786 100644 --- a/half-sync-half-async/pom.xml +++ b/half-sync-half-async/pom.xml @@ -43,11 +43,6 @@ mockito-core test - - junit - junit - test - diff --git a/leader-followers/pom.xml b/leader-followers/pom.xml index 56db4e5f2..49c1bb33e 100644 --- a/leader-followers/pom.xml +++ b/leader-followers/pom.xml @@ -32,11 +32,6 @@ leader-followers - - junit - junit - test - org.junit.jupiter junit-jupiter-engine diff --git a/leader-followers/src/test/java/com/AppTest.java b/leader-followers/src/test/java/com/AppTest.java index f586db96d..e764304d6 100644 --- a/leader-followers/src/test/java/com/AppTest.java +++ b/leader-followers/src/test/java/com/AppTest.java @@ -23,20 +23,20 @@ package com; -import com.iluwatar.leaderfollowers.App; -import org.junit.Test; - import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import com.iluwatar.leaderfollowers.App; +import org.junit.jupiter.api.Test; + /** * * Application test * */ -public class AppTest { +class AppTest { @Test - public void shouldExecuteApplicationWithoutException() { + void shouldExecuteApplicationWithoutException() { assertDoesNotThrow(() -> App.main(new String[]{})); } diff --git a/leader-followers/src/test/java/com/TaskHandlerTest.java b/leader-followers/src/test/java/com/TaskHandlerTest.java index 0b82e39a6..b3e2f7577 100644 --- a/leader-followers/src/test/java/com/TaskHandlerTest.java +++ b/leader-followers/src/test/java/com/TaskHandlerTest.java @@ -23,22 +23,23 @@ package com; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.iluwatar.leaderfollowers.Task; import com.iluwatar.leaderfollowers.TaskHandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for TaskHandler */ -public class TaskHandlerTest { +class TaskHandlerTest { @Test - public void testHandleTask() throws InterruptedException { + void testHandleTask() throws InterruptedException { var taskHandler = new TaskHandler(); var handle = new Task(100); taskHandler.handleTask(handle); - Assert.assertTrue(handle.isFinished()); + assertTrue(handle.isFinished()); } } diff --git a/leader-followers/src/test/java/com/TaskSetTest.java b/leader-followers/src/test/java/com/TaskSetTest.java index bfc2c35a9..af5f6b8a0 100644 --- a/leader-followers/src/test/java/com/TaskSetTest.java +++ b/leader-followers/src/test/java/com/TaskSetTest.java @@ -23,30 +23,31 @@ package com; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.iluwatar.leaderfollowers.Task; import com.iluwatar.leaderfollowers.TaskSet; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for TaskSet */ -public class TaskSetTest { +class TaskSetTest { @Test - public void testAddTask() throws InterruptedException { + void testAddTask() throws InterruptedException { var taskSet = new TaskSet(); taskSet.addTask(new Task(10)); - Assert.assertTrue(taskSet.getSize() == 1); + assertEquals(1, taskSet.getSize()); } @Test - public void testGetTask() throws InterruptedException { + void testGetTask() throws InterruptedException { var taskSet = new TaskSet(); taskSet.addTask(new Task(100)); Task task = taskSet.getTask(); - Assert.assertTrue(task.getTime() == 100); - Assert.assertTrue(taskSet.getSize() == 0); + assertEquals(100, task.getTime()); + assertEquals(0, taskSet.getSize()); } } diff --git a/leader-followers/src/test/java/com/WorkCenterTest.java b/leader-followers/src/test/java/com/WorkCenterTest.java index d35a26296..ddbe19cd8 100644 --- a/leader-followers/src/test/java/com/WorkCenterTest.java +++ b/leader-followers/src/test/java/com/WorkCenterTest.java @@ -23,43 +23,45 @@ package com; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import com.iluwatar.leaderfollowers.TaskHandler; import com.iluwatar.leaderfollowers.TaskSet; import com.iluwatar.leaderfollowers.WorkCenter; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for WorkCenter */ -public class WorkCenterTest { +class WorkCenterTest { @Test - public void testCreateWorkers() { + void testCreateWorkers() { var taskSet = new TaskSet(); var taskHandler = new TaskHandler(); var workCenter = new WorkCenter(); workCenter.createWorkers(5, taskSet, taskHandler); - Assert.assertEquals(workCenter.getWorkers().size(), 5); - Assert.assertEquals(workCenter.getWorkers().get(0), workCenter.getLeader()); + assertEquals(5, workCenter.getWorkers().size()); + assertEquals(workCenter.getWorkers().get(0), workCenter.getLeader()); } @Test - public void testNullLeader() { + void testNullLeader() { var workCenter = new WorkCenter(); workCenter.promoteLeader(); - Assert.assertNull(workCenter.getLeader()); + assertNull(workCenter.getLeader()); } @Test - public void testPromoteLeader() { + void testPromoteLeader() { var taskSet = new TaskSet(); var taskHandler = new TaskHandler(); var workCenter = new WorkCenter(); workCenter.createWorkers(5, taskSet, taskHandler); workCenter.removeWorker(workCenter.getLeader()); workCenter.promoteLeader(); - Assert.assertEquals(workCenter.getWorkers().size(), 4); - Assert.assertEquals(workCenter.getWorkers().get(0), workCenter.getLeader()); + assertEquals(4, workCenter.getWorkers().size()); + assertEquals(workCenter.getWorkers().get(0), workCenter.getLeader()); } } diff --git a/marker/src/test/java/GuardTest.java b/marker/src/test/java/GuardTest.java index 5ea0eb907..d34fe3bac 100644 --- a/marker/src/test/java/GuardTest.java +++ b/marker/src/test/java/GuardTest.java @@ -21,18 +21,18 @@ * THE SOFTWARE. */ -import org.junit.jupiter.api.Test; - import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.jupiter.api.Test; + /** * Guard test */ -public class GuardTest { +class GuardTest { @Test - public void testGuard() { + void testGuard() { var guard = new Guard(); assertThat(guard, instanceOf(Permission.class)); } diff --git a/partial-response/pom.xml b/partial-response/pom.xml index 64457665b..20e4958d0 100644 --- a/partial-response/pom.xml +++ b/partial-response/pom.xml @@ -35,12 +35,6 @@ partial-response - - org.junit.vintage - junit-vintage-engine - 5.4.0 - test - org.mockito mockito-junit-jupiter diff --git a/partial-response/src/test/java/com/iluwatar/partialresponse/VideoResourceTest.java b/partial-response/src/test/java/com/iluwatar/partialresponse/VideoResourceTest.java index 9d8be1b09..a02be215b 100644 --- a/partial-response/src/test/java/com/iluwatar/partialresponse/VideoResourceTest.java +++ b/partial-response/src/test/java/com/iluwatar/partialresponse/VideoResourceTest.java @@ -23,17 +23,18 @@ package com.iluwatar.partialresponse; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; + +import java.util.Map; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Map; - /** * tests {@link VideoResource}. */ @@ -44,8 +45,8 @@ class VideoResourceTest { private static VideoResource resource; - @BeforeAll - static void setUp() { + @BeforeEach + void setUp() { var videos = Map.of( 1, new Video(1, "Avatar", 178, "epic science fiction film", "James Cameron", "English"), @@ -70,7 +71,7 @@ class VideoResourceTest { var fields = new String[]{"id", "title", "length"}; var expectedDetails = "{\"id\": 1,\"title\": \"Avatar\",\"length\": 178}"; - Mockito.when(fieldJsonMapper.toJson(Matchers.any(Video.class), Matchers.eq(fields))).thenReturn(expectedDetails); + Mockito.when(fieldJsonMapper.toJson(any(Video.class), eq(fields))).thenReturn(expectedDetails); var actualFieldsDetails = resource.getDetails(2, fields); diff --git a/registry/pom.xml b/registry/pom.xml index c6312713b..2b82d45bf 100644 --- a/registry/pom.xml +++ b/registry/pom.xml @@ -41,10 +41,6 @@ junit-jupiter-engine test - - junit - junit - diff --git a/role-object/pom.xml b/role-object/pom.xml index e53ca1747..0c5547f57 100644 --- a/role-object/pom.xml +++ b/role-object/pom.xml @@ -34,11 +34,6 @@ role-object - - junit - junit - test - org.junit.jupiter junit-jupiter-engine diff --git a/role-object/src/test/java/com/iluwatar/roleobject/ApplicationRoleObjectTest.java b/role-object/src/test/java/com/iluwatar/roleobject/ApplicationRoleObjectTest.java index 1b02b90f1..c1583fed7 100644 --- a/role-object/src/test/java/com/iluwatar/roleobject/ApplicationRoleObjectTest.java +++ b/role-object/src/test/java/com/iluwatar/roleobject/ApplicationRoleObjectTest.java @@ -23,14 +23,14 @@ package com.iluwatar.roleobject; -import org.junit.Test; - import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -public class ApplicationRoleObjectTest { +import org.junit.jupiter.api.Test; + +class ApplicationRoleObjectTest { @Test - public void shouldExecuteApplicationWithoutException() { + void shouldExecuteApplicationWithoutException() { assertDoesNotThrow(() -> ApplicationRoleObject.main(new String[]{})); } } \ No newline at end of file diff --git a/role-object/src/test/java/com/iluwatar/roleobject/BorrowerRoleTest.java b/role-object/src/test/java/com/iluwatar/roleobject/BorrowerRoleTest.java index ee7881f19..037296aff 100644 --- a/role-object/src/test/java/com/iluwatar/roleobject/BorrowerRoleTest.java +++ b/role-object/src/test/java/com/iluwatar/roleobject/BorrowerRoleTest.java @@ -23,15 +23,16 @@ package com.iluwatar.roleobject; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class BorrowerRoleTest { +import org.junit.jupiter.api.Test; + +class BorrowerRoleTest { @Test - public void borrowTest() { + void borrowTest() { var borrowerRole = new BorrowerRole(); borrowerRole.setName("test"); - Assert.assertEquals(borrowerRole.borrow(), "Borrower test wants to get some money."); + assertEquals("Borrower test wants to get some money.", borrowerRole.borrow()); } } \ No newline at end of file diff --git a/role-object/src/test/java/com/iluwatar/roleobject/CustomerCoreTest.java b/role-object/src/test/java/com/iluwatar/roleobject/CustomerCoreTest.java index acbbfaf02..a17b3034f 100644 --- a/role-object/src/test/java/com/iluwatar/roleobject/CustomerCoreTest.java +++ b/role-object/src/test/java/com/iluwatar/roleobject/CustomerCoreTest.java @@ -23,22 +23,22 @@ package com.iluwatar.roleobject; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class CustomerCoreTest { +class CustomerCoreTest { @Test - public void addRole() { + void addRole() { var core = new CustomerCore(); assertTrue(core.addRole(Role.Borrower)); } @Test - public void hasRole() { + void hasRole() { var core = new CustomerCore(); core.addRole(Role.Borrower); assertTrue(core.hasRole(Role.Borrower)); @@ -46,7 +46,7 @@ public class CustomerCoreTest { } @Test - public void remRole() { + void remRole() { var core = new CustomerCore(); core.addRole(Role.Borrower); @@ -60,7 +60,7 @@ public class CustomerCoreTest { } @Test - public void getRole() { + void getRole() { var core = new CustomerCore(); core.addRole(Role.Borrower); @@ -76,17 +76,17 @@ public class CustomerCoreTest { @Test - public void toStringTest() { + void toStringTest() { var core = new CustomerCore(); core.addRole(Role.Borrower); - assertEquals(core.toString(), "Customer{roles=[Borrower]}"); + assertEquals("Customer{roles=[Borrower]}", core.toString()); core = new CustomerCore(); core.addRole(Role.Investor); - assertEquals(core.toString(), "Customer{roles=[Investor]}"); + assertEquals("Customer{roles=[Investor]}", core.toString()); core = new CustomerCore(); - assertEquals(core.toString(), "Customer{roles=[]}"); + assertEquals("Customer{roles=[]}", core.toString()); } diff --git a/role-object/src/test/java/com/iluwatar/roleobject/InvestorRoleTest.java b/role-object/src/test/java/com/iluwatar/roleobject/InvestorRoleTest.java index ad8bd49f9..dfb4d4c18 100644 --- a/role-object/src/test/java/com/iluwatar/roleobject/InvestorRoleTest.java +++ b/role-object/src/test/java/com/iluwatar/roleobject/InvestorRoleTest.java @@ -23,16 +23,17 @@ package com.iluwatar.roleobject; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class InvestorRoleTest { +import org.junit.jupiter.api.Test; + +class InvestorRoleTest { @Test - public void investTest() { + void investTest() { var investorRole = new InvestorRole(); investorRole.setName("test"); investorRole.setAmountToInvest(10); - Assert.assertEquals(investorRole.invest(), "Investor test has invested 10 dollars"); + assertEquals("Investor test has invested 10 dollars", investorRole.invest()); } } \ No newline at end of file diff --git a/role-object/src/test/java/com/iluwatar/roleobject/RoleTest.java b/role-object/src/test/java/com/iluwatar/roleobject/RoleTest.java index b8426a3d1..fcce53984 100644 --- a/role-object/src/test/java/com/iluwatar/roleobject/RoleTest.java +++ b/role-object/src/test/java/com/iluwatar/roleobject/RoleTest.java @@ -23,15 +23,17 @@ package com.iluwatar.roleobject; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class RoleTest { +import org.junit.jupiter.api.Test; + +class RoleTest { @Test - public void instanceTest() { + void instanceTest() { var instance = Role.Borrower.instance(); - Assert.assertTrue(instance.isPresent()); - Assert.assertEquals(instance.get().getClass(), BorrowerRole.class); + assertTrue(instance.isPresent()); + assertEquals(instance.get().getClass(), BorrowerRole.class); } } \ No newline at end of file diff --git a/serverless/src/test/java/com/iluwatar/serverless/faas/api/LambdaInfoApiHandlerTest.java b/serverless/src/test/java/com/iluwatar/serverless/faas/api/LambdaInfoApiHandlerTest.java index 1f4b59a45..064e15cd8 100644 --- a/serverless/src/test/java/com/iluwatar/serverless/faas/api/LambdaInfoApiHandlerTest.java +++ b/serverless/src/test/java/com/iluwatar/serverless/faas/api/LambdaInfoApiHandlerTest.java @@ -30,17 +30,14 @@ import static org.mockito.Mockito.when; import com.amazonaws.services.lambda.runtime.Context; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; /** * Unit tests for LambdaInfoApiHandler */ -@RunWith(MockitoJUnitRunner.class) -public class LambdaInfoApiHandlerTest { +class LambdaInfoApiHandlerTest { @Test - public void handleRequestWithMockContext() { + void handleRequestWithMockContext() { var lambdaInfoApiHandler = new LambdaInfoApiHandler(); var context = mock(Context.class); when(context.getAwsRequestId()).thenReturn("mock aws request id"); diff --git a/sharding/pom.xml b/sharding/pom.xml index 05d064f75..36d156b17 100644 --- a/sharding/pom.xml +++ b/sharding/pom.xml @@ -36,10 +36,6 @@ sharding - - junit - junit - org.junit.jupiter junit-jupiter-engine diff --git a/sharding/src/test/java/com/iluwatar/sharding/AppTest.java b/sharding/src/test/java/com/iluwatar/sharding/AppTest.java index 5c9929531..10eabae78 100644 --- a/sharding/src/test/java/com/iluwatar/sharding/AppTest.java +++ b/sharding/src/test/java/com/iluwatar/sharding/AppTest.java @@ -23,17 +23,17 @@ package com.iluwatar.sharding; -import org.junit.Test; - import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import org.junit.jupiter.api.Test; + /** * Unit tests for App class. */ -public class AppTest { +class AppTest { @Test - public void shouldExecuteWithoutException() { + void shouldExecuteWithoutException() { assertDoesNotThrow(() -> App.main(new String[]{})); } diff --git a/sharding/src/test/java/com/iluwatar/sharding/HashShardManagerTest.java b/sharding/src/test/java/com/iluwatar/sharding/HashShardManagerTest.java index fb11e210f..0d498a66a 100644 --- a/sharding/src/test/java/com/iluwatar/sharding/HashShardManagerTest.java +++ b/sharding/src/test/java/com/iluwatar/sharding/HashShardManagerTest.java @@ -23,22 +23,22 @@ package com.iluwatar.sharding; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Unit tests for HashShardManager class. */ -public class HashShardManagerTest { +class HashShardManagerTest { private HashShardManager hashShardManager; /** * Initialize hashShardManager instance. */ - @Before + @BeforeEach public void setup() { hashShardManager = new HashShardManager(); var shard1 = new Shard(1); @@ -49,16 +49,11 @@ public class HashShardManagerTest { hashShardManager.addNewShard(shard3); } - @After - public void tearDown() { - - } - @Test - public void testStoreData() { + void testStoreData() { var data = new Data(1, "test", Data.DataType.TYPE_1); hashShardManager.storeData(data); - Assert.assertEquals(data, hashShardManager.getShardById(1).getDataById(1)); + assertEquals(data, hashShardManager.getShardById(1).getDataById(1)); } } diff --git a/sharding/src/test/java/com/iluwatar/sharding/LookupShardManagerTest.java b/sharding/src/test/java/com/iluwatar/sharding/LookupShardManagerTest.java index 84614f86e..f02fd1522 100644 --- a/sharding/src/test/java/com/iluwatar/sharding/LookupShardManagerTest.java +++ b/sharding/src/test/java/com/iluwatar/sharding/LookupShardManagerTest.java @@ -23,22 +23,24 @@ package com.iluwatar.sharding; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.Map; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Unit tests for LookupShardManager class. */ -public class LookupShardManagerTest { +class LookupShardManagerTest { private LookupShardManager lookupShardManager; /** * Initialize lookupShardManager instance. */ - @Before + @BeforeEach public void setup() { lookupShardManager = new LookupShardManager(); var shard1 = new Shard(1); @@ -50,7 +52,7 @@ public class LookupShardManagerTest { } @Test - public void testStoreData() { + void testStoreData() { try { var data = new Data(1, "test", Data.DataType.TYPE_1); lookupShardManager.storeData(data); @@ -59,9 +61,9 @@ public class LookupShardManagerTest { var lookupMap = (Map) field.get(lookupShardManager); var shardId = lookupMap.get(1); var shard = lookupShardManager.getShardById(shardId); - Assert.assertEquals(data, shard.getDataById(1)); + assertEquals(data, shard.getDataById(1)); } catch (NoSuchFieldException | IllegalAccessException e) { - Assert.fail("Fail to modify field access."); + fail("Fail to modify field access."); } } } diff --git a/sharding/src/test/java/com/iluwatar/sharding/RangeShardManagerTest.java b/sharding/src/test/java/com/iluwatar/sharding/RangeShardManagerTest.java index 75f0e85ad..eab44ab5a 100644 --- a/sharding/src/test/java/com/iluwatar/sharding/RangeShardManagerTest.java +++ b/sharding/src/test/java/com/iluwatar/sharding/RangeShardManagerTest.java @@ -23,21 +23,22 @@ package com.iluwatar.sharding; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Unit tests for RangeShardManager class. */ -public class RangeShardManagerTest { +class RangeShardManagerTest { private RangeShardManager rangeShardManager; /** * Initialize rangeShardManager instance. */ - @Before + @BeforeEach public void setup() { rangeShardManager = new RangeShardManager(); var shard1 = new Shard(1); @@ -49,10 +50,10 @@ public class RangeShardManagerTest { } @Test - public void testStoreData() { + void testStoreData() { var data = new Data(1, "test", Data.DataType.TYPE_1); rangeShardManager.storeData(data); - Assert.assertEquals(data, rangeShardManager.getShardById(1).getDataById(1)); + assertEquals(data, rangeShardManager.getShardById(1).getDataById(1)); } } diff --git a/sharding/src/test/java/com/iluwatar/sharding/ShardManagerTest.java b/sharding/src/test/java/com/iluwatar/sharding/ShardManagerTest.java index fab640ff3..14d0cf244 100644 --- a/sharding/src/test/java/com/iluwatar/sharding/ShardManagerTest.java +++ b/sharding/src/test/java/com/iluwatar/sharding/ShardManagerTest.java @@ -23,49 +23,46 @@ package com.iluwatar.sharding; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.Map; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Unit tests for ShardManager class. */ -public class ShardManagerTest { +class ShardManagerTest { private ShardManager shardManager; /** * Initialize shardManager instance. */ - @Before - public void setup() { + @BeforeEach + void setup() { shardManager = new TestShardManager(); } - @After - public void tearDown() { - - } - @Test - public void testAddNewShard() { + void testAddNewShard() { try { var shard = new Shard(1); shardManager.addNewShard(shard); var field = ShardManager.class.getDeclaredField("shardMap"); field.setAccessible(true); var map = (Map) field.get(shardManager); - Assert.assertEquals(1, map.size()); - Assert.assertEquals(shard, map.get(1)); + assertEquals(1, map.size()); + assertEquals(shard, map.get(1)); } catch (NoSuchFieldException | IllegalAccessException e) { - Assert.fail("Fail to modify field access."); + fail("Fail to modify field access."); } } @Test - public void testRemoveShardById() { + void testRemoveShardById() { try { var shard = new Shard(1); shardManager.addNewShard(shard); @@ -73,19 +70,19 @@ public class ShardManagerTest { var field = ShardManager.class.getDeclaredField("shardMap"); field.setAccessible(true); var map = (Map) field.get(shardManager); - Assert.assertEquals(true, flag); - Assert.assertEquals(0, map.size()); + assertTrue(flag); + assertEquals(0, map.size()); } catch (IllegalAccessException | NoSuchFieldException e) { - Assert.fail("Fail to modify field access."); + fail("Fail to modify field access."); } } @Test - public void testGetShardById() { + void testGetShardById() { var shard = new Shard(1); shardManager.addNewShard(shard); var tmpShard = shardManager.getShardById(1); - Assert.assertEquals(shard, tmpShard); + assertEquals(shard, tmpShard); } class TestShardManager extends ShardManager { diff --git a/sharding/src/test/java/com/iluwatar/sharding/ShardTest.java b/sharding/src/test/java/com/iluwatar/sharding/ShardTest.java index 30a492b01..0b4e73f0d 100644 --- a/sharding/src/test/java/com/iluwatar/sharding/ShardTest.java +++ b/sharding/src/test/java/com/iluwatar/sharding/ShardTest.java @@ -23,50 +23,47 @@ package com.iluwatar.sharding; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.HashMap; import java.util.Map; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Unit tests for Shard class. */ -public class ShardTest { +class ShardTest { private Data data; private Shard shard; - @Before + @BeforeEach public void setup() { data = new Data(1, "test", Data.DataType.TYPE_1); shard = new Shard(1); } - @After - public void tearDown() { - } - @Test - public void testStoreData() { + void testStoreData() { try { shard.storeData(data); var field = Shard.class.getDeclaredField("dataStore"); field.setAccessible(true); var dataMap = (Map) field.get(shard); - Assert.assertEquals(1, dataMap.size()); - Assert.assertEquals(data, dataMap.get(1)); + assertEquals(1, dataMap.size()); + assertEquals(data, dataMap.get(1)); } catch (NoSuchFieldException | IllegalAccessException e) { - Assert.fail("Fail to modify field access."); + fail("Fail to modify field access."); } } @Test - public void testClearData() { + void testClearData() { try { var dataMap = new HashMap(); dataMap.put(1, data); @@ -75,9 +72,9 @@ public class ShardTest { field.set(shard, dataMap); shard.clearData(); dataMap = (HashMap) field.get(shard); - Assert.assertEquals(0, dataMap.size()); + assertEquals(0, dataMap.size()); } catch (NoSuchFieldException | IllegalAccessException e) { - Assert.fail("Fail to modify field access."); + fail("Fail to modify field access."); } } } diff --git a/singleton/pom.xml b/singleton/pom.xml index 076756f2e..d7e0b354d 100644 --- a/singleton/pom.xml +++ b/singleton/pom.xml @@ -38,10 +38,6 @@ junit-jupiter-engine test - - junit - junit - diff --git a/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLockingTest.java b/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLockingTest.java index 3b13fd878..6ad57d62a 100644 --- a/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLockingTest.java +++ b/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLockingTest.java @@ -23,15 +23,17 @@ package com.iluwatar.singleton; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.lang.reflect.InvocationTargetException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Date: 12/29/15 - 19:26 PM. * * @author Jeroen Meulemeester */ -public class ThreadSafeDoubleCheckLockingTest extends SingletonTest { +class ThreadSafeDoubleCheckLockingTest extends SingletonTest { /** * Create a new singleton test instance using the given 'getInstance' method. @@ -43,12 +45,12 @@ public class ThreadSafeDoubleCheckLockingTest extends SingletonTest constructor.newInstance((Object[]) null)); } } diff --git a/subclass-sandbox/pom.xml b/subclass-sandbox/pom.xml index c2b58a274..6d344049f 100644 --- a/subclass-sandbox/pom.xml +++ b/subclass-sandbox/pom.xml @@ -36,10 +36,6 @@ subclass-sandbox - - junit - junit - com.github.stefanbirkner system-lambda diff --git a/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/AppTest.java b/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/AppTest.java index e8d048ead..2902b39e6 100644 --- a/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/AppTest.java +++ b/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/AppTest.java @@ -23,17 +23,17 @@ package com.iluwatar.subclasssandbox; -import org.junit.Test; - import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import org.junit.jupiter.api.Test; + /** * App unit tests. */ -public class AppTest { +class AppTest { @Test - public void shouldExecuteWithoutException() { + void shouldExecuteWithoutException() { assertDoesNotThrow(() -> App.main(new String[]{})); } } diff --git a/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/GroundDiveTest.java b/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/GroundDiveTest.java index 88a6afe47..8452e2df7 100644 --- a/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/GroundDiveTest.java +++ b/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/GroundDiveTest.java @@ -23,45 +23,45 @@ package com.iluwatar.subclasssandbox; -import com.github.stefanbirkner.systemlambda.Statement; -import org.junit.Assert; -import org.junit.Test; - import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOutNormalized; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import com.github.stefanbirkner.systemlambda.Statement; +import org.junit.jupiter.api.Test; /** * GroundDive unit tests. */ -public class GroundDiveTest { +class GroundDiveTest { @Test - public void testMove() throws Exception { + void testMove() throws Exception { var groundDive = new GroundDive(); groundDive.move(1.0, 1.0, 1.0); var outputLog = getLogContent(() -> groundDive.move(1.0, 1.0, 1.0)); var expectedLog = "Move to ( 1.0, 1.0, 1.0 )"; - Assert.assertEquals(outputLog, expectedLog); + assertEquals(outputLog, expectedLog); } @Test - public void testPlaySound() throws Exception { + void testPlaySound() throws Exception { var groundDive = new GroundDive(); var outputLog = getLogContent(() -> groundDive.playSound("SOUND_NAME", 1)); var expectedLog = "Play SOUND_NAME with volumn 1"; - Assert.assertEquals(outputLog, expectedLog); + assertEquals(outputLog, expectedLog); } @Test - public void testSpawnParticles() throws Exception { + void testSpawnParticles() throws Exception { var groundDive = new GroundDive(); final var outputLog = getLogContent( () -> groundDive.spawnParticles("PARTICLE_TYPE", 100)); final var expectedLog = "Spawn 100 particle with type PARTICLE_TYPE"; - Assert.assertEquals(outputLog, expectedLog); + assertEquals(outputLog, expectedLog); } @Test - public void testActivate() throws Exception { + void testActivate() throws Exception { var groundDive = new GroundDive(); var logs = tapSystemOutNormalized(groundDive::activate) .split("\n"); @@ -72,10 +72,10 @@ public class GroundDiveTest { final var expectedLog2 = "Play GROUNDDIVE_SOUND with volumn 5"; final var log3 = getLogContent(logs[2]); final var expectedLog3 = "Spawn 20 particle with type GROUNDDIVE_PARTICLE"; - Assert.assertEquals(logs.length, expectedSize); - Assert.assertEquals(log1, expectedLog1); - Assert.assertEquals(log2, expectedLog2); - Assert.assertEquals(log3, expectedLog3); + assertEquals(logs.length, expectedSize); + assertEquals(log1, expectedLog1); + assertEquals(log2, expectedLog2); + assertEquals(log3, expectedLog3); } private String getLogContent(Statement statement) throws Exception { diff --git a/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/SkyLaunchTest.java b/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/SkyLaunchTest.java index c0e9e9087..eb9b58406 100644 --- a/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/SkyLaunchTest.java +++ b/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/SkyLaunchTest.java @@ -23,44 +23,44 @@ package com.iluwatar.subclasssandbox; -import com.github.stefanbirkner.systemlambda.Statement; -import org.junit.Assert; -import org.junit.Test; - import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOutNormalized; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import com.github.stefanbirkner.systemlambda.Statement; +import org.junit.jupiter.api.Test; /** * SkyLaunch unit tests. */ -public class SkyLaunchTest { +class SkyLaunchTest { @Test - public void testMove() throws Exception { + void testMove() throws Exception { var skyLaunch = new SkyLaunch(); var outputLog = getLogContent(() -> skyLaunch.move(1.0, 1.0, 1.0)); var expectedLog = "Move to ( 1.0, 1.0, 1.0 )"; - Assert.assertEquals(outputLog, expectedLog); + assertEquals(outputLog, expectedLog); } @Test - public void testPlaySound() throws Exception { + void testPlaySound() throws Exception { var skyLaunch = new SkyLaunch(); var outputLog = getLogContent(() -> skyLaunch.playSound("SOUND_NAME", 1)); var expectedLog = "Play SOUND_NAME with volumn 1"; - Assert.assertEquals(outputLog, expectedLog); + assertEquals(outputLog, expectedLog); } @Test - public void testSpawnParticles() throws Exception { + void testSpawnParticles() throws Exception { var skyLaunch = new SkyLaunch(); var outputLog = getLogContent( () -> skyLaunch.spawnParticles("PARTICLE_TYPE", 100)); var expectedLog = "Spawn 100 particle with type PARTICLE_TYPE"; - Assert.assertEquals(outputLog, expectedLog); + assertEquals(outputLog, expectedLog); } @Test - public void testActivate() throws Exception { + void testActivate() throws Exception { var skyLaunch = new SkyLaunch(); var logs = tapSystemOutNormalized(skyLaunch::activate) .split("\n"); @@ -71,10 +71,10 @@ public class SkyLaunchTest { final var expectedLog2 = "Play SKYLAUNCH_SOUND with volumn 1"; final var log3 = getLogContent(logs[2]); final var expectedLog3 = "Spawn 100 particle with type SKYLAUNCH_PARTICLE"; - Assert.assertEquals(logs.length, expectedSize); - Assert.assertEquals(log1, expectedLog1); - Assert.assertEquals(log2, expectedLog2); - Assert.assertEquals(log3, expectedLog3); + assertEquals(logs.length, expectedSize); + assertEquals(log1, expectedLog1); + assertEquals(log2, expectedLog2); + assertEquals(log3, expectedLog3); } private String getLogContent(Statement statement) throws Exception { diff --git a/tolerant-reader/pom.xml b/tolerant-reader/pom.xml index c869c98f4..a0c610514 100644 --- a/tolerant-reader/pom.xml +++ b/tolerant-reader/pom.xml @@ -38,11 +38,6 @@ junit-jupiter-engine test - - org.junit.jupiter - junit-jupiter-migrationsupport - test - diff --git a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java index 6981c332e..9901126f6 100644 --- a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java +++ b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java @@ -68,7 +68,7 @@ public final class RainbowFishSerializer { var map = Map.of( "name", rainbowFish.getName(), "age", String.format("%d", rainbowFish.getAge()), - "lengthMeters", String.format("%d", rainbowFish.getLengthMeters()), + LENGTH_METERS, String.format("%d", rainbowFish.getLengthMeters()), WEIGHT_TONS, String.format("%d", rainbowFish.getWeightTons()), "angry", Boolean.toString(rainbowFish.getAngry()), "hungry", Boolean.toString(rainbowFish.getHungry()), @@ -95,7 +95,7 @@ public final class RainbowFishSerializer { return new RainbowFish( map.get("name"), Integer.parseInt(map.get("age")), - Integer.parseInt(map.get("lengthMeters")), + Integer.parseInt(map.get(LENGTH_METERS)), Integer.parseInt(map.get(WEIGHT_TONS)) ); } diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java index 77d4276ff..bcb1f49a4 100644 --- a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java +++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java @@ -23,14 +23,13 @@ package com.iluwatar.tolerantreader; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; + import java.io.File; -import java.io.IOException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; - /** * Application test */ diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java index a6676bab0..451357c14 100644 --- a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java +++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java @@ -25,26 +25,32 @@ package com.iluwatar.tolerantreader; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; -import org.junit.Rule; +import java.nio.file.Files; +import java.nio.file.Path; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.io.TempDir; /** * Date: 12/30/15 - 18:39 PM * * @author Jeroen Meulemeester */ -@EnableRuleMigrationSupport -public class RainbowFishSerializerTest { + +class RainbowFishSerializerTest { /** * Create a temporary folder, used to generate files in during this test */ - @Rule - public final TemporaryFolder testFolder = new TemporaryFolder(); + @TempDir + static Path testFolder; + + @BeforeEach + void beforeEach() { + assertTrue(Files.isDirectory(testFolder)); + } /** * Rainbow fish version 1 used during the tests @@ -60,11 +66,11 @@ public class RainbowFishSerializerTest { * Verify if a fish, written as version 1 can be read back as version 1 */ @Test - public void testWriteV1ReadV1() throws Exception { - final var outputFile = this.testFolder.newFile(); - RainbowFishSerializer.writeV1(V1, outputFile.getPath()); + void testWriteV1ReadV1() throws Exception { + final var outputPath = Files.createFile(testFolder.resolve("outputFile")); + RainbowFishSerializer.writeV1(V1, outputPath.toString()); - final var fish = RainbowFishSerializer.readV1(outputFile.getPath()); + final var fish = RainbowFishSerializer.readV1(outputPath.toString()); assertNotSame(V1, fish); assertEquals(V1.getName(), fish.getName()); assertEquals(V1.getAge(), fish.getAge()); @@ -77,11 +83,11 @@ public class RainbowFishSerializerTest { * Verify if a fish, written as version 2 can be read back as version 1 */ @Test - public void testWriteV2ReadV1() throws Exception { - final var outputFile = this.testFolder.newFile(); - RainbowFishSerializer.writeV2(V2, outputFile.getPath()); + void testWriteV2ReadV1() throws Exception { + final var outputPath = Files.createFile(testFolder.resolve("outputFile2")); + RainbowFishSerializer.writeV2(V2, outputPath.toString()); - final var fish = RainbowFishSerializer.readV1(outputFile.getPath()); + final var fish = RainbowFishSerializer.readV1(outputPath.toString()); assertNotSame(V2, fish); assertEquals(V2.getName(), fish.getName()); assertEquals(V2.getAge(), fish.getAge()); @@ -89,4 +95,4 @@ public class RainbowFishSerializerTest { assertEquals(V2.getWeightTons(), fish.getWeightTons()); } -} \ No newline at end of file +} diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.java index f743140d7..52e1fad38 100644 --- a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.java +++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.java @@ -23,22 +23,22 @@ package com.iluwatar.tolerantreader; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Date: 12/30/15 - 18:34 PM * * @author Jeroen Meulemeester */ -public class RainbowFishTest { +class RainbowFishTest { /** * Verify if the getters of a {@link RainbowFish} return the expected values */ @Test - public void testValues() { + void testValues() { final var fish = new RainbowFish("name", 1, 2, 3); assertEquals("name", fish.getName()); assertEquals(1, fish.getAge()); diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.java index c23a74381..101ca701d 100644 --- a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.java +++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.java @@ -27,20 +27,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Date: 12/30/15 - 18:35 PM * * @author Jeroen Meulemeester */ -public class RainbowFishV2Test { +class RainbowFishV2Test { /** * Verify if the getters of a {@link RainbowFish} return the expected values */ @Test - public void testValues() { + void testValues() { final var fish = new RainbowFishV2("name", 1, 2, 3, false, true, false); assertEquals("name", fish.getName()); assertEquals(1, fish.getAge()); diff --git a/unit-of-work/pom.xml b/unit-of-work/pom.xml index 1770a9742..82404b3bc 100644 --- a/unit-of-work/pom.xml +++ b/unit-of-work/pom.xml @@ -35,19 +35,9 @@ unit-of-work - - junit - junit - - - org.junit.vintage - junit-vintage-engine - test - org.junit.jupiter junit-jupiter-engine - 5.0.0 test diff --git a/unit-of-work/src/test/java/com/iluwatar/unitofwork/AppTest.java b/unit-of-work/src/test/java/com/iluwatar/unitofwork/AppTest.java index 79ece6058..99e582be1 100644 --- a/unit-of-work/src/test/java/com/iluwatar/unitofwork/AppTest.java +++ b/unit-of-work/src/test/java/com/iluwatar/unitofwork/AppTest.java @@ -23,17 +23,17 @@ package com.iluwatar.unitofwork; -import org.junit.Test; - import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import org.junit.jupiter.api.Test; + /** * AppTest */ -public class AppTest { +class AppTest { @Test - public void shouldExecuteWithoutException() { + void shouldExecuteWithoutException() { assertDoesNotThrow(() -> App.main(new String[]{})); } } diff --git a/unit-of-work/src/test/java/com/iluwatar/unitofwork/StudentRepositoryTest.java b/unit-of-work/src/test/java/com/iluwatar/unitofwork/StudentRepositoryTest.java index e00340d84..760d4a21b 100644 --- a/unit-of-work/src/test/java/com/iluwatar/unitofwork/StudentRepositoryTest.java +++ b/unit-of-work/src/test/java/com/iluwatar/unitofwork/StudentRepositoryTest.java @@ -23,43 +23,32 @@ package com.iluwatar.unitofwork; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; /** * tests {@link StudentRepository} */ -@RunWith(MockitoJUnitRunner.class) -public class StudentRepositoryTest { + +class StudentRepositoryTest { private final Student student1 = new Student(1, "Ram", "street 9, cupertino"); private final Student student2 = new Student(1, "Sham", "Z bridge, pune"); - private Map> context; - @Mock - private StudentDatabase studentDatabase; - private StudentRepository studentRepository; - - @Before - public void setUp() { - context = new HashMap<>(); - studentRepository = new StudentRepository(context, studentDatabase); - } + private final Map> context = new HashMap<>(); + private final StudentDatabase studentDatabase = mock(StudentDatabase.class); + private final StudentRepository studentRepository = new StudentRepository(context, studentDatabase);; @Test - public void shouldSaveNewStudentWithoutWritingToDb() { + void shouldSaveNewStudentWithoutWritingToDb() { studentRepository.registerNew(student1); studentRepository.registerNew(student2); @@ -68,7 +57,7 @@ public class StudentRepositoryTest { } @Test - public void shouldSaveDeletedStudentWithoutWritingToDb() { + void shouldSaveDeletedStudentWithoutWritingToDb() { studentRepository.registerDeleted(student1); studentRepository.registerDeleted(student2); @@ -77,7 +66,7 @@ public class StudentRepositoryTest { } @Test - public void shouldSaveModifiedStudentWithoutWritingToDb() { + void shouldSaveModifiedStudentWithoutWritingToDb() { studentRepository.registerModified(student1); studentRepository.registerModified(student2); @@ -86,7 +75,7 @@ public class StudentRepositoryTest { } @Test - public void shouldSaveAllLocalChangesToDb() { + void shouldSaveAllLocalChangesToDb() { context.put(UnitActions.INSERT.getActionValue(), List.of(student1)); context.put(UnitActions.MODIFY.getActionValue(), List.of(student1)); context.put(UnitActions.DELETE.getActionValue(), List.of(student1)); @@ -99,7 +88,7 @@ public class StudentRepositoryTest { } @Test - public void shouldNotWriteToDbIfContextIsNull() { + void shouldNotWriteToDbIfContextIsNull() { var studentRepository = new StudentRepository(null, studentDatabase); studentRepository.commit(); @@ -108,16 +97,16 @@ public class StudentRepositoryTest { } @Test - public void shouldNotWriteToDbIfNothingToCommit() { + void shouldNotWriteToDbIfNothingToCommit() { var studentRepository = new StudentRepository(new HashMap<>(), studentDatabase); studentRepository.commit(); - verifyZeroInteractions(studentDatabase); + verifyNoMoreInteractions(studentDatabase); } @Test - public void shouldNotInsertToDbIfNoRegisteredStudentsToBeCommitted() { + void shouldNotInsertToDbIfNoRegisteredStudentsToBeCommitted() { context.put(UnitActions.MODIFY.getActionValue(), List.of(student1)); context.put(UnitActions.DELETE.getActionValue(), List.of(student1)); @@ -127,7 +116,7 @@ public class StudentRepositoryTest { } @Test - public void shouldNotModifyToDbIfNotRegisteredStudentsToBeCommitted() { + void shouldNotModifyToDbIfNotRegisteredStudentsToBeCommitted() { context.put(UnitActions.INSERT.getActionValue(), List.of(student1)); context.put(UnitActions.DELETE.getActionValue(), List.of(student1)); @@ -137,7 +126,7 @@ public class StudentRepositoryTest { } @Test - public void shouldNotDeleteFromDbIfNotRegisteredStudentsToBeCommitted() { + void shouldNotDeleteFromDbIfNotRegisteredStudentsToBeCommitted() { context.put(UnitActions.INSERT.getActionValue(), List.of(student1)); context.put(UnitActions.MODIFY.getActionValue(), List.of(student1)); @@ -145,4 +134,4 @@ public class StudentRepositoryTest { verify(studentDatabase, never()).delete(student1); } -} \ No newline at end of file +}