You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/07/09 20:01:53 UTC
[camel] 02/19: [CAMEL-11807] Upgrade camel-jasypt to junit5
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 bbcb2b04ebb9d7af8a95e06cf78ecd62e6b9da9b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jul 7 11:52:26 2020 +0200
[CAMEL-11807] Upgrade camel-jasypt to junit5
---
components/camel-jasypt/pom.xml | 11 ++++++++---
.../camel/component/jasypt/JasyptPropertiesParserTest.java | 10 +++++-----
.../apache/camel/component/jasypt/JasyptPropertiesTest.java | 4 ++--
.../test/java/org/apache/camel/component/jasypt/MainTest.java | 5 ++---
.../jasypt/SpringJasyptBridgePropertiesAutowireTest.java | 4 ++--
.../component/jasypt/SpringJasyptBridgePropertiesTest.java | 4 ++--
.../camel/component/jasypt/SpringJasyptProperties2Test.java | 4 ++--
.../camel/component/jasypt/SpringJasyptPropertiesTest.java | 4 ++--
8 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml
index 35c9743..95c8e52 100644
--- a/components/camel-jasypt/pom.xml
+++ b/components/camel-jasypt/pom.xml
@@ -55,12 +55,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-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>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesParserTest.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesParserTest.java
index c47d2b6..c763580 100644
--- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesParserTest.java
+++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesParserTest.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.jasypt;
import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static java.lang.String.format;
import static org.apache.camel.component.jasypt.JasyptPropertiesParser.JASYPT_PREFIX_TOKEN;
import static org.apache.camel.component.jasypt.JasyptPropertiesParser.JASYPT_SUFFIX_TOKEN;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JasyptPropertiesParserTest {
@@ -38,7 +38,7 @@ public class JasyptPropertiesParserTest {
private JasyptPropertiesParser jasyptPropertiesParser = new JasyptPropertiesParser();
private StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
- @Before
+ @BeforeEach
public void before() {
encryptor.setPassword(KNOWN_PASSWORD);
jasyptPropertiesParser.setEncryptor(encryptor);
diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesTest.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesTest.java
index 159402e..4aa54bf 100644
--- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesTest.java
+++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.jasypt;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.properties.PropertiesComponent;
-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 JasyptPropertiesTest extends CamelTestSupport {
diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java
index 8ad8a08..c2a6e45 100644
--- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java
+++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/MainTest.java
@@ -16,10 +16,9 @@
*/
package org.apache.camel.component.jasypt;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class MainTest extends Assert {
+public class MainTest {
@Test
public void testMainShowOptions() throws Exception {
diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesAutowireTest.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesAutowireTest.java
index c4e8366..3cc99e6 100644
--- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesAutowireTest.java
+++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesAutowireTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jasypt;
-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;
diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesTest.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesTest.java
index 2915745..18ec591 100644
--- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesTest.java
+++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jasypt;
-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;
diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptProperties2Test.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptProperties2Test.java
index a22dbe2..4663fbc 100644
--- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptProperties2Test.java
+++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptProperties2Test.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jasypt;
-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;
diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptPropertiesTest.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptPropertiesTest.java
index 20e5a23..5e25c96 100644
--- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptPropertiesTest.java
+++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptPropertiesTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jasypt;
-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;