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 ce58a7590444ab704b761922f4f53c39c46c280d
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jul 9 09:55:53 2020 +0200
[CAMEL-11807] Upgrade camel-json-validator to junit5
---
components/camel-json-validator/pom.xml | 6 +++---
.../component/jsonvalidator/FileValidatorRouteTest.java | 15 +++++++++------
.../component/jsonvalidator/ValidatorInputStreamTest.java | 4 ++--
.../camel/component/jsonvalidator/ValidatorRouteTest.java | 12 +++++++-----
4 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/components/camel-json-validator/pom.xml
b/components/camel-json-validator/pom.xml
index cd3f9a0..942195b 100644
--- a/components/camel-json-validator/pom.xml
+++ b/components/camel-json-validator/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<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-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/FileValidatorRouteTest.java
b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/FileValidatorRouteTest.java
index 6d5b5c9..0637807 100644
---
a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/FileValidatorRouteTest.java
+++
b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/FileValidatorRouteTest.java
@@ -22,10 +22,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.ValidationException;
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.FileUtil;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FileValidatorRouteTest extends CamelTestSupport {
@@ -45,7 +48,7 @@ public class FileValidatorRouteTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(validEndpoint, invalidEndpoint,
finallyEndpoint);
- assertTrue("Should be able to delete the file",
FileUtil.deleteFile(new File("target/validator/valid.json")));
+ assertTrue(FileUtil.deleteFile(new
File("target/validator/valid.json")), "Should be able to delete the file");
}
@Test
@@ -61,11 +64,11 @@ public class FileValidatorRouteTest extends
CamelTestSupport {
MockEndpoint.assertIsSatisfied(validEndpoint, invalidEndpoint,
finallyEndpoint);
// should be able to delete the file
- assertTrue("Should be able to delete the file",
FileUtil.deleteFile(new File("target/validator/invalid.json")));
+ assertTrue(FileUtil.deleteFile(new
File("target/validator/invalid.json")), "Should be able to delete the file");
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/validator");
super.setUp();
diff --git
a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorInputStreamTest.java
b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorInputStreamTest.java
index 8be9401..ed7031d 100644
---
a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorInputStreamTest.java
+++
b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorInputStreamTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.jsonvalidator;
import java.io.ByteArrayInputStream;
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;
public class ValidatorInputStreamTest extends CamelTestSupport {
diff --git
a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java
b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java
index 2f115402..dd1ca06 100644
---
a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java
+++
b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.ValidationException;
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.assertTrue;
public class ValidatorRouteTest extends CamelTestSupport {
@@ -107,9 +109,9 @@ public class ValidatorRouteTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(validEndpoint, invalidEndpoint,
finallyEndpoint);
Exception exception = out.getException();
- assertTrue("Should be failed", out.isFailed());
- assertTrue("Exception should be correct type", exception instanceof
NoJsonHeaderValidationException);
- assertTrue("Exception should mention missing header",
exception.getMessage().contains("headerToValidate"));
+ assertTrue(out.isFailed(), "Should be failed");
+ assertTrue(exception instanceof NoJsonHeaderValidationException,
"Exception should be correct type");
+ assertTrue(exception.getMessage().contains("headerToValidate"),
"Exception should mention missing header");
}
@Test
