This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new afae586 CAMEL-11807: Migrated camel-cbor/chunk/cmis tests to JUnit 5
afae586 is described below
commit afae5862cbf2e726903268409557b804aed85245
Author: aldettinger <[email protected]>
AuthorDate: Fri Apr 10 18:53:44 2020 +0200
CAMEL-11807: Migrated camel-cbor/chunk/cmis tests to JUnit 5
---
components/camel-cbor/pom.xml | 2 +-
.../camel/component/cbor/CBORDataFormatTest.java | 14 ++---
.../cbor/CBORMarshalAllowJMSTypeTest.java | 13 +++--
.../component/cbor/CBORObjectListSplitTest.java | 12 +++--
.../component/cbor/SpringCBORDataFormatTest.java | 10 ++--
components/camel-chunk/pom.xml | 2 +-
.../component/chunk/ChunkComponentLayersTest.java | 8 +--
.../chunk/ChunkComponentNestedLayersTest.java | 8 +--
.../component/chunk/ChunkComponentNestedTest.java | 8 +--
.../chunk/ChunkComponentTemplateTest.java | 8 +--
.../camel/component/chunk/ChunkComponentTest.java | 12 ++---
.../ChunkDifferentThemeFolderAndSubfolderTest.java | 8 +--
...ferentThemeFolderSubfolderAndExtensionTest.java | 8 +--
...kDifferentThemeFolderSubfolderAndLayerTest.java | 8 +--
.../chunk/ChunkDifferentThemeFolderTest.java | 8 +--
.../camel/component/chunk/ChunkLetterTest.java | 8 +--
components/camel-cmis/pom.xml | 2 +-
.../camel/component/cmis/CMISConsumerTest.java | 14 ++---
.../camel/component/cmis/CMISProducerTest.java | 60 +++++++++++++---------
.../component/cmis/CMISQueryProducerTest.java | 16 +++---
.../camel/component/cmis/CMISTestSupport.java | 16 +++---
21 files changed, 135 insertions(+), 110 deletions(-)
diff --git a/components/camel-cbor/pom.xml b/components/camel-cbor/pom.xml
index 1ba8d4e..727a3e2 100644
--- a/components/camel-cbor/pom.xml
+++ b/components/camel-cbor/pom.xml
@@ -76,7 +76,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORDataFormatTest.java
b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORDataFormatTest.java
index 4ca359e..1b50450 100644
---
a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORDataFormatTest.java
+++
b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORDataFormatTest.java
@@ -21,13 +21,15 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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;
public class CBORDataFormatTest extends CamelTestSupport {
@Test
- public void testMarshalAndUnmarshalMap() throws Exception {
+ void testMarshalAndUnmarshalMap() throws Exception {
Map<String, Object> in = new HashMap<>();
in.put("name", "Camel");
@@ -44,7 +46,7 @@ public class CBORDataFormatTest extends CamelTestSupport {
}
@Test
- public void testMarshalAndUnmarshalAuthor() throws Exception {
+ void testMarshalAndUnmarshalAuthor() throws Exception {
Author auth = new Author();
auth.setName("Don");
auth.setSurname("Winslow");
@@ -65,11 +67,11 @@ public class CBORDataFormatTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
CBORDataFormat format = new CBORDataFormat();
format.useMap();
diff --git
a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
index ca701b0..b19dae8 100644
---
a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
+++
b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
@@ -20,13 +20,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertNotNull;
public class CBORMarshalAllowJMSTypeTest extends CamelTestSupport {
@Test
- public void testUnmarshalPojo() throws Exception {
+ void testUnmarshalPojo() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:reversePojo");
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(Author.class);
@@ -49,11 +52,11 @@ public class CBORMarshalAllowJMSTypeTest extends
CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
CBORDataFormat format = new CBORDataFormat();
format.setAllowJmsType(true);
diff --git
a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
index 122b2ce..c505756 100644
---
a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
+++
b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
@@ -23,12 +23,14 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
import org.apache.camel.builder.RouteBuilder;
-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.apache.camel.test.junit5.TestSupport.body;
public class CBORObjectListSplitTest extends CamelTestSupport {
@Test
- public void testCBOR() throws InterruptedException,
JsonProcessingException {
+ void testCBOR() throws InterruptedException, JsonProcessingException {
getMockEndpoint("mock:result").expectedMessageCount(2);
getMockEndpoint("mock:result").expectedMessagesMatches(body().isInstanceOf(DummyObject.class));
@@ -50,10 +52,10 @@ public class CBORObjectListSplitTest extends
CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
// you can specify the pojo class type for unmarshal the jason
file
CBORDataFormat format = new CBORDataFormat();
format.useList();
diff --git
a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/SpringCBORDataFormatTest.java
b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/SpringCBORDataFormatTest.java
index 6816b18..cc26527 100644
---
a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/SpringCBORDataFormatTest.java
+++
b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/SpringCBORDataFormatTest.java
@@ -20,15 +20,17 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class SpringCBORDataFormatTest extends CamelSpringTestSupport {
@Test
- public void testMarshalAndUnmarshalMap() throws Exception {
+ void testMarshalAndUnmarshalMap() throws Exception {
Map<String, Object> in = new HashMap<>();
in.put("name", "Camel");
@@ -45,7 +47,7 @@ public class SpringCBORDataFormatTest extends
CamelSpringTestSupport {
}
@Test
- public void testMarshalAndUnmarshalAuthor() throws Exception {
+ void testMarshalAndUnmarshalAuthor() throws Exception {
Author auth = new Author();
auth.setName("Don");
auth.setSurname("Winslow");
diff --git a/components/camel-chunk/pom.xml b/components/camel-chunk/pom.xml
index 99b0f42..9649c17 100644
--- a/components/camel-chunk/pom.xml
+++ b/components/camel-chunk/pom.xml
@@ -59,7 +59,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java
index 868441f..4c3db11 100644
---
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java
+++
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for {@link ChunkComponent} and {@link ChunkEndpoint}
@@ -40,7 +40,7 @@ public class ChunkComponentLayersTest extends
CamelTestSupport {
* Test using themeLayer parameter without Resource URI header defined
*/
@Test
- public void testChunkLayer() throws Exception {
+ void testChunkLayer() throws Exception {
// Prepare
Exchange exchange = createExchangeWithBody("The Body");
exchange.getIn().setHeader("name", "Andrew");
@@ -53,7 +53,7 @@ public class ChunkComponentLayersTest extends
CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
diff --git
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java
index c550500..e6667eae 100644
---
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java
+++
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for {@link ChunkComponent} and {@link ChunkEndpoint}
@@ -40,7 +40,7 @@ public class ChunkComponentNestedLayersTest extends
CamelTestSupport {
* Test using two following distinct themeLayer of the same theme without
Resource URI header defined
*/
@Test
- public void testChunkDoubleLayers() throws Exception {
+ void testChunkDoubleLayers() throws Exception {
// Prepare
Exchange exchange = createExchangeWithBody("The Body");
exchange.getIn().setHeader("name", "Andrew");
@@ -53,7 +53,7 @@ public class ChunkComponentNestedLayersTest extends
CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
diff --git
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java
index e28cf8a..966a088 100644
---
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java
+++
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for {@link ChunkComponent} and {@link ChunkEndpoint}
@@ -39,7 +39,7 @@ public class ChunkComponentNestedTest extends
CamelTestSupport {
* Test using two following different theme from different folder without
Resource URI header defined
*/
@Test
- public void testChunkSubfolder() throws Exception {
+ void testChunkSubfolder() throws Exception {
// Prepare
endSimpleMock.expectedMessageCount(1);
endSimpleMock.expectedBodiesReceived("This the result of last call to
chunk Earth to Andrew. Come in, Andrew.\n\n");
@@ -50,7 +50,7 @@ public class ChunkComponentNestedTest extends
CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
diff --git
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java
index 9ef1784..df44a87 100644
---
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java
+++
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for {@link ChunkComponent} and {@link ChunkEndpoint}
@@ -40,7 +40,7 @@ public class ChunkComponentTemplateTest extends
CamelTestSupport {
* Test using code Template header
*/
@Test
- public void testChunkWithTemplateHeader() throws Exception {
+ void testChunkWithTemplateHeader() throws Exception {
// Prepare
Exchange exchange = createExchangeWithBody("The Body");
exchange.getIn().setHeader("someHeader", "Some Header");
@@ -54,7 +54,7 @@ public class ChunkComponentTemplateTest extends
CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
diff --git
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java
index ab62413..af0cb1b 100644
---
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java
+++
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java
@@ -22,9 +22,9 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.LoggerFactory;
/**
@@ -42,7 +42,7 @@ public class ChunkComponentTest extends CamelTestSupport {
* Test without Resource URI header defined
*/
@Test
- public void testChunk() throws Exception {
+ void testChunk() throws Exception {
// Prepare
endSimpleMock.expectedMessageCount(1);
endSimpleMock.expectedBodiesReceived("Earth to Andrew. Come in,
Andrew.\n");
@@ -56,7 +56,7 @@ public class ChunkComponentTest extends CamelTestSupport {
* Test using Resource URI header
*/
@Test
- public void testChunkWithResourceUriHeader() throws Exception {
+ void testChunkWithResourceUriHeader() throws Exception {
// Prepare
Exchange exchange = createExchangeWithBody("The Body");
exchange.getIn().setHeader("name", "Andrew");
@@ -73,7 +73,7 @@ public class ChunkComponentTest extends CamelTestSupport {
* Performance test
*/
@Test
- public void testChunkPerformance() throws Exception {
+ void testChunkPerformance() throws Exception {
int messageCount = 10000;
endSimpleMock.expectedMessageCount(messageCount);
StopWatch stopwatch = new StopWatch(true);
@@ -86,7 +86,7 @@ public class ChunkComponentTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
diff --git
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java
index 8887fb5..e9ef115 100644
---
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java
+++
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for {@link ChunkComponent} and {@link ChunkEndpoint}
@@ -40,7 +40,7 @@ public class ChunkDifferentThemeFolderAndSubfolderTest
extends CamelTestSupport
* Test using themeFolder and themeSubfolder parameters
*/
@Test
- public void testChunkSubfolder() throws Exception {
+ void testChunkSubfolder() throws Exception {
// Prepare
Exchange exchange = createExchangeWithBody("The Body");
exchange.getIn().setHeader("name", "Andrew");
@@ -53,7 +53,7 @@ public class ChunkDifferentThemeFolderAndSubfolderTest
extends CamelTestSupport
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
diff --git
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java
index 7539bc7..4666795 100644
---
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java
+++
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for {@link ChunkComponent} and {@link ChunkEndpoint}
@@ -40,7 +40,7 @@ public class
ChunkDifferentThemeFolderSubfolderAndExtensionTest extends CamelTes
* Test using themeFolder, themeSubfolder and extension parameters
*/
@Test
- public void testChunkSubfolder() throws Exception {
+ void testChunkSubfolder() throws Exception {
// Prepare
Exchange exchange = createExchangeWithBody("The Body");
exchange.getIn().setHeader("name", "Andrew");
@@ -53,7 +53,7 @@ public class
ChunkDifferentThemeFolderSubfolderAndExtensionTest extends CamelTes
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
diff --git
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java
index fc98388..577cd87 100644
---
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java
+++
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for {@link ChunkComponent} and {@link ChunkEndpoint}
@@ -40,7 +40,7 @@ public class ChunkDifferentThemeFolderSubfolderAndLayerTest
extends CamelTestSup
* Test using themeFolder, themeSubfolder and themeLayer parameters
*/
@Test
- public void testChunkSubfolder() throws Exception {
+ void testChunkSubfolder() throws Exception {
// Prepare
Exchange exchange = createExchangeWithBody("The Body");
exchange.getIn().setHeader("name", "Andrew");
@@ -53,7 +53,7 @@ public class ChunkDifferentThemeFolderSubfolderAndLayerTest
extends CamelTestSup
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
diff --git
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java
index 71edd46..335da15 100644
---
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java
+++
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for {@link ChunkComponent} and {@link ChunkEndpoint}
@@ -40,7 +40,7 @@ public class ChunkDifferentThemeFolderTest extends
CamelTestSupport {
* Test using themeFolder parameter
*/
@Test
- public void testChunkSingleLayer() throws Exception {
+ void testChunkSingleLayer() throws Exception {
// Prepare
Exchange exchange = createExchangeWithBody("The Body");
exchange.getIn().setHeader("name", "Andrew");
@@ -53,7 +53,7 @@ public class ChunkDifferentThemeFolderTest extends
CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
diff --git
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java
index 6f16270..7cda8a6 100644
---
a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java
+++
b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for wiki documentation (same as Mustache component)
@@ -41,7 +41,7 @@ public class ChunkLetterTest extends CamelTestSupport {
}
@Test
- public void testChunkLetter() throws Exception {
+ void testChunkLetter() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Dear Ibsen, Claus\n\nThanks for the order
of Camel in Action."
@@ -53,7 +53,7 @@ public class ChunkLetterTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:a")
diff --git a/components/camel-cmis/pom.xml b/components/camel-cmis/pom.xml
index cb53149..99068d8 100644
--- a/components/camel-cmis/pom.xml
+++ b/components/camel-cmis/pom.xml
@@ -63,7 +63,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
index 0839cd1..8ab2e94 100644
---
a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
+++
b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISConsumerTest.java
@@ -26,8 +26,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.chemistry.opencmis.client.api.Folder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CMISConsumerTest extends CMISTestSupport {
@@ -35,7 +37,7 @@ public class CMISConsumerTest extends CMISTestSupport {
protected MockEndpoint resultEndpoint;
@Test
- public void getAllContentFromServerOrderedFromRootToLeaves() throws
Exception {
+ void getAllContentFromServerOrderedFromRootToLeaves() throws Exception {
resultEndpoint.expectedMessageCount(5);
Consumer treeBasedConsumer = createConsumerFor(getUrl() +
"?pageSize=50");
@@ -53,7 +55,7 @@ public class CMISConsumerTest extends CMISTestSupport {
}
@Test
- public void consumeDocumentsWithQuery() throws Exception {
+ void consumeDocumentsWithQuery() throws Exception {
resultEndpoint.expectedMessageCount(2);
Consumer queryBasedConsumer = createConsumerFor(
@@ -66,7 +68,7 @@ public class CMISConsumerTest extends CMISTestSupport {
private Consumer createConsumerFor(String path) throws Exception {
Endpoint endpoint = context.getEndpoint("cmis://" + path);
return endpoint.createConsumer(new Processor() {
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) {
template.send("mock:result", exchange);
}
});
@@ -91,7 +93,7 @@ public class CMISConsumerTest extends CMISTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
populateRepositoryRootFolderWithTwoFoldersAndTwoDocuments();
diff --git
a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
index 3044876..0340dbe 100644
---
a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
+++
b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
@@ -35,7 +35,14 @@ import
org.apache.chemistry.opencmis.client.api.FileableCmisObject;
import org.apache.chemistry.opencmis.client.api.Folder;
import org.apache.chemistry.opencmis.commons.PropertyIds;
import
org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
-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.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CMISProducerTest extends CMISTestSupport {
@@ -43,7 +50,7 @@ public class CMISProducerTest extends CMISTestSupport {
protected ProducerTemplate template;
@Test
- public void storeMessageBodyAsTextDocument() throws Exception {
+ void storeMessageBodyAsTextDocument() throws Exception {
String content = "Some content to be store";
Exchange exchange = createExchangeWithInBody(content);
exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE,
"text/plain; charset=UTF-8");
@@ -63,7 +70,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void getDocumentMimeTypeFromMessageContentType() throws Exception {
+ void getDocumentMimeTypeFromMessageContentType() {
Exchange exchange = createExchangeWithInBody("Some content to be
store");
exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE,
"text/plain");
exchange.getIn().getHeaders().put(PropertyIds.NAME, "test.file");
@@ -78,7 +85,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void namePropertyIsAlwaysRequired() {
+ void namePropertyIsAlwaysRequired() {
Exchange exchange = createExchangeWithInBody("Some content that will
fail to be stored");
exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE,
"text/plain; charset=UTF-8");
exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION,
CamelCMISActions.CREATE);
@@ -92,7 +99,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void
createDocumentWithoutContentByExplicitlySpecifyingObjectTypeHeader() throws
Exception {
+ void createDocumentWithoutContentByExplicitlySpecifyingObjectTypeHeader() {
Exchange exchange = createExchangeWithInBody(null);
exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE,
"text/plain; charset=UTF-8");
exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID,
CamelCMISConstants.CMIS_DOCUMENT);
@@ -109,7 +116,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void emptyBodyAndMissingObjectTypeHeaderCreatesFolderNode() throws
Exception {
+ void emptyBodyAndMissingObjectTypeHeaderCreatesFolderNode() {
Exchange exchange = createExchangeWithInBody(null);
exchange.getIn().getHeaders().put(PropertyIds.NAME, "testFolder");
exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION,
CamelCMISActions.CREATE);
@@ -125,7 +132,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void cmisPropertiesAreStored() throws Exception {
+ void cmisPropertiesAreStored() {
Exchange exchange = createExchangeWithInBody("Some content to be
store");
exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE,
"text/plain; charset=UTF-8");
exchange.getIn().getHeaders().put(PropertyIds.NAME, "test.txt");
@@ -142,7 +149,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void cmisSecondaryTypePropertiesAreStored() throws Exception {
+ void cmisSecondaryTypePropertiesAreStored() {
List<String> secondaryTypes = Arrays.asList("MySecondaryType");
@@ -162,8 +169,8 @@ public class CMISProducerTest extends CMISTestSupport {
assertEquals("secondaryTypePropValue",
cmisObject.getPropertyValue("SecondaryStringProp"));
}
- @Test(expected = RuntimeCamelException.class)
- public void failConnectingToNonExistingRepository() throws Exception {
+ @Test
+ void failConnectingToNonExistingRepository() throws Exception {
Endpoint endpoint = context.getEndpoint("cmis://" + getUrl()
+
"?username=admin&password=admin&repositoryId=NON_EXISTING_ID");
Producer producer = endpoint.createProducer();
@@ -171,11 +178,14 @@ public class CMISProducerTest extends CMISTestSupport {
Exchange exchange = createExchangeWithInBody("Some content to be
store");
exchange.getIn().getHeaders().put(PropertyIds.NAME, "test.txt");
exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION,
CamelCMISActions.CREATE);
- producer.process(exchange);
+
+ assertThrows(RuntimeCamelException.class, () -> {
+ producer.process(exchange);
+ });
}
@Test
- public void failCreatingFolderAtNonExistingParentId() throws Exception {
+ void failCreatingFolderAtNonExistingParentId() {
Exchange exchange = createExchangeWithInBody(null);
exchange.getIn().getHeaders().put(PropertyIds.NAME, "folder1");
@@ -188,7 +198,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:start")
@@ -198,7 +208,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void renameFolder() {
+ void renameFolder() {
Folder folder = createFolderWithName("New Folder");
@@ -218,7 +228,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void renameDocument() throws UnsupportedEncodingException {
+ void renameDocument() throws UnsupportedEncodingException {
Document document =
createTextDocument(createSession().getRootFolder(), "This is new test
document", "document.txt");
@@ -238,8 +248,8 @@ public class CMISProducerTest extends CMISTestSupport {
assertTrue(cmisObject instanceof Document);
}
- @Test (expected = CmisObjectNotFoundException.class)
- public void deleteFolder() {
+ @Test
+ void deleteFolder() {
Folder folder = createFolderWithName("Test");
@@ -253,12 +263,14 @@ public class CMISProducerTest extends CMISTestSupport {
List<String> unsuccessfullyDeletedObjects =
exchange.getMessage().getBody(List.class);
assertTrue(unsuccessfullyDeletedObjects.isEmpty());
- //Try to get already deleted object by id should throw
CmisObjectNotFoundException
- createSession().getObject(folder.getId());
+ assertThrows(CmisObjectNotFoundException.class, () -> {
+ // Try to get already deleted object by id should throw
+ createSession().getObject(folder.getId());
+ });
}
@Test
- public void deleteDocument() throws UnsupportedEncodingException {
+ void deleteDocument() throws UnsupportedEncodingException {
Document document =
createTextDocument(createSession().getRootFolder(), "This is new test
document", "document.txt");
@@ -273,7 +285,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void moveFolder() {
+ void moveFolder() {
Folder toBeMoved = createFolderWithName("Moving folder");
Folder destinationFolder = createFolderWithName("Destination");
@@ -292,7 +304,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void moveDocument() throws UnsupportedEncodingException {
+ void moveDocument() throws UnsupportedEncodingException {
Folder rootFolder = createSession().getRootFolder();
Document toBeMoved = createTextDocument(rootFolder, "This is new test
document", "document.txt");
@@ -311,7 +323,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void copyDocument() throws UnsupportedEncodingException {
+ void copyDocument() throws UnsupportedEncodingException {
Folder destination = createFolderWithName("Destination");
Document document =
createTextDocument(createSession().getRootFolder(), "This is new test
document", "document.txt");
@@ -332,7 +344,7 @@ public class CMISProducerTest extends CMISTestSupport {
}
@Test
- public void copyFolder() {
+ void copyFolder() {
Folder folder = createFolderWithName("Folder");
Folder destination = createFolderWithName("Destination Folder");
diff --git
a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
index 268eed3..7a23fcb 100644
---
a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
+++
b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISQueryProducerTest.java
@@ -25,20 +25,22 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.chemistry.opencmis.client.api.Folder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class CMISQueryProducerTest extends CMISTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
populateServerWithContent();
}
@Test
- public void queryServerForDocumentWithSpecificName() throws Exception {
+ void queryServerForDocumentWithSpecificName() throws Exception {
Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() +
"?queryMode=true");
Producer producer = endpoint.createProducer();
@@ -53,7 +55,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
}
@Test
- public void getResultCountFromHeader() throws Exception {
+ void getResultCountFromHeader() throws Exception {
Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() +
"?queryMode=true");
Producer producer = endpoint.createProducer();
@@ -68,7 +70,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
}
@Test
- public void limitNumberOfResultsWithReadSizeHeader() throws Exception {
+ void limitNumberOfResultsWithReadSizeHeader() throws Exception {
Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() +
"?queryMode=true");
Producer producer = endpoint.createProducer();
@@ -84,7 +86,7 @@ public class CMISQueryProducerTest extends CMISTestSupport {
}
@Test
- public void retrieveAlsoDocumentContent() throws Exception {
+ void retrieveAlsoDocumentContent() throws Exception {
Endpoint endpoint = context.getEndpoint("cmis://" + getUrl() +
"?queryMode=true");
Producer producer = endpoint.createProducer();
diff --git
a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
index edafa51..03b5873 100644
---
a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
+++
b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
@@ -28,7 +28,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.client.api.Document;
import org.apache.chemistry.opencmis.client.api.Folder;
@@ -45,9 +45,9 @@ import
org.apache.chemistry.opencmis.commons.enums.UnfileObject;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
public class CMISTestSupport extends CamelTestSupport {
protected static final String CMIS_ENDPOINT_TEST_SERVER
@@ -70,7 +70,7 @@ public class CMISTestSupport extends CamelTestSupport {
return exchange;
}
- protected CmisObject retrieveCMISObjectByIdFromServer(String nodeId)
throws Exception {
+ protected CmisObject retrieveCMISObjectByIdFromServer(String nodeId) {
Session session = createSession();
return session.getObject(nodeId);
}
@@ -147,7 +147,7 @@ public class CMISTestSupport extends CamelTestSupport {
return newFolder.createDocument(properties, contentStream,
VersioningState.NONE);
}
- @BeforeClass
+ @BeforeAll
public static void startServer() throws Exception {
port = AvailablePortFinder.getNextAvailable();
cmisServer = new Server(port);
@@ -155,13 +155,13 @@ public class CMISTestSupport extends CamelTestSupport {
cmisServer.start();
}
- @AfterClass
+ @AfterAll
public static void stopServer() throws Exception {
cmisServer.stop();
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteAllContent();
super.setUp();
