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 299704224f0370c93fe5cf10b0837b57cc715386
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 10:35:36 2020 +0200
[CAMEL-11807] Upgrade camel-splunk to junit5
---
components/camel-splunk/pom.xml | 4 ++--
.../camel/component/splunk/ConsumerStreamingTest.java | 10 ++++++----
.../apache/camel/component/splunk/ConsumerTest.java | 10 ++++++----
.../apache/camel/component/splunk/ProducerTest.java | 19 +++++++++++--------
.../camel/component/splunk/RawProducerTest.java | 12 ++++++------
.../splunk/SplunkComponentConfigurationTest.java | 14 ++++++++++----
.../camel/component/splunk/SplunkEventTest.java | 14 ++++++++------
.../camel/component/splunk/SplunkMockTestSupport.java | 8 ++++----
.../splunk/integration/NormalSearchTest.java | 9 ++++++---
.../splunk/integration/RealtimeSearchTest.java | 9 ++++++---
.../component/splunk/integration/SavedSearchTest.java | 9 ++++++---
.../splunk/integration/SplunkProducerTest.java | 6 +++---
.../component/splunk/integration/SplunkTest.java | 6 +++---
13 files changed, 77 insertions(+), 53 deletions(-)
diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml
index 4108fb4..e1aba10 100644
--- a/components/camel-splunk/pom.xml
+++ b/components/camel-splunk/pom.xml
@@ -69,7 +69,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -79,7 +79,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-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java
index d975024..67df233 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java
@@ -24,16 +24,18 @@ import com.splunk.JobCollection;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ConsumerStreamingTest extends SplunkMockTestSupport {
@Mock
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java
index d1f639e..78ec19e 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java
@@ -25,16 +25,18 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ConsumerTest extends SplunkMockTestSupport {
@Mock
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java
index e06be45..a53aa85 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java
@@ -32,17 +32,19 @@ import org.apache.camel.component.splunk.event.SplunkEvent;
import org.apache.camel.component.splunk.support.StreamDataWriter;
import org.apache.camel.component.splunk.support.SubmitDataWriter;
import org.apache.camel.component.splunk.support.TcpDataWriter;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ProducerTest extends SplunkMockTestSupport {
@EndpointInject("splunk://stream")
@@ -66,7 +68,7 @@ public class ProducerTest extends SplunkMockTestSupport {
@Mock
private InputCollection inputCollection;
- @Before
+ @BeforeEach
public void setup() throws IOException {
when(service.getIndexes()).thenReturn(indexColl);
when(service.getInputs()).thenReturn(inputCollection);
@@ -119,9 +121,10 @@ public class ProducerTest extends SplunkMockTestSupport {
assertIsInstanceOf(TcpDataWriter.class,
((SplunkProducer)tcpProducer).getDataWriter());
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testBodyWithoutRawOption() throws Exception {
- template.sendBody("direct:tcp", "foobar");
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:tcp", "foobar"));
}
@Override
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java
index 5bd5d17..af32629 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java
@@ -26,17 +26,17 @@ import com.splunk.TcpInput;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class RawProducerTest extends SplunkMockTestSupport {
private static final String PAYLOAD = "{foo:1, bar:2}";
@@ -61,7 +61,7 @@ public class RawProducerTest extends SplunkMockTestSupport {
@Mock
private InputCollection inputCollection;
- @Before
+ @BeforeEach
public void setup() throws IOException {
when(service.getIndexes()).thenReturn(indexColl);
when(service.getInputs()).thenReturn(inputCollection);
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java
index cd33c2d..72d1745 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java
@@ -18,8 +18,13 @@ package org.apache.camel.component.splunk;
import com.splunk.SSLSecurityProtocol;
import com.splunk.Service;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SplunkComponentConfigurationTest extends CamelTestSupport {
@@ -39,10 +44,11 @@ public class SplunkComponentConfigurationTest extends
CamelTestSupport {
assertEquals(SSLSecurityProtocol.TLSv1_2,
endpoint.getConfiguration().getSslProtocol());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createProducerWithoutUserAndPassword() throws Exception {
SplunkComponent component = context.getComponent("splunk",
SplunkComponent.class);
- component.createEndpoint("splunk://test");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("splunk://test"));
}
@Test
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkEventTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkEventTest.java
index c769b58..ed7090f 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkEventTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkEventTest.java
@@ -21,10 +21,12 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class SplunkEventTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SplunkEventTest {
@Test
public void testEventDataWithQuotedValues() {
@@ -33,10 +35,10 @@ public class SplunkEventTest extends Assert {
event.addPair("key1", "value1");
event.addPair("key2", "value2 with whitespace");
event.addPair(SplunkEvent.COMMON_DVC_TIME, now);
- assertEquals("Values should be quoted", "name=\"testevent\"
event_id=\"123\" key1=\"value1\" key2=\"value2 with whitespace\" dvc_time=\"" +
now.toString() + "\"\n",
- event.toString());
+ assertEquals("name=\"testevent\" event_id=\"123\" key1=\"value1\"
key2=\"value2 with whitespace\" dvc_time=\"" + now.toString() + "\"\n",
+ event.toString(), "Values should be quoted");
assertEquals(5, event.getEventData().size());
- assertTrue(event.getEventData().get("key2").equals("value2 with
whitespace"));
+ assertEquals("value2 with whitespace",
event.getEventData().get("key2"));
}
@Test
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java
index 67630df..e83eaaf 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java
@@ -20,12 +20,12 @@ import java.net.Socket;
import com.splunk.Service;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public abstract class SplunkMockTestSupport extends CamelTestSupport {
@Mock
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java
index 8745f64..c0708a3 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java
@@ -22,10 +22,13 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("run manually since it requires a running local splunk server")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("run manually since it requires a running local splunk server")
public class NormalSearchTest extends SplunkTest {
@Test
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java
index c03395a..546e39b 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java
@@ -21,10 +21,13 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("run manually since it requires a running local splunk server")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("run manually since it requires a running local splunk server")
public class RealtimeSearchTest extends SplunkTest {
@Test
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java
index 4d0ce93..f980d8d 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java
@@ -22,10 +22,13 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("run manually since it requires a running local splunk server")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("run manually since it requires a running local splunk server")
public class SavedSearchTest extends SplunkTest {
// before run there should be created a saved search 'junit' in splunk
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkProducerTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkProducerTest.java
index ae16e59..b0cf0be 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkProducerTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkProducerTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.splunk.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("run manually since it requires a running local splunk server")
+@Disabled("run manually since it requires a running local splunk server")
public class SplunkProducerTest extends SplunkTest {
// Splunk tcp receiver port configured in Splunk
diff --git
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java
index e526090a2..d24ff3f 100644
---
a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java
+++
b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.splunk.integration;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
public abstract class SplunkTest extends CamelTestSupport {
// TEST WILL RUN ON SPLUNK DEFAULT LOCALHOST+PORT
@@ -30,7 +30,7 @@ public abstract class SplunkTest extends CamelTestSupport {
// should be created in splunk before test run;
protected static final String INDEX = "junit";
- @Before
+ @BeforeEach
public void init() throws Exception {
SplunkEvent splunkEvent = new SplunkEvent();
splunkEvent.addPair("key1", "value1");
