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 052b37b179625355fa95ef7f34b3b283fd47e710
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jul 20 08:37:13 2020 +0200
[CAMEL-11807] Upgrade camel-quickfix to junit5
---
components/camel-quickfix/pom.xml | 4 +--
.../quickfixj/QuickfixjComponentTest.java | 10 +++----
.../quickfixj/QuickfixjConfigurationTest.java | 11 +++----
.../component/quickfixj/QuickfixjConsumerTest.java | 12 ++++----
.../quickfixj/QuickfixjConvertersTest.java | 14 +++++----
.../component/quickfixj/QuickfixjEngineTest.java | 34 +++++++++++++---------
.../quickfixj/QuickfixjLazyProducerTest.java | 10 +++----
.../component/quickfixj/QuickfixjProducerTest.java | 6 ++--
.../component/quickfixj/QuickfixjSpringTest.java | 21 ++-----------
9 files changed, 58 insertions(+), 64 deletions(-)
diff --git a/components/camel-quickfix/pom.xml
b/components/camel-quickfix/pom.xml
index c6c8d72..01b3cf0 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -52,7 +52,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -73,7 +73,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
index 3e96fd7..81d99cd 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
@@ -40,9 +40,9 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.converter.StaticMethodTypeConverter;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.IOHelper;
-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 quickfix.Acceptor;
import quickfix.DefaultMessageFactory;
import quickfix.FixVersions;
@@ -98,7 +98,7 @@ public class QuickfixjComponentTest {
return uri;
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
settingsFile = File.createTempFile("quickfixj_test_", ".cfg");
settingsFile2 = File.createTempFile("quickfixj_test2_", ".cfg");
@@ -145,7 +145,7 @@ public class QuickfixjComponentTest {
camelContext.getTypeConverterRegistry().addTypeConverter(SessionID.class,
String.class, new StaticMethodTypeConverter(converterMethod, false));
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
Thread.currentThread().setContextClassLoader(contextClassLoader);
if (component != null) {
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConfigurationTest.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConfigurationTest.java
index 51b4a2c..422c0f0 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConfigurationTest.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConfigurationTest.java
@@ -21,11 +21,12 @@ import java.util.Map;
import java.util.Properties;
import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import quickfix.SessionID;
import quickfix.SessionSettings;
+import static org.hamcrest.MatcherAssert.assertThat;
+
public class QuickfixjConfigurationTest {
@Test
@@ -52,8 +53,8 @@ public class QuickfixjConfigurationTest {
SessionSettings settings = factory.createSessionSettings();
Properties sessionProperties =
settings.getSessionProperties(sessionID, true);
- Assert.assertThat(sessionProperties.get("value1").toString(),
CoreMatchers.is("10"));
- Assert.assertThat(sessionProperties.get("value2").toString(),
CoreMatchers.is("2"));
- Assert.assertThat(sessionProperties.get("value3").toString(),
CoreMatchers.is("30"));
+ assertThat(sessionProperties.get("value1").toString(),
CoreMatchers.is("10"));
+ assertThat(sessionProperties.get("value2").toString(),
CoreMatchers.is("2"));
+ assertThat(sessionProperties.get("value3").toString(),
CoreMatchers.is("30"));
}
}
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java
index c3fbb68..8c687a8 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java
@@ -20,9 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import quickfix.FixVersions;
import quickfix.Message;
@@ -32,6 +31,7 @@ import quickfix.field.BeginString;
import quickfix.field.SenderCompID;
import quickfix.field.TargetCompID;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.isA;
public class QuickfixjConsumerTest {
@@ -40,7 +40,7 @@ public class QuickfixjConsumerTest {
private QuickfixjEndpoint mockEndpoint;
private Message inboundFixMessage;
- @Before
+ @BeforeEach
public void setUp() {
mockExchange = Mockito.mock(Exchange.class);
@@ -62,7 +62,7 @@ public class QuickfixjConsumerTest {
public void processExchangeOnlyWhenStarted() throws Exception {
QuickfixjConsumer consumer = new QuickfixjConsumer(mockEndpoint,
mockProcessor);
- Assert.assertThat("Consumer should not be automatically started",
+ assertThat("Consumer should not be automatically started",
consumer.isStarted(), CoreMatchers.is(false));
consumer.onExchange(mockExchange);
@@ -72,7 +72,7 @@ public class QuickfixjConsumerTest {
consumer.start();
Mockito.verify(mockEndpoint).ensureInitialized();
- Assert.assertThat(consumer.isStarted(), CoreMatchers.is(true));
+ assertThat(consumer.isStarted(), CoreMatchers.is(true));
consumer.onExchange(mockExchange);
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
index 805aaca..cbbe8c2 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
@@ -24,10 +24,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.quickfixj.converter.QuickfixjConverters;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultExchange;
-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 quickfix.Acceptor;
import quickfix.DataDictionary;
import quickfix.Initiator;
@@ -43,6 +43,8 @@ import quickfix.mina.ProtocolFactory;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class QuickfixjConvertersTest extends CamelTestSupport {
private File settingsFile;
@@ -53,7 +55,7 @@ public class QuickfixjConvertersTest extends CamelTestSupport
{
private QuickfixjEngine quickfixjEngine;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -71,7 +73,7 @@ public class QuickfixjConvertersTest extends CamelTestSupport
{
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
Thread.currentThread().setContextClassLoader(contextClassLoader);
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
index 5c3b1a1..3a2dc04 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
@@ -31,9 +31,9 @@ import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-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.Mockito;
import quickfix.Acceptor;
import quickfix.ConfigError;
@@ -73,8 +73,13 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-public class QuickfixjEngineTest extends
org.apache.camel.test.junit4.TestSupport {
+public class QuickfixjEngineTest {
private File settingsFile;
private ClassLoader contextClassLoader;
private SessionSettings settings;
@@ -82,7 +87,7 @@ public class QuickfixjEngineTest extends
org.apache.camel.test.junit4.TestSuppor
private File tempdir;
private QuickfixjEngine quickfixjEngine;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
settingsFile = File.createTempFile("quickfixj_test_", ".cfg");
tempdir = settingsFile.getParentFile();
@@ -102,7 +107,7 @@ public class QuickfixjEngineTest extends
org.apache.camel.test.junit4.TestSuppor
TestSupport.setSessionID(settings, sessionID);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
Thread.currentThread().setContextClassLoader(contextClassLoader);
if (quickfixjEngine != null) {
@@ -110,9 +115,10 @@ public class QuickfixjEngineTest extends
org.apache.camel.test.junit4.TestSuppor
}
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void missingSettingsResource() throws Exception {
- new QuickfixjEngine("quickfix:test", "bogus.cfg");
+ assertThrows(IllegalArgumentException.class,
+ () -> new QuickfixjEngine("quickfix:test", "bogus.cfg"));
}
@Test
@@ -374,7 +380,7 @@ public class QuickfixjEngineTest extends
org.apache.camel.test.junit4.TestSuppor
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
Set<ObjectName> n = mbeanServer.queryNames(new
ObjectName("org.quickfixj:type=Connector,role=Initiator,*"), null);
- assertFalse("QFJ mbean not registered", n.isEmpty());
+ assertFalse(n.isEmpty(), "QFJ mbean not registered");
}
@Test
@@ -390,7 +396,7 @@ public class QuickfixjEngineTest extends
org.apache.camel.test.junit4.TestSuppor
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
Set<ObjectName> n = mbeanServer.queryNames(new
ObjectName("org.quickfixj:type=Connector,role=Acceptor,*"), null);
- assertFalse("QFJ mbean not registered", n.isEmpty());
+ assertFalse(n.isEmpty(), "QFJ mbean not registered");
}
@Test
@@ -426,7 +432,7 @@ public class QuickfixjEngineTest extends
org.apache.camel.test.junit4.TestSuppor
quickfixjEngine.start();
- assertTrue("Logons not completed", logonLatch.await(5000,
TimeUnit.MILLISECONDS));
+ assertTrue(logonLatch.await(5000, TimeUnit.MILLISECONDS), "Logons not
completed");
quickfixjEngine.removeEventListener(logonListener);
assertThat(events.size(), is(8));
@@ -465,7 +471,7 @@ public class QuickfixjEngineTest extends
org.apache.camel.test.junit4.TestSuppor
Email email = TestSupport.createEmailMessage("Test");
Session.sendToTarget(email, initiatorSessionID);
- assertTrue("Application message not received",
messageLatch.await(5000, TimeUnit.MILLISECONDS));
+ assertTrue(messageLatch.await(5000, TimeUnit.MILLISECONDS),
"Application message not received");
quickfixjEngine.removeEventListener(messageListener);
assertThat(events.size(), is(2));
@@ -501,7 +507,7 @@ public class QuickfixjEngineTest extends
org.apache.camel.test.junit4.TestSuppor
quickfixjEngine.stop();
- assertTrue("Logoffs not received", logoffLatch.await(5000,
TimeUnit.MILLISECONDS));
+ assertTrue(logoffLatch.await(5000, TimeUnit.MILLISECONDS), "Logoffs
not received");
quickfixjEngine.removeEventListener(logoffListener);
assertThat(events.size(), is(6));
@@ -565,7 +571,7 @@ public class QuickfixjEngineTest extends
org.apache.camel.test.junit4.TestSuppor
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
Set<ObjectName> names = mbeanServer.queryNames(new
ObjectName("org.quickfixj:*"), null);
- assertTrue("QFJ Connector/Initiator mbeans should not have been
registered", names.isEmpty());
+ assertTrue(names.isEmpty(), "QFJ Connector/Initiator mbeans should not
have been registered");
}
private void writeSettings() throws IOException {
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
index 1c3f1bd..1e71767 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.quickfixj;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.test.util.ReflectionTestUtils;
import quickfix.FixVersions;
@@ -34,7 +34,7 @@ import quickfix.field.TargetCompID;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-@Ignore("Fails on CI server sometimes")
+@Disabled("Fails on CI server sometimes")
public class QuickfixjLazyProducerTest {
private Exchange mockExchange;
private QuickfixjEndpoint endpoint;
@@ -44,7 +44,7 @@ public class QuickfixjLazyProducerTest {
private Message inboundFixMessage;
private QuickfixjEngine quickfixjEngine;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
mockExchange = Mockito.mock(Exchange.class);
mockCamelMessage = Mockito.mock(org.apache.camel.Message.class);
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java
index de0399c..e904646 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java
@@ -24,8 +24,8 @@ import javax.management.JMException;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
import quickfix.ConfigError;
@@ -52,7 +52,7 @@ public class QuickfixjProducerTest {
private Message inboundFixMessage;
private QuickfixjEngine quickfixjEngine;
- @Before
+ @BeforeEach
public void setUp() throws ConfigError, FieldConvertError, IOException,
JMException {
mockExchange = Mockito.mock(Exchange.class);
mockEndpoint = Mockito.mock(QuickfixjEndpoint.class);
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
index 58ed9fa..bda0202 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
@@ -18,10 +18,9 @@ package org.apache.camel.component.quickfixj;
import java.util.Properties;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.hamcrest.CoreMatchers;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import quickfix.DefaultMessageFactory;
@@ -34,31 +33,17 @@ import quickfix.fix42.NewOrderSingle;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class QuickfixjSpringTest extends CamelSpringTestSupport {
@Override
- @Before
- public void setUp() throws Exception {
- if (isJava16()) {
- // cannot test on java 1.6
- return;
- }
- super.setUp();
- }
-
- @Override
protected AbstractApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml");
}
@Test
public void configureInSpring() throws Exception {
- if (isJava16()) {
- // cannot test on java 1.6
- return;
- }
-
SessionID sessionID = new SessionID("FIX.4.2:INITIATOR->ACCEPTOR");
QuickfixjConfiguration configuration =
context.getRegistry().lookupByNameAndType("quickfixjConfiguration",
QuickfixjConfiguration.class);
