diff --git a/prototype/src/test/java/com/iluwatar/prototype/AppTest.java b/prototype/src/test/java/com/iluwatar/prototype/AppTest.java
index 48c70429a..e7a8c81ae 100644
--- a/prototype/src/test/java/com/iluwatar/prototype/AppTest.java
+++ b/prototype/src/test/java/com/iluwatar/prototype/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.prototype;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/prototype/src/test/java/com/iluwatar/prototype/HeroFactoryImplTest.java b/prototype/src/test/java/com/iluwatar/prototype/HeroFactoryImplTest.java
index bee05bc5e..ea164befd 100644
--- a/prototype/src/test/java/com/iluwatar/prototype/HeroFactoryImplTest.java
+++ b/prototype/src/test/java/com/iluwatar/prototype/HeroFactoryImplTest.java
@@ -22,9 +22,9 @@
*/
package com.iluwatar.prototype;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/prototype/src/test/java/com/iluwatar/prototype/PrototypeTest.java b/prototype/src/test/java/com/iluwatar/prototype/PrototypeTest.java
index 839f27bc7..0102428c6 100644
--- a/prototype/src/test/java/com/iluwatar/prototype/PrototypeTest.java
+++ b/prototype/src/test/java/com/iluwatar/prototype/PrototypeTest.java
@@ -22,27 +22,24 @@
*/
package com.iluwatar.prototype;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
import java.util.Arrays;
import java.util.Collection;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
/**
* Date: 12/28/15 - 8:45 PM
* @param Prototype
* @author Jeroen Meulemeester
*/
-@RunWith(Parameterized.class)
public class PrototypeTest
{
-
- @Parameterized.Parameters
- public static Collection data() {
+ static Collection dataProvider() {
return Arrays.asList(
new Object[]{new OrcBeast(), "Orcish wolf"},
new Object[]{new OrcMage(), "Orcish mage"},
@@ -53,35 +50,15 @@ public class PrototypeTest {
);
}
- /**
- * The tested prototype instance
- */
- private final P testedPrototype;
+ @ParameterizedTest
+ @MethodSource("dataProvider")
+ public void testPrototype(P testedPrototype, String expectedToString) throws Exception {
+ assertEquals(expectedToString, testedPrototype.toString());
- /**
- * The expected {@link Prototype#toString()} value
- */
- private final String expectedToString;
-
- /**
- * Create a new test instance, using the given test object and expected value
- *
- * @param testedPrototype The tested prototype instance
- * @param expectedToString The expected {@link Prototype#toString()} value
- */
- public PrototypeTest(final P testedPrototype, final String expectedToString) {
- this.expectedToString = expectedToString;
- this.testedPrototype = testedPrototype;
- }
-
- @Test
- public void testPrototype() throws Exception {
- assertEquals(this.expectedToString, this.testedPrototype.toString());
-
- final Object clone = this.testedPrototype.clone();
+ final Object clone = testedPrototype.clone();
assertNotNull(clone);
- assertNotSame(clone, this.testedPrototype);
- assertSame(this.testedPrototype.getClass(), clone.getClass());
+ assertNotSame(clone, testedPrototype);
+ assertSame(testedPrototype.getClass(), clone.getClass());
}
}
diff --git a/proxy/pom.xml b/proxy/pom.xml
index ea55330b7..4a07f820f 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -34,8 +34,13 @@
proxy
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/proxy/src/test/java/com/iluwatar/proxy/AppTest.java b/proxy/src/test/java/com/iluwatar/proxy/AppTest.java
index d22d9c4bd..45bb38adc 100644
--- a/proxy/src/test/java/com/iluwatar/proxy/AppTest.java
+++ b/proxy/src/test/java/com/iluwatar/proxy/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.proxy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.java b/proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.java
index 944193a0a..728223fa9 100644
--- a/proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.java
+++ b/proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.java
@@ -23,14 +23,12 @@
package com.iluwatar.proxy;
import com.iluwatar.proxy.utils.InMemoryAppender;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests for {@link IvoryTower}
@@ -39,12 +37,12 @@ public class IvoryTowerTest {
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender(IvoryTower.class);
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}
diff --git a/proxy/src/test/java/com/iluwatar/proxy/WizardTest.java b/proxy/src/test/java/com/iluwatar/proxy/WizardTest.java
index ce5637214..f6bbe4a2d 100644
--- a/proxy/src/test/java/com/iluwatar/proxy/WizardTest.java
+++ b/proxy/src/test/java/com/iluwatar/proxy/WizardTest.java
@@ -22,9 +22,9 @@
*/
package com.iluwatar.proxy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests for {@link Wizard}
diff --git a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java b/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java
index 2958376d6..b8c6c9ff5 100644
--- a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java
+++ b/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java
@@ -23,12 +23,12 @@
package com.iluwatar.proxy;
import com.iluwatar.proxy.utils.InMemoryAppender;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests for {@link WizardTowerProxy}
@@ -37,12 +37,12 @@ public class WizardTowerProxyTest {
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender();
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}
diff --git a/publish-subscribe/pom.xml b/publish-subscribe/pom.xml
index ebd82f3a7..2356c57ac 100644
--- a/publish-subscribe/pom.xml
+++ b/publish-subscribe/pom.xml
@@ -41,8 +41,14 @@
camel-stream
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
\ No newline at end of file
diff --git a/publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/AppTest.java b/publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/AppTest.java
index 216ba49f0..128385faf 100644
--- a/publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/AppTest.java
+++ b/publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.publish.subscribe;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/queue-load-leveling/pom.xml b/queue-load-leveling/pom.xml
index 57741ed52..032534eeb 100644
--- a/queue-load-leveling/pom.xml
+++ b/queue-load-leveling/pom.xml
@@ -34,8 +34,13 @@
queue-load-leveling
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/AppTest.java b/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/AppTest.java
index d1cf75ca8..820062574 100644
--- a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/AppTest.java
+++ b/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/AppTest.java
@@ -22,9 +22,9 @@
*/
package com.iluwatar.queue.load.leveling;
-import java.io.IOException;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
+import java.io.IOException;
/**
* Application Test
diff --git a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageQueueTest.java b/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageQueueTest.java
index 30b5d7ce0..13a1db706 100644
--- a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageQueueTest.java
+++ b/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageQueueTest.java
@@ -22,9 +22,9 @@
*/
package com.iluwatar.queue.load.leveling;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
diff --git a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageTest.java b/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageTest.java
index 93ef723ea..d6b0167cf 100644
--- a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageTest.java
+++ b/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageTest.java
@@ -22,8 +22,9 @@
*/
package com.iluwatar.queue.load.leveling;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
diff --git a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/TaskGenSrvExeTest.java b/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/TaskGenSrvExeTest.java
index a773c377e..12fb4bf33 100644
--- a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/TaskGenSrvExeTest.java
+++ b/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/TaskGenSrvExeTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.queue.load.leveling;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/reactor/pom.xml b/reactor/pom.xml
index 9ab44d2c0..f9c546e21 100644
--- a/reactor/pom.xml
+++ b/reactor/pom.xml
@@ -34,8 +34,13 @@
reactor
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/reactor/src/test/java/com/iluwatar/reactor/app/ReactorTest.java b/reactor/src/test/java/com/iluwatar/reactor/app/ReactorTest.java
index 7aa80f8cc..7b45c6053 100644
--- a/reactor/src/test/java/com/iluwatar/reactor/app/ReactorTest.java
+++ b/reactor/src/test/java/com/iluwatar/reactor/app/ReactorTest.java
@@ -22,16 +22,14 @@
*/
package com.iluwatar.reactor.app;
-import java.io.IOException;
-
-import com.iluwatar.reactor.framework.NioReactor;
-import org.junit.Test;
-
import com.iluwatar.reactor.framework.SameThreadDispatcher;
import com.iluwatar.reactor.framework.ThreadPoolDispatcher;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+
/**
*
* This class tests the Distributed Logging service by starting a Reactor and then sending it
diff --git a/reader-writer-lock/pom.xml b/reader-writer-lock/pom.xml
index d5ea9114c..79d6f93ff 100644
--- a/reader-writer-lock/pom.xml
+++ b/reader-writer-lock/pom.xml
@@ -35,8 +35,13 @@
reader-writer-lock
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/AppTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/AppTest.java
index fd0cd4b27..fbdf3f846 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/AppTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.reader.writer.lock;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Application test
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java
index adc2adae2..c8de8c511 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java
@@ -24,9 +24,9 @@
package com.iluwatar.reader.writer.lock;
import com.iluwatar.reader.writer.lock.utils.InMemoryAppender;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +34,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author hongshuwei@gmail.com
@@ -43,12 +43,12 @@ public class ReaderAndWriterTest {
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender();
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java
index c9b3eb72c..8fe5912ea 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java
@@ -23,9 +23,9 @@
package com.iluwatar.reader.writer.lock;
import com.iluwatar.reader.writer.lock.utils.InMemoryAppender;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +33,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.spy;
/**
@@ -43,12 +43,12 @@ public class ReaderTest {
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender(Reader.class);
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java
index 7c4b4148d..bb01e11b0 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java
@@ -23,9 +23,9 @@
package com.iluwatar.reader.writer.lock;
import com.iluwatar.reader.writer.lock.utils.InMemoryAppender;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +33,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.spy;
/**
@@ -43,12 +43,12 @@ public class WriterTest {
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender(Writer.class);
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}
diff --git a/repository/pom.xml b/repository/pom.xml
index f12c40113..c5b644b3d 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -34,8 +34,9 @@
repository
- org.springframework
- spring-test
+ com.github.sbrannen
+ spring-test-junit5
+ test
org.springframework.data
@@ -54,8 +55,13 @@
h2
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java
index cb84b1ae8..4cfb6e022 100644
--- a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java
+++ b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java
@@ -22,21 +22,21 @@
*/
package com.iluwatar.repository;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
import com.google.common.collect.Lists;
@@ -46,7 +46,7 @@ import com.google.common.collect.Lists;
* by {@link org.springframework.data.jpa.domain.Specification} are also test.
*
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = { AppConfig.class }, loader = AnnotationConfigContextLoader.class)
public class AnnotationBasedRepositoryTest {
@@ -63,7 +63,7 @@ public class AnnotationBasedRepositoryTest {
/**
* Prepare data for test
*/
- @Before
+ @BeforeEach
public void setup() {
repository.save(persons);
@@ -123,7 +123,7 @@ public class AnnotationBasedRepositoryTest {
assertEquals(terry, actual);
}
- @After
+ @AfterEach
public void cleanup() {
repository.deleteAll();
diff --git a/repository/src/test/java/com/iluwatar/repository/AppConfigTest.java b/repository/src/test/java/com/iluwatar/repository/AppConfigTest.java
index 6d6a58e8d..882d2bef7 100644
--- a/repository/src/test/java/com/iluwatar/repository/AppConfigTest.java
+++ b/repository/src/test/java/com/iluwatar/repository/AppConfigTest.java
@@ -22,19 +22,19 @@
*/
package com.iluwatar.repository;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.sql.ResultSet;
import java.sql.SQLException;
import javax.sql.DataSource;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
import org.springframework.transaction.annotation.Transactional;
@@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
* This case is Just for test the Annotation Based configuration
*
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = { AppConfig.class }, loader = AnnotationConfigContextLoader.class)
public class AppConfigTest {
diff --git a/repository/src/test/java/com/iluwatar/repository/AppTest.java b/repository/src/test/java/com/iluwatar/repository/AppTest.java
index d3f05caaa..17052b51e 100644
--- a/repository/src/test/java/com/iluwatar/repository/AppTest.java
+++ b/repository/src/test/java/com/iluwatar/repository/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.repository;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java
index 3201c024c..6a347ffd4 100644
--- a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java
+++ b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java
@@ -22,21 +22,21 @@
*/
package com.iluwatar.repository;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import com.google.common.collect.Lists;
@@ -44,7 +44,7 @@ import com.google.common.collect.Lists;
* Test case to test the functions of {@link PersonRepository}, beside the CRUD functions, the query
* by {@link org.springframework.data.jpa.domain.Specification} are also test.
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
@ContextConfiguration(locations = { "classpath:applicationContext.xml" })
public class RepositoryTest {
@@ -61,7 +61,7 @@ public class RepositoryTest {
/**
* Prepare data for test
*/
- @Before
+ @BeforeEach
public void setup() {
repository.save(persons);
@@ -121,7 +121,7 @@ public class RepositoryTest {
assertEquals(terry, actual);
}
- @After
+ @AfterEach
public void cleanup() {
repository.deleteAll();
diff --git a/resource-acquisition-is-initialization/pom.xml b/resource-acquisition-is-initialization/pom.xml
index 7a6716d7b..0e9c5116d 100644
--- a/resource-acquisition-is-initialization/pom.xml
+++ b/resource-acquisition-is-initialization/pom.xml
@@ -34,8 +34,13 @@
resource-acquisition-is-initialization
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/AppTest.java b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/AppTest.java
index 1d7b4137a..f2b0cdbe0 100644
--- a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/AppTest.java
+++ b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.resource.acquisition.is.initialization;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java
index 6786416fa..4bfdf4a8b 100644
--- a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java
+++ b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java
@@ -22,18 +22,19 @@
*/
package com.iluwatar.resource.acquisition.is.initialization;
-import static org.junit.Assert.assertTrue;
-
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.AppenderBase;
import java.util.LinkedList;
import java.util.List;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Date: 12/28/15 - 9:31 PM
*
@@ -43,12 +44,12 @@ public class ClosableTest {
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender();
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}
diff --git a/retry/pom.xml b/retry/pom.xml
index 5271f43de..1e23bf7d9 100644
--- a/retry/pom.xml
+++ b/retry/pom.xml
@@ -32,8 +32,13 @@
jar
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/retry/src/test/java/com/iluwatar/retry/FindCustomerTest.java b/retry/src/test/java/com/iluwatar/retry/FindCustomerTest.java
index 634443fef..46c4c62e6 100644
--- a/retry/src/test/java/com/iluwatar/retry/FindCustomerTest.java
+++ b/retry/src/test/java/com/iluwatar/retry/FindCustomerTest.java
@@ -24,9 +24,11 @@
package com.iluwatar.retry;
+import org.junit.jupiter.api.Test;
+
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Unit tests for {@link FindCustomer}.
@@ -50,9 +52,11 @@ public class FindCustomerTest {
*
* @throws Exception the expected exception
*/
- @Test(expected = BusinessException.class)
+ @Test
public void oneException() throws Exception {
- new FindCustomer("123", new BusinessException("test")).perform();
+ assertThrows(BusinessException.class, () -> {
+ new FindCustomer("123", new BusinessException("test")).perform();
+ });
}
/**
diff --git a/retry/src/test/java/com/iluwatar/retry/RetryTest.java b/retry/src/test/java/com/iluwatar/retry/RetryTest.java
index c66c41354..233e0e588 100644
--- a/retry/src/test/java/com/iluwatar/retry/RetryTest.java
+++ b/retry/src/test/java/com/iluwatar/retry/RetryTest.java
@@ -24,10 +24,11 @@
package com.iluwatar.retry;
+import org.junit.jupiter.api.Test;
+
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.is;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* Unit tests for {@link Retry}.
diff --git a/semaphore/pom.xml b/semaphore/pom.xml
index 4fa1733f4..680cdeba5 100644
--- a/semaphore/pom.xml
+++ b/semaphore/pom.xml
@@ -34,8 +34,13 @@
semaphore
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/semaphore/src/test/java/com/iluwatar/semaphore/AppTest.java b/semaphore/src/test/java/com/iluwatar/semaphore/AppTest.java
index 5eaed3b2e..6ad023e5d 100644
--- a/semaphore/src/test/java/com/iluwatar/semaphore/AppTest.java
+++ b/semaphore/src/test/java/com/iluwatar/semaphore/AppTest.java
@@ -22,7 +22,8 @@
*/
package com.iluwatar.semaphore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
import java.io.IOException;
/**
diff --git a/semaphore/src/test/java/com/iluwatar/semaphore/FruitBowlTest.java b/semaphore/src/test/java/com/iluwatar/semaphore/FruitBowlTest.java
index 30a7dce44..7bc391478 100644
--- a/semaphore/src/test/java/com/iluwatar/semaphore/FruitBowlTest.java
+++ b/semaphore/src/test/java/com/iluwatar/semaphore/FruitBowlTest.java
@@ -22,8 +22,11 @@
*/
package com.iluwatar.semaphore;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Test taking from and putting Fruit into a FruitBowl
diff --git a/semaphore/src/test/java/com/iluwatar/semaphore/SemaphoreTest.java b/semaphore/src/test/java/com/iluwatar/semaphore/SemaphoreTest.java
index b787a3301..ad67026ae 100644
--- a/semaphore/src/test/java/com/iluwatar/semaphore/SemaphoreTest.java
+++ b/semaphore/src/test/java/com/iluwatar/semaphore/SemaphoreTest.java
@@ -22,8 +22,10 @@
*/
package com.iluwatar.semaphore;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test case for acquiring and releasing a Semaphore
diff --git a/servant/pom.xml b/servant/pom.xml
index daa44d223..c12ff043c 100644
--- a/servant/pom.xml
+++ b/servant/pom.xml
@@ -34,8 +34,13 @@
servant
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/servant/src/test/java/com/iluwatar/servant/AppTest.java b/servant/src/test/java/com/iluwatar/servant/AppTest.java
index 5b8908d80..6226c272d 100644
--- a/servant/src/test/java/com/iluwatar/servant/AppTest.java
+++ b/servant/src/test/java/com/iluwatar/servant/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.servant;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/servant/src/test/java/com/iluwatar/servant/KingTest.java b/servant/src/test/java/com/iluwatar/servant/KingTest.java
index 3ebbaf28b..969cc3d43 100644
--- a/servant/src/test/java/com/iluwatar/servant/KingTest.java
+++ b/servant/src/test/java/com/iluwatar/servant/KingTest.java
@@ -22,9 +22,10 @@
*/
package com.iluwatar.servant;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Date: 12/28/15 - 9:40 PM
diff --git a/servant/src/test/java/com/iluwatar/servant/QueenTest.java b/servant/src/test/java/com/iluwatar/servant/QueenTest.java
index d425886ba..17498e248 100644
--- a/servant/src/test/java/com/iluwatar/servant/QueenTest.java
+++ b/servant/src/test/java/com/iluwatar/servant/QueenTest.java
@@ -22,9 +22,11 @@
*/
package com.iluwatar.servant;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Date: 12/28/15 - 9:52 PM
diff --git a/servant/src/test/java/com/iluwatar/servant/ServantTest.java b/servant/src/test/java/com/iluwatar/servant/ServantTest.java
index 900ccc418..16e1d3c00 100644
--- a/servant/src/test/java/com/iluwatar/servant/ServantTest.java
+++ b/servant/src/test/java/com/iluwatar/servant/ServantTest.java
@@ -22,12 +22,12 @@
*/
package com.iluwatar.servant;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/service-layer/pom.xml b/service-layer/pom.xml
index 6edbeba44..45c7c32f3 100644
--- a/service-layer/pom.xml
+++ b/service-layer/pom.xml
@@ -40,11 +40,16 @@
com.h2database
h2
-
+
- junit
- junit
- test
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
org.mockito
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/app/AppTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/app/AppTest.java
index a667252a1..295383513 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/app/AppTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/app/AppTest.java
@@ -23,9 +23,8 @@
package com.iluwatar.servicelayer.app;
import com.iluwatar.servicelayer.hibernate.HibernateUtil;
-
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
/**
*
@@ -40,7 +39,7 @@ public class AppTest {
App.main(args);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
HibernateUtil.dropSession();
}
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java
index 694fc746d..2bc557d75 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java
@@ -22,17 +22,18 @@
*/
package com.iluwatar.servicelayer.common;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
import com.iluwatar.servicelayer.hibernate.HibernateUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Date: 12/28/15 - 10:53 PM
@@ -74,7 +75,7 @@ public abstract class BaseDaoTest
this.dao = dao;
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
for (int i = 0; i < INITIAL_COUNT; i++) {
final String className = dao.persistentClass.getSimpleName();
@@ -83,7 +84,7 @@ public abstract class BaseDaoTest
}
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
HibernateUtil.dropSession();
}
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/magic/MagicServiceImplTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/magic/MagicServiceImplTest.java
index 05ad6f887..66750c5b2 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/magic/MagicServiceImplTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/magic/MagicServiceImplTest.java
@@ -28,15 +28,14 @@ import com.iluwatar.servicelayer.spellbook.Spellbook;
import com.iluwatar.servicelayer.spellbook.SpellbookDao;
import com.iluwatar.servicelayer.wizard.Wizard;
import com.iluwatar.servicelayer.wizard.WizardDao;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/spell/SpellDaoImplTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/spell/SpellDaoImplTest.java
index b6b4917c8..e4a5bfa65 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/spell/SpellDaoImplTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/spell/SpellDaoImplTest.java
@@ -23,13 +23,12 @@
package com.iluwatar.servicelayer.spell;
import com.iluwatar.servicelayer.common.BaseDaoTest;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Date: 12/28/15 - 11:02 PM
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImplTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImplTest.java
index fb7eca15a..a6f1b3ea3 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImplTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImplTest.java
@@ -23,13 +23,12 @@
package com.iluwatar.servicelayer.spellbook;
import com.iluwatar.servicelayer.common.BaseDaoTest;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Date: 12/28/15 - 11:44 PM
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/wizard/WizardDaoImplTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/wizard/WizardDaoImplTest.java
index 64bd72c7a..d8a093319 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/wizard/WizardDaoImplTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/wizard/WizardDaoImplTest.java
@@ -23,13 +23,12 @@
package com.iluwatar.servicelayer.wizard;
import com.iluwatar.servicelayer.common.BaseDaoTest;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Date: 12/28/15 - 11:46 PM
diff --git a/service-locator/pom.xml b/service-locator/pom.xml
index 7cd4028ff..e54e1d01c 100644
--- a/service-locator/pom.xml
+++ b/service-locator/pom.xml
@@ -34,8 +34,13 @@
service-locator
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/service-locator/src/test/java/com/iluwatar/servicelocator/AppTest.java b/service-locator/src/test/java/com/iluwatar/servicelocator/AppTest.java
index 1228898f2..be844b16a 100644
--- a/service-locator/src/test/java/com/iluwatar/servicelocator/AppTest.java
+++ b/service-locator/src/test/java/com/iluwatar/servicelocator/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.servicelocator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java b/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java
index 5dbbcdaf7..1741f6d94 100644
--- a/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java
+++ b/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java
@@ -22,13 +22,13 @@
*/
package com.iluwatar.servicelocator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Date: 12/29/15 - 19:07 PM
diff --git a/singleton/pom.xml b/singleton/pom.xml
index 00794e25a..3a6b21139 100644
--- a/singleton/pom.xml
+++ b/singleton/pom.xml
@@ -34,8 +34,13 @@
singleton
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/singleton/src/test/java/com/iluwatar/singleton/AppTest.java b/singleton/src/test/java/com/iluwatar/singleton/AppTest.java
index 951c5c4fd..2452b923d 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/AppTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.singleton;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/singleton/src/test/java/com/iluwatar/singleton/SingletonTest.java b/singleton/src/test/java/com/iluwatar/singleton/SingletonTest.java
index f468ad0b8..ff9045339 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/SingletonTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/SingletonTest.java
@@ -22,8 +22,8 @@
*/
package com.iluwatar.singleton;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +32,11 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.function.Supplier;
-import org.junit.Test;
+
+import static java.time.Duration.ofMillis;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
/**
* This class provides several test case that test singleton construction.
@@ -80,29 +84,30 @@ public abstract class SingletonTest {
/**
* Test singleton instance in a concurrent setting
*/
- @Test(timeout = 10000)
+ @Test
public void testMultipleCallsReturnTheSameObjectInDifferentThreads() throws Exception {
+ assertTimeout(ofMillis(10000), () -> {
+ // Create 10000 tasks and inside each callable instantiate the singleton class
+ final List> tasks = new ArrayList<>();
+ for (int i = 0; i < 10000; i++) {
+ tasks.add(this.singletonInstanceMethod::get);
+ }
- // Create 10000 tasks and inside each callable instantiate the singleton class
- final List> tasks = new ArrayList<>();
- for (int i = 0; i < 10000; i++) {
- tasks.add(this.singletonInstanceMethod::get);
- }
+ // Use up to 8 concurrent threads to handle the tasks
+ final ExecutorService executorService = Executors.newFixedThreadPool(8);
+ final List> results = executorService.invokeAll(tasks);
- // Use up to 8 concurrent threads to handle the tasks
- final ExecutorService executorService = Executors.newFixedThreadPool(8);
- final List> results = executorService.invokeAll(tasks);
+ // wait for all of the threads to complete
+ final S expectedInstance = this.singletonInstanceMethod.get();
+ for (Future res : results) {
+ final S instance = res.get();
+ assertNotNull(instance);
+ assertSame(expectedInstance, instance);
+ }
- // wait for all of the threads to complete
- final S expectedInstance = this.singletonInstanceMethod.get();
- for (Future res : results) {
- final S instance = res.get();
- assertNotNull(instance);
- assertSame(expectedInstance, instance);
- }
-
- // tidy up the executor
- executorService.shutdown();
+ // tidy up the executor
+ executorService.shutdown();
+ });
}
diff --git a/specification/pom.xml b/specification/pom.xml
index 76732b964..f84464d22 100644
--- a/specification/pom.xml
+++ b/specification/pom.xml
@@ -34,8 +34,18 @@
specification
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-params
test
diff --git a/specification/src/test/java/com/iluwatar/specification/app/AppTest.java b/specification/src/test/java/com/iluwatar/specification/app/AppTest.java
index a11101670..8cd648e58 100644
--- a/specification/src/test/java/com/iluwatar/specification/app/AppTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/app/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.specification.app;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/specification/src/test/java/com/iluwatar/specification/creature/CreatureTest.java b/specification/src/test/java/com/iluwatar/specification/creature/CreatureTest.java
index 1c969891b..2d43c8d59 100644
--- a/specification/src/test/java/com/iluwatar/specification/creature/CreatureTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/creature/CreatureTest.java
@@ -25,30 +25,26 @@ package com.iluwatar.specification.creature;
import com.iluwatar.specification.property.Color;
import com.iluwatar.specification.property.Movement;
import com.iluwatar.specification.property.Size;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
import java.util.Arrays;
import java.util.Collection;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Date: 12/29/15 - 7:47 PM
*
* @author Jeroen Meulemeester
*/
-@RunWith(Parameterized.class)
public class CreatureTest {
/**
* @return The tested {@link Creature} instance and its expected specs
*/
- @Parameterized.Parameters
- public static Collection data() {
+ public static Collection dataProvider() {
return Arrays.asList(
new Object[]{new Dragon(), "Dragon", Size.LARGE, Movement.FLYING, Color.RED},
new Object[]{new Goblin(), "Goblin", Size.SMALL, Movement.WALKING, Color.GREEN},
@@ -59,71 +55,36 @@ public class CreatureTest {
);
}
- /**
- * The tested creature
- */
- private final Creature testedCreature;
-
- /**
- * The expected name of the tested creature
- */
- private final String name;
-
- /**
- * The expected size of the tested creature
- */
- private final Size size;
-
- /**
- * The expected movement type of the tested creature
- */
- private final Movement movement;
-
- /**
- * The expected color of the tested creature
- */
- private final Color color;
-
- /**
- * @param testedCreature The tested creature
- * @param name The expected name of the creature
- * @param size The expected size of the creature
- * @param movement The expected movement type of the creature
- * @param color The expected color of the creature
- */
- public CreatureTest(final Creature testedCreature, final String name, final Size size,
- final Movement movement, final Color color) {
- this.testedCreature = testedCreature;
- this.name = name;
- this.size = size;
- this.movement = movement;
- this.color = color;
+ @ParameterizedTest
+ @MethodSource("dataProvider")
+ public void testGetName(Creature testedCreature, String name) throws Exception {
+ assertEquals(name, testedCreature.getName());
}
-
- @Test
- public void testGetName() throws Exception {
- assertEquals(this.name, this.testedCreature.getName());
+ @ParameterizedTest
+ @MethodSource("dataProvider")
+ public void testGetSize(Creature testedCreature, String name, Size size) throws Exception {
+ assertEquals(size, testedCreature.getSize());
}
- @Test
- public void testGetSize() throws Exception {
- assertEquals(this.size, this.testedCreature.getSize());
+ @ParameterizedTest
+ @MethodSource("dataProvider")
+ public void testGetMovement(Creature testedCreature, String name, Size size, Movement movement) throws Exception {
+ assertEquals(movement, testedCreature.getMovement());
}
- @Test
- public void testGetMovement() throws Exception {
- assertEquals(this.movement, this.testedCreature.getMovement());
+ @ParameterizedTest
+ @MethodSource("dataProvider")
+ public void testGetColor(Creature testedCreature, String name, Size size, Movement movement,
+ Color color) throws Exception {
+ assertEquals(color, testedCreature.getColor());
}
- @Test
- public void testGetColor() throws Exception {
- assertEquals(this.color, this.testedCreature.getColor());
- }
-
- @Test
- public void testToString() throws Exception {
- final String toString = this.testedCreature.toString();
+ @ParameterizedTest
+ @MethodSource("dataProvider")
+ public void testToString(Creature testedCreature, String name, Size size, Movement movement,
+ Color color) throws Exception {
+ final String toString = testedCreature.toString();
assertNotNull(toString);
assertEquals(
String.format("%s [size=%s, movement=%s, color=%s]", name, size, movement, color),
diff --git a/specification/src/test/java/com/iluwatar/specification/selector/ColorSelectorTest.java b/specification/src/test/java/com/iluwatar/specification/selector/ColorSelectorTest.java
index 52b176915..5765c1c56 100644
--- a/specification/src/test/java/com/iluwatar/specification/selector/ColorSelectorTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/selector/ColorSelectorTest.java
@@ -24,11 +24,10 @@ package com.iluwatar.specification.selector;
import com.iluwatar.specification.creature.Creature;
import com.iluwatar.specification.property.Color;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java b/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java
index b9e86193e..8c7c0a54e 100644
--- a/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java
@@ -23,13 +23,11 @@
package com.iluwatar.specification.selector;
import com.iluwatar.specification.creature.Creature;
-import com.iluwatar.specification.property.Color;
import com.iluwatar.specification.property.Movement;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java b/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java
index f2b6b80b7..c15e932bc 100644
--- a/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java
@@ -24,11 +24,10 @@ package com.iluwatar.specification.selector;
import com.iluwatar.specification.creature.Creature;
import com.iluwatar.specification.property.Size;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/state/pom.xml b/state/pom.xml
index 256a5e9e2..e1c458b73 100644
--- a/state/pom.xml
+++ b/state/pom.xml
@@ -34,13 +34,13 @@
state
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
test
- org.mockito
- mockito-core
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/state/src/test/java/com/iluwatar/state/AppTest.java b/state/src/test/java/com/iluwatar/state/AppTest.java
index cb40d0481..16bffb2af 100644
--- a/state/src/test/java/com/iluwatar/state/AppTest.java
+++ b/state/src/test/java/com/iluwatar/state/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.state;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/state/src/test/java/com/iluwatar/state/MammothTest.java b/state/src/test/java/com/iluwatar/state/MammothTest.java
index 60f4b18f4..5c3bf3e69 100644
--- a/state/src/test/java/com/iluwatar/state/MammothTest.java
+++ b/state/src/test/java/com/iluwatar/state/MammothTest.java
@@ -25,16 +25,16 @@ package com.iluwatar.state;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.AppenderBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.LoggerFactory;
import java.util.LinkedList;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Date: 12/29/15 - 8:27 PM
@@ -45,12 +45,12 @@ public class MammothTest {
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender();
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}
diff --git a/step-builder/pom.xml b/step-builder/pom.xml
index 432d5477a..9cbfa9abf 100644
--- a/step-builder/pom.xml
+++ b/step-builder/pom.xml
@@ -35,8 +35,13 @@
step-builder
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/step-builder/src/test/java/com/iluwatar/stepbuilder/AppTest.java b/step-builder/src/test/java/com/iluwatar/stepbuilder/AppTest.java
index af1ddfb58..a5b7c952f 100644
--- a/step-builder/src/test/java/com/iluwatar/stepbuilder/AppTest.java
+++ b/step-builder/src/test/java/com/iluwatar/stepbuilder/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.stepbuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java b/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java
index 962feeabb..220e3f89a 100644
--- a/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java
+++ b/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java
@@ -22,14 +22,14 @@
*/
package com.iluwatar.stepbuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Date: 12/29/15 - 9:21 PM
diff --git a/strategy/pom.xml b/strategy/pom.xml
index cd2d7e9a0..81b64220b 100644
--- a/strategy/pom.xml
+++ b/strategy/pom.xml
@@ -34,8 +34,18 @@
strategy
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-params
test
diff --git a/strategy/src/test/java/com/iluwatar/strategy/AppTest.java b/strategy/src/test/java/com/iluwatar/strategy/AppTest.java
index 59b3a22a9..c14af1bde 100644
--- a/strategy/src/test/java/com/iluwatar/strategy/AppTest.java
+++ b/strategy/src/test/java/com/iluwatar/strategy/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.strategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java
index ad8b9784f..d22bf4235 100644
--- a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java
+++ b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.strategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java
index 52e596e5c..c988ad2f6 100644
--- a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java
+++ b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java
@@ -25,11 +25,10 @@ package com.iluwatar.strategy;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.AppenderBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.LoggerFactory;
import java.util.Arrays;
@@ -37,21 +36,19 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Date: 12/29/15 - 10:58 PM
*
* @author Jeroen Meulemeester
*/
-@RunWith(Parameterized.class)
public class DragonSlayingStrategyTest {
/**
* @return The test parameters for each cycle
*/
- @Parameterized.Parameters
- public static Collection data() {
+ static Collection dataProvider() {
return Arrays.asList(
new Object[]{
new MeleeStrategy(),
@@ -68,47 +65,27 @@ public class DragonSlayingStrategyTest {
);
}
- /**
- * The tested strategy
- */
- private final DragonSlayingStrategy strategy;
-
- /**
- * The expected action in the log
- */
- private final String expectedResult;
-
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender();
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}
- /**
- * Create a new test instance for the given strategy
- *
- * @param strategy The tested strategy
- * @param expectedResult The expected result
- */
- public DragonSlayingStrategyTest(final DragonSlayingStrategy strategy, final String expectedResult) {
- this.strategy = strategy;
- this.expectedResult = expectedResult;
- }
-
/**
* Test if executing the strategy gives the correct response
*/
- @Test
- public void testExecute() {
- this.strategy.execute();
- assertEquals(this.expectedResult, appender.getLastMessage());
+ @ParameterizedTest
+ @MethodSource("dataProvider")
+ public void testExecute(DragonSlayingStrategy strategy, String expectedResult) {
+ strategy.execute();
+ assertEquals(expectedResult, appender.getLastMessage());
assertEquals(1, appender.getLogSize());
}
diff --git a/template-method/pom.xml b/template-method/pom.xml
index 916d61b0b..700417a6e 100644
--- a/template-method/pom.xml
+++ b/template-method/pom.xml
@@ -34,8 +34,13 @@
template-method
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/AppTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/AppTest.java
index da85062f5..2974117ea 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/AppTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.templatemethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java
index 6cc80446c..86a823386 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.templatemethod;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java
index 98ac62613..884ffe6ee 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java
@@ -22,19 +22,19 @@
*/
package com.iluwatar.templatemethod;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.AppenderBase;
import java.util.LinkedList;
import java.util.List;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Date: 12/30/15 - 18:12 PM
* @param Type of StealingMethod
@@ -44,12 +44,12 @@ public abstract class StealingMethodTest {
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender();
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}
diff --git a/thread-pool/pom.xml b/thread-pool/pom.xml
index 94fce2b16..a20ff22a2 100644
--- a/thread-pool/pom.xml
+++ b/thread-pool/pom.xml
@@ -34,8 +34,13 @@
thread-pool
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java
index 2d21eec12..fafbce15e 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.threadpool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Application test
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/TaskTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/TaskTest.java
index 4a2a06de8..099cdc6e8 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/TaskTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/TaskTest.java
@@ -22,8 +22,7 @@
*/
package com.iluwatar.threadpool;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
@@ -33,11 +32,13 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import java.util.function.Function;
import java.util.function.IntFunction;
-import java.util.function.ToIntFunction;
import java.util.stream.Collectors;
-import org.junit.Test;
+
+import static java.time.Duration.ofMillis;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
/**
* Date: 12/30/15 - 18:22 PM
@@ -82,30 +83,31 @@ public abstract class TaskTest {
* Verify if the generated id is unique for each task, even if the tasks are created in separate
* threads
*/
- @Test(timeout = 10000)
+ @Test
public void testIdGeneration() throws Exception {
- final ExecutorService service = Executors.newFixedThreadPool(THREAD_COUNT);
+ assertTimeout(ofMillis(10000), () -> {
+ final ExecutorService service = Executors.newFixedThreadPool(THREAD_COUNT);
- final List> tasks = new ArrayList<>();
- for (int i = 0; i < TASK_COUNT; i++) {
- tasks.add(() -> factory.apply(1).getId());
- }
+ final List> tasks = new ArrayList<>();
+ for (int i = 0; i < TASK_COUNT; i++) {
+ tasks.add(() -> factory.apply(1).getId());
+ }
- final List ids = service.invokeAll(tasks)
- .stream()
- .map(TaskTest::get)
- .filter(Objects::nonNull)
- .collect(Collectors.toList());
+ final List ids = service.invokeAll(tasks)
+ .stream()
+ .map(TaskTest::get)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
- service.shutdownNow();
+ service.shutdownNow();
- final long uniqueIdCount = ids.stream()
- .distinct()
- .count();
-
- assertEquals(TASK_COUNT, ids.size());
- assertEquals(TASK_COUNT, uniqueIdCount);
+ final long uniqueIdCount = ids.stream()
+ .distinct()
+ .count();
+ assertEquals(TASK_COUNT, ids.size());
+ assertEquals(TASK_COUNT, uniqueIdCount);
+ });
}
/**
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java
index 81962ab2a..3b7186e98 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.threadpool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/throttling/pom.xml b/throttling/pom.xml
index 7c2ee8b9a..9ae7055b2 100644
--- a/throttling/pom.xml
+++ b/throttling/pom.xml
@@ -35,10 +35,16 @@
throttling
-
- junit
- junit
-
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
\ No newline at end of file
diff --git a/throttling/src/test/java/com/iluwatar/throttling/AppTest.java b/throttling/src/test/java/com/iluwatar/throttling/AppTest.java
index 37c8e75ec..97a54864c 100644
--- a/throttling/src/test/java/com/iluwatar/throttling/AppTest.java
+++ b/throttling/src/test/java/com/iluwatar/throttling/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.throttling;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Application test
diff --git a/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java b/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java
index aaab62b3a..0c15bac6e 100644
--- a/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java
+++ b/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java
@@ -22,11 +22,11 @@
*/
package com.iluwatar.throttling;
-import org.junit.Assert;
-import org.junit.Test;
-
import com.iluwatar.throttling.timer.ThrottleTimerImpl;
import com.iluwatar.throttling.timer.Throttler;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* B2BServiceTest class to test the B2BService
@@ -43,6 +43,6 @@ public class B2BServiceTest {
service.dummyCustomerApi(tenant);
}
long counter = CallsCount.getCount(tenant.getName());
- Assert.assertTrue("Counter limit must be reached", counter == 2);
+ assertTrue(counter == 2, "Counter limit must be reached");
}
}
diff --git a/throttling/src/test/java/com/iluwatar/throttling/TenantTest.java b/throttling/src/test/java/com/iluwatar/throttling/TenantTest.java
index 2f0b5cf12..00e546d02 100644
--- a/throttling/src/test/java/com/iluwatar/throttling/TenantTest.java
+++ b/throttling/src/test/java/com/iluwatar/throttling/TenantTest.java
@@ -22,19 +22,21 @@
*/
package com.iluwatar.throttling;
-import org.junit.Test;
-
-import com.iluwatar.throttling.Tenant;
+import org.junit.jupiter.api.Test;
import java.security.InvalidParameterException;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
/**
* TenantTest to test the creation of Tenant with valid parameters.
*/
public class TenantTest {
- @Test(expected = InvalidParameterException.class)
+ @Test
public void constructorTest() {
- Tenant tenant = new Tenant("FailTenant", -1);
+ assertThrows(InvalidParameterException.class, () -> {
+ Tenant tenant = new Tenant("FailTenant", -1);
+ });
}
}
diff --git a/tls/pom.xml b/tls/pom.xml
index 40d6b2b21..65bfc2146 100644
--- a/tls/pom.xml
+++ b/tls/pom.xml
@@ -35,8 +35,13 @@
tls
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/tls/src/test/java/com/iluwatar/tls/AppTest.java b/tls/src/test/java/com/iluwatar/tls/AppTest.java
index 073c0988a..12bb1ea3c 100644
--- a/tls/src/test/java/com/iluwatar/tls/AppTest.java
+++ b/tls/src/test/java/com/iluwatar/tls/AppTest.java
@@ -23,7 +23,7 @@
package com.iluwatar.tls;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests that thread local storage example runs without errors.
diff --git a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java
index b4f24be9b..bb2dfafb7 100644
--- a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java
+++ b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java
@@ -32,10 +32,11 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
*
@@ -86,7 +87,7 @@ public class DateFormatCallableTest {
/**
* Run Callable and prepare results for usage in the test methods
*/
- @BeforeClass
+ @BeforeAll
public static void setup() {
// Create a callable
DateFormatCallable callableDf = new DateFormatCallable("dd/MM/yyyy", "15/12/2015");
diff --git a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java
index e0a1507e9..da1b9c264 100644
--- a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java
+++ b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java
@@ -30,10 +30,11 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
*
@@ -84,7 +85,7 @@ public class DateFormatCallableTestIncorrectDateFormat {
/**
* Run Callable and prepare results for usage in the test methods
*/
- @BeforeClass
+ @BeforeAll
public static void setup() {
// Create a callable. Pass a string date value not matching the format string
DateFormatCallable callableDf = new DateFormatCallable("dd/MM/yyyy", "15.12.2015");
diff --git a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java
index 635d6f25a..845ab366d 100644
--- a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java
+++ b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java
@@ -32,10 +32,11 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
*
@@ -90,7 +91,7 @@ public class DateFormatCallableTestMultiThread {
/**
* Run Callable and prepare results for usage in the test methods
*/
- @BeforeClass
+ @BeforeAll
public static void setup() {
// Create a callable
DateFormatCallable callableDf = new DateFormatCallable("dd/MM/yyyy", "15/12/2015");
diff --git a/tolerant-reader/pom.xml b/tolerant-reader/pom.xml
index 7e3561f80..01c2cf18a 100644
--- a/tolerant-reader/pom.xml
+++ b/tolerant-reader/pom.xml
@@ -34,8 +34,18 @@
tolerant-reader
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-migrationsupport
test
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 f24393779..07e6f6b89 100644
--- a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java
+++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java
@@ -22,9 +22,9 @@
*/
package com.iluwatar.tolerantreader;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
@@ -42,8 +42,8 @@ public class AppTest {
App.main(args);
}
- @Before
- @After
+ @BeforeEach
+ @AfterEach
public void cleanup() {
File file1 = new File("fish1.out");
file1.delete();
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 a6c7fc641..2785c8374 100644
--- a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java
+++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java
@@ -23,19 +23,21 @@
package com.iluwatar.tolerantreader;
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport;
import org.junit.rules.TemporaryFolder;
import java.io.File;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
/**
* Date: 12/30/15 - 18:39 PM
*
* @author Jeroen Meulemeester
*/
+@EnableRuleMigrationSupport
public class RainbowFishSerializerTest {
/**
diff --git a/twin/pom.xml b/twin/pom.xml
index 62d138fd9..fd9553428 100644
--- a/twin/pom.xml
+++ b/twin/pom.xml
@@ -34,8 +34,13 @@
twin
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/twin/src/test/java/com/iluwatar/twin/AppTest.java b/twin/src/test/java/com/iluwatar/twin/AppTest.java
index 60e02e4c4..76f189f3f 100644
--- a/twin/src/test/java/com/iluwatar/twin/AppTest.java
+++ b/twin/src/test/java/com/iluwatar/twin/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.twin;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/twin/src/test/java/com/iluwatar/twin/BallItemTest.java b/twin/src/test/java/com/iluwatar/twin/BallItemTest.java
index 5dad02481..3c443ef62 100644
--- a/twin/src/test/java/com/iluwatar/twin/BallItemTest.java
+++ b/twin/src/test/java/com/iluwatar/twin/BallItemTest.java
@@ -22,8 +22,8 @@
*/
package com.iluwatar.twin;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -33,9 +33,10 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.AppenderBase;
import java.util.LinkedList;
import java.util.List;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.InOrder;
import org.slf4j.LoggerFactory;
@@ -48,12 +49,12 @@ public class BallItemTest {
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender();
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}
diff --git a/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java b/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java
index f531a2493..010e6c7e2 100644
--- a/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java
+++ b/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java
@@ -22,10 +22,12 @@
*/
package com.iluwatar.twin;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.lang.Thread.UncaughtExceptionHandler;
import static java.lang.Thread.sleep;
+import static java.time.Duration.ofMillis;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@@ -44,68 +46,74 @@ public class BallThreadTest {
/**
* Verify if the {@link BallThread} can be resumed
*/
- @Test(timeout = 5000)
+ @Test
public void testSuspend() throws Exception {
- final BallThread ballThread = new BallThread();
+ assertTimeout(ofMillis(5000), () -> {
+ final BallThread ballThread = new BallThread();
- final BallItem ballItem = mock(BallItem.class);
- ballThread.setTwin(ballItem);
+ final BallItem ballItem = mock(BallItem.class);
+ ballThread.setTwin(ballItem);
- ballThread.start();
+ ballThread.start();
- verify(ballItem, timeout(2000).atLeastOnce()).draw();
- verify(ballItem, timeout(2000).atLeastOnce()).move();
- ballThread.suspendMe();
+ verify(ballItem, timeout(2000).atLeastOnce()).draw();
+ verify(ballItem, timeout(2000).atLeastOnce()).move();
+ ballThread.suspendMe();
- sleep(1000);
+ sleep(1000);
- ballThread.stopMe();
- ballThread.join();
+ ballThread.stopMe();
+ ballThread.join();
- verifyNoMoreInteractions(ballItem);
+ verifyNoMoreInteractions(ballItem);
+ });
}
/**
* Verify if the {@link BallThread} can be resumed
*/
- @Test(timeout = 5000)
+ @Test
public void testResume() throws Exception {
- final BallThread ballThread = new BallThread();
+ assertTimeout(ofMillis(5000), () -> {
+ final BallThread ballThread = new BallThread();
- final BallItem ballItem = mock(BallItem.class);
- ballThread.setTwin(ballItem);
+ final BallItem ballItem = mock(BallItem.class);
+ ballThread.setTwin(ballItem);
- ballThread.suspendMe();
- ballThread.start();
+ ballThread.suspendMe();
+ ballThread.start();
- sleep(1000);
+ sleep(1000);
- verifyZeroInteractions(ballItem);
+ verifyZeroInteractions(ballItem);
- ballThread.resumeMe();
- verify(ballItem, timeout(2000).atLeastOnce()).draw();
- verify(ballItem, timeout(2000).atLeastOnce()).move();
+ ballThread.resumeMe();
+ verify(ballItem, timeout(2000).atLeastOnce()).draw();
+ verify(ballItem, timeout(2000).atLeastOnce()).move();
- ballThread.stopMe();
- ballThread.join();
+ ballThread.stopMe();
+ ballThread.join();
- verifyNoMoreInteractions(ballItem);
+ verifyNoMoreInteractions(ballItem);
+ });
}
/**
* Verify if the {@link BallThread} is interruptible
*/
- @Test(timeout = 5000)
+ @Test
public void testInterrupt() throws Exception {
- final BallThread ballThread = new BallThread();
- final UncaughtExceptionHandler exceptionHandler = mock(UncaughtExceptionHandler.class);
- ballThread.setUncaughtExceptionHandler(exceptionHandler);
- ballThread.setTwin(mock(BallItem.class));
- ballThread.start();
- ballThread.interrupt();
- ballThread.join();
+ assertTimeout(ofMillis(5000), () -> {
+ final BallThread ballThread = new BallThread();
+ final UncaughtExceptionHandler exceptionHandler = mock(UncaughtExceptionHandler.class);
+ ballThread.setUncaughtExceptionHandler(exceptionHandler);
+ ballThread.setTwin(mock(BallItem.class));
+ ballThread.start();
+ ballThread.interrupt();
+ ballThread.join();
- verify(exceptionHandler).uncaughtException(eq(ballThread), any(RuntimeException.class));
- verifyNoMoreInteractions(exceptionHandler);
+ verify(exceptionHandler).uncaughtException(eq(ballThread), any(RuntimeException.class));
+ verifyNoMoreInteractions(exceptionHandler);
+ });
}
}
\ No newline at end of file
diff --git a/unit-of-work/pom.xml b/unit-of-work/pom.xml
index 0d7fbf5a2..129d8dc51 100644
--- a/unit-of-work/pom.xml
+++ b/unit-of-work/pom.xml
@@ -15,6 +15,11 @@
junit
junit
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
org.mockito
mockito-core
diff --git a/value-object/pom.xml b/value-object/pom.xml
index fa4c06697..026b6220a 100644
--- a/value-object/pom.xml
+++ b/value-object/pom.xml
@@ -41,8 +41,13 @@
test
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/value-object/src/test/java/com/iluwatar/value/object/AppTest.java b/value-object/src/test/java/com/iluwatar/value/object/AppTest.java
index cd0b1354f..86dcb5be3 100644
--- a/value-object/src/test/java/com/iluwatar/value/object/AppTest.java
+++ b/value-object/src/test/java/com/iluwatar/value/object/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.value.object;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Application test
diff --git a/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java b/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java
index b7b65b6c6..f19382d4e 100644
--- a/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java
+++ b/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java
@@ -22,15 +22,13 @@
*/
package com.iluwatar.value.object;
+import com.google.common.testing.EqualsTester;
+import org.junit.jupiter.api.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
-
import static org.junit.Assert.assertThat;
-import com.google.common.testing.EqualsTester;
-
-import org.junit.Test;
-
/**
* Unit test for HeroStat.
*/
diff --git a/visitor/pom.xml b/visitor/pom.xml
index 5445a94cc..ea75fdf5a 100644
--- a/visitor/pom.xml
+++ b/visitor/pom.xml
@@ -34,8 +34,13 @@
visitor
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
test
diff --git a/visitor/src/test/java/com/iluwatar/visitor/AppTest.java b/visitor/src/test/java/com/iluwatar/visitor/AppTest.java
index 23c9bb48f..0fc97cc56 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/AppTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/AppTest.java
@@ -22,7 +22,7 @@
*/
package com.iluwatar.visitor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java b/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java
index ab8470512..57fe19397 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java
@@ -22,15 +22,16 @@
*/
package com.iluwatar.visitor;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.function.Function;
+
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
-import java.util.Arrays;
-import java.util.function.Function;
-import org.junit.Test;
-
/**
* Date: 12/30/15 - 18:59 PM
* Test related to Units
diff --git a/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java b/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java
index ba6705b23..68f4681c6 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java
@@ -22,19 +22,20 @@
*/
package com.iluwatar.visitor;
-import static org.junit.Assert.assertEquals;
-
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.AppenderBase;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Date: 12/30/15 - 18:59 PM
* Test case for Visitor Pattern
@@ -45,12 +46,12 @@ public abstract class VisitorTest {
private InMemoryAppender appender;
- @Before
+ @BeforeEach
public void setUp() {
appender = new InMemoryAppender();
}
- @After
+ @AfterEach
public void tearDown() {
appender.stop();
}