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 d156b4bd84b79ad3d5aaec8f6089d5176a927ecb
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 09:51:58 2020 +0200
[CAMEL-11807] Upgrade camel-jcr to junit5
---
components/camel-jcr/pom.xml | 6 +++---
.../apache/camel/component/jcr/JcrAuthLoginFailureTest.java | 10 +++++++---
.../org/apache/camel/component/jcr/JcrAuthLoginTest.java | 5 ++++-
.../java/org/apache/camel/component/jcr/JcrAuthTestBase.java | 8 +++++---
.../org/apache/camel/component/jcr/JcrConverterTest.java | 12 +++++++-----
.../org/apache/camel/component/jcr/JcrGetNodeByIdTest.java | 6 +++---
.../apache/camel/component/jcr/JcrNodePathCreationTest.java | 11 ++++++++---
.../component/jcr/JcrProducerDifferentWorkspaceTest.java | 5 ++++-
.../apache/camel/component/jcr/JcrProducerSubNodeTest.java | 5 ++++-
.../java/org/apache/camel/component/jcr/JcrProducerTest.java | 5 ++++-
.../component/jcr/JcrRouteDifferentWorkspaceTestSupport.java | 8 +++++---
.../org/apache/camel/component/jcr/JcrRouteTestSupport.java | 8 +++++---
12 files changed, 59 insertions(+), 30 deletions(-)
diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml
index 8620b45..102cdc6 100644
--- a/components/camel-jcr/pom.xml
+++ b/components/camel-jcr/pom.xml
@@ -59,12 +59,12 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
index c2afebf..4b99c35 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
@@ -20,7 +20,11 @@ import javax.jcr.LoginException;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JcrAuthLoginFailureTest extends JcrAuthTestBase {
@@ -30,8 +34,8 @@ public class JcrAuthLoginFailureTest extends JcrAuthTestBase {
Exchange out = template.send("direct:a", exchange);
assertNotNull(out);
String uuid = out.getOut().getBody(String.class);
- assertNull("Expected body to be null, found JCR node UUID", uuid);
- assertTrue("Wrong exception type", out.getException() instanceof
LoginException);
+ assertNull(uuid, "Expected body to be null, found JCR node UUID");
+ assertTrue(out.getException() instanceof LoginException, "Wrong
exception type");
}
@Override
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
index 52963e1..54ec67c 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
@@ -22,7 +22,10 @@ import javax.jcr.SimpleCredentials;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-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.assertNotNull;
public class JcrAuthLoginTest extends JcrAuthTestBase {
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
index 5e1a584..f0467e0 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
@@ -25,12 +25,14 @@ import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicyIterator;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.TransientRepository;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* Base class for tests that use authentication/authorization in the
repository.
@@ -45,7 +47,7 @@ public abstract class JcrAuthTestBase extends
CamelTestSupport {
private Repository repository;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(REPO_PATH);
super.setUp();
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
index addd428..9ac69bc 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
@@ -33,18 +33,20 @@ import org.apache.jackrabbit.value.BinaryValue;
import org.apache.jackrabbit.value.BooleanValue;
import org.apache.jackrabbit.value.DateValue;
import org.apache.jackrabbit.value.StringValue;
-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 static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests for JCR type conversions ({@link JcrConverter})
*/
-public class JcrConverterTest extends Assert {
+public class JcrConverterTest {
protected TypeConverter converter;
- @Before
+ @BeforeEach
public void init() throws Exception {
converter = new DefaultTypeConverter(new
DefaultPackageScanClassResolver(),
new Injector() {
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java
index 73f6f32..50dc088 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java
@@ -25,8 +25,8 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class JcrGetNodeByIdTest extends JcrRouteTestSupport {
public static final String CONTENT = "content is here";
@@ -37,7 +37,7 @@ public class JcrGetNodeByIdTest extends JcrRouteTestSupport {
private MockEndpoint result;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
index 77228bc..3e04377 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
@@ -23,15 +23,20 @@ import javax.jcr.ValueFactory;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-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.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JcrNodePathCreationTest extends JcrRouteTestSupport {
private Value[] multiValued;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerDifferentWorkspaceTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerDifferentWorkspaceTest.java
index eae03f1..c199a5b 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerDifferentWorkspaceTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerDifferentWorkspaceTest.java
@@ -22,7 +22,10 @@ import javax.jcr.Workspace;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-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.assertNotNull;
public class JcrProducerDifferentWorkspaceTest extends
JcrRouteDifferentWorkspaceTestSupport {
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
index 46b14a7..9caf48b 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
@@ -22,7 +22,10 @@ import javax.jcr.Session;
import org.apache.camel.Exchange;
import org.apache.camel.builder.ExchangeBuilder;
import org.apache.camel.builder.RouteBuilder;
-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.assertNotNull;
public class JcrProducerSubNodeTest extends JcrRouteTestSupport {
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerTest.java
index 91d9c68..5fe6a11 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerTest.java
@@ -21,7 +21,10 @@ import javax.jcr.Session;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-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.assertNotNull;
public class JcrProducerTest extends JcrRouteTestSupport {
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
index 78f94d4..76f6fe6 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
@@ -26,9 +26,11 @@ import javax.jcr.SimpleCredentials;
import javax.jcr.Workspace;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.jackrabbit.core.TransientRepository;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* JcrRouteDifferentWorkspaceTestSupport
@@ -44,7 +46,7 @@ public abstract class JcrRouteDifferentWorkspaceTestSupport
extends CamelTestSup
private Repository repository;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(REPO_PATH);
super.setUp();
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTestSupport.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTestSupport.java
index cd79e6c..0bde342 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTestSupport.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTestSupport.java
@@ -25,9 +25,11 @@ import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.jackrabbit.core.TransientRepository;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* JcrRouteTestSupport
@@ -41,7 +43,7 @@ public abstract class JcrRouteTestSupport extends
CamelTestSupport {
private Repository repository;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(REPO_PATH);
super.setUp();
