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 1e720299e1bed18d906a5200602f458cfd005ef8
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jun 22 13:39:55 2020 +0200
[CAMEL-11807] Upgrade camel-apns to junit5
---
components/camel-apns/pom.xml | 8 ++---
.../apns/ApnsConsumerIdleMessageTest.java | 18 ++++++-----
.../camel/component/apns/ApnsConsumerTest.java | 19 +++++++----
.../camel/component/apns/ApnsProducerTest.java | 21 +++++++-----
.../apns/ApnsProducerWithoutTokensHeaderTest.java | 18 +++++++----
.../apns/factory/ApnsServiceFactoryTest.java | 18 ++++++-----
.../factory/ConfiguredApnsServiceFactoryTest.java | 6 ++--
.../apns/spring/SpringApnsConsumerTest.java | 31 ++++++++++--------
.../camel/component/apns/util/AssertUtilsTest.java | 14 ++++----
.../camel/component/apns/util/StringUtilsTest.java | 37 ++++++++++++----------
10 files changed, 109 insertions(+), 81 deletions(-)
diff --git a/components/camel-apns/pom.xml b/components/camel-apns/pom.xml
index 928ade0..99c2c80 100644
--- a/components/camel-apns/pom.xml
+++ b/components/camel-apns/pom.xml
@@ -83,7 +83,7 @@
<!-- Camel for test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -110,13 +110,13 @@
<!-- Junit -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
index 62951ba..bdc98d3 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
@@ -24,27 +24,29 @@ import
org.apache.camel.component.apns.factory.ApnsServiceFactory;
import org.apache.camel.component.apns.util.ApnsUtils;
import org.apache.camel.component.apns.util.TestConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test to verify that the polling consumer delivers an empty Exchange when the
* sendEmptyMessageWhenIdle property is set and a polling event yields no
results.
*/
-@Ignore // TODO Figure out why this test is failing and fix it.
+@Disabled // TODO Figure out why this test is failing and fix it.
public class ApnsConsumerIdleMessageTest extends CamelTestSupport {
ApnsServerStub server;
- @Before
+ @BeforeEach
public void startup() throws InterruptedException {
server =
ApnsUtils.prepareAndStartServer(TestConstants.TEST_GATEWAY_PORT,
TestConstants.TEST_FEEDBACK_PORT);
}
- @After
+ @AfterEach
public void stop() {
server.stop();
}
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
index d4b7102..88f241c 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
@@ -25,10 +25,14 @@ import org.apache.camel.component.apns.model.InactiveDevice;
import org.apache.camel.component.apns.util.ApnsUtils;
import org.apache.camel.component.apns.util.TestConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Unit test that we can produce JMS message from files
@@ -37,17 +41,18 @@ public class ApnsConsumerTest extends CamelTestSupport {
ApnsServerStub server;
- @Before
+ @BeforeEach
public void startup() throws InterruptedException {
server =
ApnsUtils.prepareAndStartServer(TestConstants.TEST_GATEWAY_PORT,
TestConstants.TEST_FEEDBACK_PORT);
}
- @After
+ @AfterEach
public void stop() {
server.stop();
}
- @Test(timeout = 15000)
+ @Test
+ @Timeout(15)
public void testConsumer() throws Exception {
byte[] deviceTokenBytes = ApnsUtils.createRandomDeviceTokenBytes();
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
index 10775d8..517ce2c 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
@@ -27,10 +27,13 @@ import org.apache.camel.component.apns.model.ApnsConstants;
import org.apache.camel.component.apns.model.MessageType;
import org.apache.camel.component.apns.util.ApnsUtils;
import org.apache.camel.component.apns.util.TestConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
/**
* Unit test that we can produce JMS message from files
@@ -41,17 +44,18 @@ public class ApnsProducerTest extends CamelTestSupport {
private ApnsServerStub server;
- @Before
+ @BeforeEach
public void startup() {
server =
ApnsUtils.prepareAndStartServer(TestConstants.TEST_GATEWAY_PORT,
TestConstants.TEST_FEEDBACK_PORT);
}
- @After
+ @AfterEach
public void stop() {
server.stop();
}
- @Test(timeout = 5000)
+ @Test
+ @Timeout(5)
public void testProducer() throws Exception {
String message = "Hello World";
String messagePayload = APNS.newPayload().alertBody(message).build();
@@ -66,7 +70,8 @@ public class ApnsProducerTest extends CamelTestSupport {
}
- @Test(timeout = 5000)
+ @Test
+ @Timeout(5)
public void testProducerWithApnsNotification() throws InterruptedException
{
String message = "Hello World";
String messagePayload = APNS.newPayload().alertBody(message).build();
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java
index 7f5383c..2de7c16 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java
@@ -25,10 +25,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.apns.factory.ApnsServiceFactory;
import org.apache.camel.component.apns.util.ApnsUtils;
import org.apache.camel.component.apns.util.TestConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
/**
* Unit test that we can produce JMS message from files
@@ -39,17 +42,18 @@ public class ApnsProducerWithoutTokensHeaderTest extends
CamelTestSupport {
private ApnsServerStub server;
- @Before
+ @BeforeEach
public void startup() {
server =
ApnsUtils.prepareAndStartServer(TestConstants.TEST_GATEWAY_PORT,
TestConstants.TEST_FEEDBACK_PORT);
}
- @After
+ @AfterEach
public void stop() {
server.stop();
}
- @Test(timeout = 5000)
+ @Test
+ @Timeout(5)
public void testProducerWithoutTokenHeader() throws Exception {
String message = "Hello World";
String messagePayload = APNS.newPayload().alertBody(message).build();
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ApnsServiceFactoryTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ApnsServiceFactoryTest.java
index 8a4d7f9..9ba2b72 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ApnsServiceFactoryTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ApnsServiceFactoryTest.java
@@ -20,8 +20,11 @@ import com.notnoop.apns.ApnsService;
import org.apache.camel.component.apns.model.ConnectionStrategy;
import org.apache.camel.component.apns.util.ApnsUtils;
import org.apache.camel.component.apns.util.TestConstants;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ApnsServiceFactoryTest {
@@ -33,12 +36,11 @@ public class ApnsServiceFactoryTest {
doBasicAsserts(apnsService);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testApnsServiceFactoryAsPool0() throws Exception {
ApnsServiceFactory apnsServiceFactory =
createApnsServiceFactoryWithFixedCertificatesAsPool(0);
- ApnsService apnsService = apnsServiceFactory.getApnsService();
-
- doBasicAsserts(apnsService);
+ assertThrows(IllegalArgumentException.class,
+ () -> apnsServiceFactory.getApnsService());
}
@Test
@@ -50,8 +52,8 @@ public class ApnsServiceFactoryTest {
}
private void doBasicAsserts(Object apnsService) {
- Assert.assertNotNull(apnsService);
- Assert.assertTrue(apnsService instanceof ApnsService);
+ assertNotNull(apnsService);
+ assertTrue(apnsService instanceof ApnsService);
}
public static ApnsServiceFactory
createApnsServiceFactoryWithFixedCertificates()
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ConfiguredApnsServiceFactoryTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ConfiguredApnsServiceFactoryTest.java
index 882ca23..dbb2ac8 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ConfiguredApnsServiceFactoryTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ConfiguredApnsServiceFactoryTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
import com.notnoop.apns.ApnsServiceBuilder;
import org.apache.camel.support.jsse.SSLContextParameters;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
@@ -40,7 +40,7 @@ public class ConfiguredApnsServiceFactoryTest {
}
};
- @Before
+ @BeforeEach
public void setUp() throws IOException {
apnsServiceFactory.setSslContextParameters(mock(SSLContextParameters.class));
}
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/spring/SpringApnsConsumerTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/spring/SpringApnsConsumerTest.java
index c2a4505..528a7e6 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/spring/SpringApnsConsumerTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/spring/SpringApnsConsumerTest.java
@@ -23,19 +23,24 @@ import org.apache.camel.component.apns.model.InactiveDevice;
import org.apache.camel.component.apns.util.ApnsUtils;
import org.apache.camel.component.apns.util.TestConstants;
import org.apache.camel.component.mock.MockEndpoint;
-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;
+import org.junit.jupiter.api.Timeout;
+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.AbstractJUnit4SpringContextTests;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Unit test that we can produce JMS message from files
*/
@ContextConfiguration
-public class SpringApnsConsumerTest extends AbstractJUnit4SpringContextTests {
+@ExtendWith(SpringExtension.class)
+public class SpringApnsConsumerTest {
@Autowired
protected CamelContext camelContext;
@@ -45,17 +50,17 @@ public class SpringApnsConsumerTest extends
AbstractJUnit4SpringContextTests {
private ApnsServerStub server;
- @Before
+ @BeforeEach
public void startup() throws InterruptedException {
server =
ApnsUtils.prepareAndStartServer(TestConstants.TEST_GATEWAY_PORT,
TestConstants.TEST_FEEDBACK_PORT);
}
- @After
+ @AfterEach
public void stop() {
server.stop();
}
- @Test(timeout = 5000)
+ @Test @Timeout(5)
public void testConsumer() throws Exception {
byte[] deviceTokenBytes = ApnsUtils.createRandomDeviceTokenBytes();
@@ -72,10 +77,10 @@ public class SpringApnsConsumerTest extends
AbstractJUnit4SpringContextTests {
mock.assertIsSatisfied();
InactiveDevice inactiveDevice =
(InactiveDevice)mock.getExchanges().get(0).getIn().getBody();
- Assert.assertNotNull(inactiveDevice);
- Assert.assertNotNull(inactiveDevice.getDate());
- Assert.assertNotNull(inactiveDevice.getDeviceToken());
- Assert.assertEquals(deviceToken, inactiveDevice.getDeviceToken());
+ assertNotNull(inactiveDevice);
+ assertNotNull(inactiveDevice.getDate());
+ assertNotNull(inactiveDevice.getDeviceToken());
+ assertEquals(deviceToken, inactiveDevice.getDeviceToken());
}
}
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/AssertUtilsTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/AssertUtilsTest.java
index ceece4f..f71dbf5 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/AssertUtilsTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/AssertUtilsTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.component.apns.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.fail;
public class AssertUtilsTest {
@@ -30,9 +32,9 @@ public class AssertUtilsTest {
public void testAssertIsTrueInvalid() {
try {
AssertUtils.isTrue(false, "message");
- Assert.fail("Should have thrown exception");
+ fail("Should have thrown exception");
} catch (IllegalArgumentException e) {
- Assert.assertEquals("[Assert is true] message", e.getMessage());
+ assertEquals("[Assert is true] message", e.getMessage());
}
}
@@ -45,9 +47,9 @@ public class AssertUtilsTest {
public void testAssertNotNullInvalid() {
try {
AssertUtils.notNull(null, "message");
- Assert.fail("Should have thrown exception");
+ fail("Should have thrown exception");
} catch (IllegalArgumentException e) {
- Assert.assertEquals("[Assert not null] message", e.getMessage());
+ assertEquals("[Assert not null] message", e.getMessage());
}
}
diff --git
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/StringUtilsTest.java
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/StringUtilsTest.java
index dd16fb1..5217f29 100644
---
a/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/StringUtilsTest.java
+++
b/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/StringUtilsTest.java
@@ -16,38 +16,41 @@
*/
package org.apache.camel.component.apns.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;
public class StringUtilsTest {
@Test
public void testIsEmpty() {
- Assert.assertFalse(StringUtils.isEmpty("test"));
- Assert.assertFalse(StringUtils.isEmpty("a"));
- Assert.assertTrue(StringUtils.isEmpty(""));
- Assert.assertTrue(StringUtils.isEmpty(null));
+ assertFalse(StringUtils.isEmpty("test"));
+ assertFalse(StringUtils.isEmpty("a"));
+ assertTrue(StringUtils.isEmpty(""));
+ assertTrue(StringUtils.isEmpty(null));
}
@Test
public void testIsNotEmpty() {
- Assert.assertTrue(StringUtils.isNotEmpty("test"));
- Assert.assertTrue(StringUtils.isNotEmpty("a"));
- Assert.assertFalse(StringUtils.isNotEmpty(""));
- Assert.assertFalse(StringUtils.isNotEmpty(null));
+ assertTrue(StringUtils.isNotEmpty("test"));
+ assertTrue(StringUtils.isNotEmpty("a"));
+ assertFalse(StringUtils.isNotEmpty(""));
+ assertFalse(StringUtils.isNotEmpty(null));
}
@Test
public void testTrim() {
- Assert.assertEquals("", StringUtils.trim(""));
- Assert.assertEquals("", StringUtils.trim(" "));
+ assertEquals("", StringUtils.trim(""));
+ assertEquals("", StringUtils.trim(" "));
- Assert.assertEquals("test", StringUtils.trim("test"));
- Assert.assertEquals("test", StringUtils.trim("test "));
- Assert.assertEquals("test", StringUtils.trim(" test"));
- Assert.assertEquals("test", StringUtils.trim(" test "));
+ assertEquals("test", StringUtils.trim("test"));
+ assertEquals("test", StringUtils.trim("test "));
+ assertEquals("test", StringUtils.trim(" test"));
+ assertEquals("test", StringUtils.trim(" test "));
- Assert.assertEquals(null, StringUtils.trim(null));
+ assertEquals(null, StringUtils.trim(null));
}
}
