This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit df4753a158f7718093f20198e1d87afc99e855d3
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 9 10:22:42 2020 +0200
[CAMEL-11807] Upgrade camel-util to junit5
---
core/camel-util/pom.xml | 4 +-
.../org/apache/camel/util/AntPathMatcherTest.java | 9 +++--
.../org/apache/camel/util/CamelURIParserTest.java | 10 +++--
.../apache/camel/util/CollectionHelperTest.java | 8 ++--
.../camel/util/CollectionStringBufferTest.java | 8 ++--
.../java/org/apache/camel/util/IOHelperTest.java | 8 ++--
.../java/org/apache/camel/util/OgnlHelperTest.java | 9 +++--
.../apache/camel/util/OrderedPropertiesTest.java | 7 ++--
.../org/apache/camel/util/StringHelperTest.java | 7 ++--
.../java/org/apache/camel/util/URISupportTest.java | 18 ++++-----
.../java/org/apache/camel/util/UnitUtilsTest.java | 6 +--
.../org/apache/camel/util/backoff/BackOffTest.java | 45 +++++++++++-----------
.../camel/util/backoff/BackOffTimerTest.java | 42 ++++++++++----------
.../concurrent/AsyncCompletionServiceTest.java | 17 ++++----
.../SizedScheduledExecutorServiceTest.java | 13 ++++---
.../SubmitOrderedCompletionServiceTest.java | 16 ++++----
.../concurrent/SynchronousExecutorServiceTest.java | 12 +++---
.../apache/camel/util/function/PredicatesTest.java | 17 ++++----
18 files changed, 144 insertions(+), 112 deletions(-)
diff --git a/core/camel-util/pom.xml b/core/camel-util/pom.xml
index adf17f45..f3c3d5f 100644
--- a/core/camel-util/pom.xml
+++ b/core/camel-util/pom.xml
@@ -43,8 +43,8 @@
<!-- testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/AntPathMatcherTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/AntPathMatcherTest.java
index 3208c57..6a53144 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/AntPathMatcherTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/AntPathMatcherTest.java
@@ -16,13 +16,16 @@
*/
package org.apache.camel.util;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit tests for {@link AntPathMatcher}.
*/
-public class AntPathMatcherTest extends Assert {
+public class AntPathMatcherTest {
@Test
public void test() {
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/CamelURIParserTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/CamelURIParserTest.java
index 922d4d5..72325b7 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/CamelURIParserTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/CamelURIParserTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.camel.util;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+
+
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
public class CamelURIParserTest {
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/CollectionHelperTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/CollectionHelperTest.java
index 668cf41..254be9d 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/CollectionHelperTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/CollectionHelperTest.java
@@ -24,10 +24,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class CollectionHelperTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class CollectionHelperTest {
@Test
public void testCollectionAsCommaDelimitedString() {
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/CollectionStringBufferTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/CollectionStringBufferTest.java
index 23395df..dd799db 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/CollectionStringBufferTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/CollectionStringBufferTest.java
@@ -16,10 +16,12 @@
*/
package org.apache.camel.util;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class CollectionStringBufferTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+
+public class CollectionStringBufferTest {
@Test
public void testCollectionStringBufferDefault() {
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/IOHelperTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/IOHelperTest.java
index 3395c1a..16d5394 100644
--- a/core/camel-util/src/test/java/org/apache/camel/util/IOHelperTest.java
+++ b/core/camel-util/src/test/java/org/apache/camel/util/IOHelperTest.java
@@ -16,10 +16,12 @@
*/
package org.apache.camel.util;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class IOHelperTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+
+public class IOHelperTest {
@Test
public void testLookupEnvironmentVariable() throws Exception {
assertEquals("8081",
IOHelper.lookupEnvironmentVariable("FOO_SERVICE_PORT"));
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/OgnlHelperTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/OgnlHelperTest.java
index 2329d3f..5727a50 100644
--- a/core/camel-util/src/test/java/org/apache/camel/util/OgnlHelperTest.java
+++ b/core/camel-util/src/test/java/org/apache/camel/util/OgnlHelperTest.java
@@ -18,10 +18,13 @@ package org.apache.camel.util;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class OgnlHelperTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class OgnlHelperTest {
/**
* Tests correct splitting in case the OGNL expression contains method
parameters with brackets.
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/OrderedPropertiesTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/OrderedPropertiesTest.java
index 8d80ffa..8e33a53 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/OrderedPropertiesTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/OrderedPropertiesTest.java
@@ -19,10 +19,11 @@ package org.apache.camel.util;
import java.util.Iterator;
import java.util.Properties;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class OrderedPropertiesTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class OrderedPropertiesTest {
@Test
public void testOrdered() throws Exception {
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/StringHelperTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/StringHelperTest.java
index 688ac8f..cd07720 100644
--- a/core/camel-util/src/test/java/org/apache/camel/util/StringHelperTest.java
+++ b/core/camel-util/src/test/java/org/apache/camel/util/StringHelperTest.java
@@ -16,13 +16,12 @@
*/
package org.apache.camel.util;
-import junit.framework.TestCase;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.util.StringHelper.camelCaseToDash;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-public class StringHelperTest extends TestCase {
+public class StringHelperTest {
@Test
public void testCamelCashToDash() throws Exception {
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/URISupportTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/URISupportTest.java
index 1837d0f..a86d84b 100644
--- a/core/camel-util/src/test/java/org/apache/camel/util/URISupportTest.java
+++ b/core/camel-util/src/test/java/org/apache/camel/util/URISupportTest.java
@@ -24,15 +24,15 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class URISupportTest {
@@ -103,8 +103,8 @@ public class URISupportTest {
String out1 = URISupport.normalizeUri("http://www.google.com?q=Camel";);
String out2 = URISupport.normalizeUri("http:www.google.com?q=Camel");
assertEquals(out1, out2);
- assertTrue("Should have //", out1.startsWith("http://";));
- assertTrue("Should have //", out2.startsWith("http://";));
+ assertTrue(out1.startsWith("http://";), "Should have //");
+ assertTrue(out2.startsWith("http://";), "Should have //");
}
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/UnitUtilsTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/UnitUtilsTest.java
index 617d8f2..9a73840 100644
--- a/core/camel-util/src/test/java/org/apache/camel/util/UnitUtilsTest.java
+++ b/core/camel-util/src/test/java/org/apache/camel/util/UnitUtilsTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.util;
import java.text.DecimalFormatSymbols;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.util.UnitUtils.printUnitFromBytes;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-public class UnitUtilsTest extends Assert {
+public class UnitUtilsTest {
@Test
public void testPrintUnitFromBytes() throws Exception {
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTest.java
index e16d804..88946af 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTest.java
@@ -18,8 +18,9 @@ package org.apache.camel.util.backoff;
import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class BackOffTest {
@@ -32,10 +33,10 @@ public class BackOffTest {
for (int i = 1; i <= 5; i++) {
delay = context.next();
- Assert.assertEquals(i, context.getCurrentAttempts());
- Assert.assertEquals(BackOff.DEFAULT_DELAY.toMillis(), delay);
- Assert.assertEquals(BackOff.DEFAULT_DELAY.toMillis(),
context.getCurrentDelay());
- Assert.assertEquals(BackOff.DEFAULT_DELAY.toMillis() * i,
context.getCurrentElapsedTime());
+ assertEquals(i, context.getCurrentAttempts());
+ assertEquals(BackOff.DEFAULT_DELAY.toMillis(), delay);
+ assertEquals(BackOff.DEFAULT_DELAY.toMillis(),
context.getCurrentDelay());
+ assertEquals(BackOff.DEFAULT_DELAY.toMillis() * i,
context.getCurrentElapsedTime());
}
}
@@ -53,10 +54,10 @@ public class BackOffTest {
delay = context.next();
elapsed += delay;
- Assert.assertEquals(i, context.getCurrentAttempts());
- Assert.assertEquals((long)(oldDelay * 1.5), delay);
- Assert.assertEquals((long)(oldDelay * 1.5),
context.getCurrentDelay());
- Assert.assertEquals(elapsed, context.getCurrentElapsedTime(), 0);
+ assertEquals(i, context.getCurrentAttempts());
+ assertEquals((long)(oldDelay * 1.5), delay);
+ assertEquals((long)(oldDelay * 1.5), context.getCurrentDelay());
+ assertEquals(elapsed, context.getCurrentElapsedTime(), 0);
}
}
@@ -69,15 +70,15 @@ public class BackOffTest {
for (int i = 1; i <= 5; i++) {
delay = context.next();
- Assert.assertEquals(i, context.getCurrentAttempts());
- Assert.assertEquals(BackOff.DEFAULT_DELAY.toMillis(), delay);
- Assert.assertEquals(BackOff.DEFAULT_DELAY.toMillis(),
context.getCurrentDelay());
- Assert.assertEquals(BackOff.DEFAULT_DELAY.toMillis() * i,
context.getCurrentElapsedTime());
+ assertEquals(i, context.getCurrentAttempts());
+ assertEquals(BackOff.DEFAULT_DELAY.toMillis(), delay);
+ assertEquals(BackOff.DEFAULT_DELAY.toMillis(),
context.getCurrentDelay());
+ assertEquals(BackOff.DEFAULT_DELAY.toMillis() * i,
context.getCurrentElapsedTime());
}
delay = context.next();
- Assert.assertEquals(6, context.getCurrentAttempts());
- Assert.assertEquals(BackOff.NEVER, delay);
+ assertEquals(6, context.getCurrentAttempts());
+ assertEquals(BackOff.NEVER, delay);
}
@Test
@@ -89,14 +90,14 @@ public class BackOffTest {
for (int i = 1; i <= 5; i++) {
delay = context.next();
- Assert.assertEquals(i, context.getCurrentAttempts());
- Assert.assertEquals(BackOff.DEFAULT_DELAY.toMillis(), delay);
- Assert.assertEquals(BackOff.DEFAULT_DELAY.toMillis(),
context.getCurrentDelay());
- Assert.assertEquals(BackOff.DEFAULT_DELAY.toMillis() * i,
context.getCurrentElapsedTime());
+ assertEquals(i, context.getCurrentAttempts());
+ assertEquals(BackOff.DEFAULT_DELAY.toMillis(), delay);
+ assertEquals(BackOff.DEFAULT_DELAY.toMillis(),
context.getCurrentDelay());
+ assertEquals(BackOff.DEFAULT_DELAY.toMillis() * i,
context.getCurrentElapsedTime());
}
delay = context.next();
- Assert.assertEquals(6, context.getCurrentAttempts());
- Assert.assertEquals(BackOff.NEVER, delay);
+ assertEquals(6, context.getCurrentAttempts());
+ assertEquals(BackOff.NEVER, delay);
}
}
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTimerTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTimerTest.java
index 1cb911c..1acf4c7 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTimerTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTimerTest.java
@@ -24,8 +24,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class BackOffTimerTest {
@@ -41,13 +43,13 @@ public class BackOffTimerTest {
BackOffTimer.Task task = timer.schedule(
backOff,
context -> {
- Assert.assertEquals(counter.incrementAndGet(),
context.getCurrentAttempts());
- Assert.assertEquals(100, context.getCurrentDelay());
- Assert.assertEquals(100 * counter.get(),
context.getCurrentElapsedTime());
+ assertEquals(counter.incrementAndGet(),
context.getCurrentAttempts());
+ assertEquals(100, context.getCurrentDelay());
+ assertEquals(100 * counter.get(),
context.getCurrentElapsedTime());
if (first.get() == 0) {
first.set(context.getFirstAttemptTime());
} else {
- Assert.assertEquals(first.get(),
context.getFirstAttemptTime());
+ assertEquals(first.get(), context.getFirstAttemptTime());
}
return counter.get() < 5;
@@ -56,7 +58,7 @@ public class BackOffTimerTest {
task.whenComplete(
(context, throwable) -> {
- Assert.assertEquals(5, counter.get());
+ assertEquals(5, counter.get());
latch.countDown();
}
);
@@ -76,9 +78,9 @@ public class BackOffTimerTest {
BackOffTimer.Task task = timer.schedule(
backOff,
context -> {
- Assert.assertEquals(counter.incrementAndGet(),
context.getCurrentAttempts());
- Assert.assertEquals(100, context.getCurrentDelay());
- Assert.assertEquals(100 * counter.get(),
context.getCurrentElapsedTime());
+ assertEquals(counter.incrementAndGet(),
context.getCurrentAttempts());
+ assertEquals(100, context.getCurrentDelay());
+ assertEquals(100 * counter.get(),
context.getCurrentElapsedTime());
return true;
}
@@ -86,8 +88,8 @@ public class BackOffTimerTest {
task.whenComplete(
(context, throwable) -> {
- Assert.assertEquals(5, counter.get());
- Assert.assertEquals(BackOffTimer.Task.Status.Exhausted,
context.getStatus());
+ assertEquals(5, counter.get());
+ assertEquals(BackOffTimer.Task.Status.Exhausted,
context.getStatus());
latch.countDown();
}
);
@@ -107,9 +109,9 @@ public class BackOffTimerTest {
BackOffTimer.Task task = timer.schedule(
backOff,
context -> {
- Assert.assertEquals(counter.incrementAndGet(),
context.getCurrentAttempts());
- Assert.assertEquals(100, context.getCurrentDelay());
- Assert.assertEquals(100 * counter.get(),
context.getCurrentElapsedTime());
+ assertEquals(counter.incrementAndGet(),
context.getCurrentAttempts());
+ assertEquals(100, context.getCurrentDelay());
+ assertEquals(100 * counter.get(),
context.getCurrentElapsedTime());
return true;
}
@@ -117,8 +119,8 @@ public class BackOffTimerTest {
task.whenComplete(
(context, throwable) -> {
- Assert.assertTrue(counter.get() <= 5);
- Assert.assertEquals(BackOffTimer.Task.Status.Exhausted,
context.getStatus());
+ assertTrue(counter.get() <= 5);
+ assertEquals(BackOffTimer.Task.Status.Exhausted,
context.getStatus());
latch.countDown();
}
);
@@ -138,7 +140,7 @@ public class BackOffTimerTest {
BackOffTimer.Task task = timer.schedule(
backOff,
context -> {
- Assert.assertEquals(BackOffTimer.Task.Status.Active,
context.getStatus());
+ assertEquals(BackOffTimer.Task.Status.Active,
context.getStatus());
latch.countDown();
@@ -148,14 +150,14 @@ public class BackOffTimerTest {
task.whenComplete(
(context, throwable) -> {
- Assert.assertEquals(BackOffTimer.Task.Status.Inactive,
context.getStatus());
+ assertEquals(BackOffTimer.Task.Status.Inactive,
context.getStatus());
done.set(true);
}
);
latch.await(2, TimeUnit.SECONDS);
task.cancel();
- Assert.assertTrue(done.get());
+ assertTrue(done.get());
executor.shutdownNow();
}
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/concurrent/AsyncCompletionServiceTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/concurrent/AsyncCompletionServiceTest.java
index 2d5cdd9..eb3bb7f 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/concurrent/AsyncCompletionServiceTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/concurrent/AsyncCompletionServiceTest.java
@@ -22,23 +22,26 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import org.junit.After;
-import org.junit.Assert;
-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;
-public class AsyncCompletionServiceTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class AsyncCompletionServiceTest {
private ExecutorService executor;
private AsyncCompletionService<Object> service;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
executor = Executors.newFixedThreadPool(5);
service = new AsyncCompletionService<>(executor, true);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
executor.shutdownNow();
}
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SizedScheduledExecutorServiceTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SizedScheduledExecutorServiceTest.java
index 0cc0ebb..94bf9c7 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SizedScheduledExecutorServiceTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SizedScheduledExecutorServiceTest.java
@@ -20,13 +20,16 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
*
*/
-public class SizedScheduledExecutorServiceTest extends Assert {
+public class SizedScheduledExecutorServiceTest {
@Test
public void testSizedScheduledExecutorService() throws Exception {
@@ -52,7 +55,7 @@ public class SizedScheduledExecutorServiceTest extends Assert
{
}
sized.shutdownNow();
- assertTrue("Should be shutdown", sized.isShutdown() ||
sized.isTerminating());
- assertTrue("Should be shutdown", delegate.isShutdown() ||
sized.isTerminating());
+ assertTrue(sized.isShutdown() || sized.isTerminating(), "Should be
shutdown");
+ assertTrue(delegate.isShutdown() || sized.isTerminating(), "Should be
shutdown");
}
}
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionServiceTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionServiceTest.java
index 19e24e5..55a6631 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionServiceTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionServiceTest.java
@@ -22,23 +22,25 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import org.junit.After;
-import org.junit.Assert;
-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;
-public class SubmitOrderedCompletionServiceTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+public class SubmitOrderedCompletionServiceTest {
private ExecutorService executor;
private SubmitOrderedCompletionService<Object> service;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
executor = Executors.newFixedThreadPool(5);
service = new SubmitOrderedCompletionService<>(executor);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
executor.shutdownNow();
}
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SynchronousExecutorServiceTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SynchronousExecutorServiceTest.java
index 1ca2ec4..b9c811d 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SynchronousExecutorServiceTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/concurrent/SynchronousExecutorServiceTest.java
@@ -18,10 +18,12 @@ package org.apache.camel.util.concurrent;
import java.util.concurrent.ExecutorService;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class SynchronousExecutorServiceTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SynchronousExecutorServiceTest {
private static boolean invoked;
private static String name1;
@@ -39,8 +41,8 @@ public class SynchronousExecutorServiceTest extends Assert {
}
});
- assertTrue("Should have been invoked", invoked);
- assertEquals("Should use same thread", name1, name2);
+ assertTrue(invoked, "Should have been invoked");
+ assertEquals(name1, name2, "Should use same thread");
}
@Test
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/function/PredicatesTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/function/PredicatesTest.java
index 7df4478..5a707bc 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/function/PredicatesTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/function/PredicatesTest.java
@@ -16,17 +16,20 @@
*/
package org.apache.camel.util.function;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class PredicatesTest {
@Test
public void testNegate() {
- Assert.assertFalse(Predicates.of(String::isEmpty).test("something"));
-
Assert.assertTrue(Predicates.of(String::isEmpty).negate().test("something"));
-
Assert.assertTrue(Predicates.negate(String::isEmpty).test("something"));
- Assert.assertFalse(Predicates.negate(String::isEmpty).test(""));
- Assert.assertFalse(Predicates.of(String::isEmpty).negate().test(""));
+ assertFalse(Predicates.of(String::isEmpty).test("something"));
+ assertTrue(Predicates.of(String::isEmpty).negate().test("something"));
+ assertTrue(Predicates.negate(String::isEmpty).test("something"));
+ assertFalse(Predicates.negate(String::isEmpty).test(""));
+ assertFalse(Predicates.of(String::isEmpty).negate().test(""));
}
}
