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 d2bbbd2b6fad1a505f7e9581d6aa7d58cf1e8ba0
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Jul 22 15:09:46 2020 +0200
[CAMEL-11807] Upgrade camel-spring-security to junit5
---
components/camel-spring-security/pom.xml | 6 ++--
.../SpringSecurityAuthorizationPolicyTest.java | 13 +++++---
...pringSecurityAuthorizationPolicyConfigTest.java | 36 ++++++++++++----------
3 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/components/camel-spring-security/pom.xml
b/components/camel-spring-security/pom.xml
index 9a06589..31f6039 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -86,7 +86,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -95,8 +95,8 @@
<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-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
b/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
index 7c69482..002e570 100644
---
a/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
+++
b/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
@@ -24,8 +24,8 @@ import javax.security.auth.Subject;
import org.apache.camel.CamelAuthorizationException;
import org.apache.camel.Exchange;
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
org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -34,6 +34,9 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
public class SpringSecurityAuthorizationPolicyTest extends
CamelSpringTestSupport {
@Test
@@ -53,7 +56,7 @@ public class SpringSecurityAuthorizationPolicyTest extends
CamelSpringTestSuppor
fail("we should get the access deny exception here");
} catch (Exception exception) {
// the exception should be caused by CamelAuthorizationException
- assertTrue("Expect CamelAuthorizationException here",
exception.getCause() instanceof CamelAuthorizationException);
+ assertTrue(exception.getCause() instanceof
CamelAuthorizationException, "Expect CamelAuthorizationException here");
}
end.assertIsSatisfied();
}
@@ -67,7 +70,7 @@ public class SpringSecurityAuthorizationPolicyTest extends
CamelSpringTestSuppor
fail("we should get the access deny exception here");
} catch (Exception exception) {
// the exception should be caused by CamelAuthorizationException
- assertTrue("Expect CamelAuthorizationException here",
exception.getCause() instanceof CamelAuthorizationException);
+ assertTrue(exception.getCause() instanceof
CamelAuthorizationException, "Expect CamelAuthorizationException here");
}
end.assertIsSatisfied();
}
@@ -100,7 +103,7 @@ public class SpringSecurityAuthorizationPolicyTest extends
CamelSpringTestSuppor
fail("we should get the access deny exception here");
} catch (Exception exception) {
// the exception should be caused by CamelAuthorizationException
- assertTrue("Expect CamelAuthorizationException here",
exception.getCause() instanceof CamelAuthorizationException);
+ assertTrue(exception.getCause() instanceof
CamelAuthorizationException, "Expect CamelAuthorizationException here");
}
end.assertIsSatisfied();
}
diff --git
a/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyConfigTest.java
b/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyConfigTest.java
index 1ef623d..6cf416b 100644
---
a/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyConfigTest.java
+++
b/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyConfigTest.java
@@ -18,24 +18,26 @@ package org.apache.camel.component.spring.security.config;
import
org.apache.camel.component.spring.security.SpringSecurityAuthorizationPolicy;
import org.apache.camel.util.IOHelper;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class SpringSecurityAuthorizationPolicyConfigTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class SpringSecurityAuthorizationPolicyConfigTest {
private AbstractXmlApplicationContext context;
- @Before
+ @BeforeEach
public void setUp() {
context =
new ClassPathXmlApplicationContext(new String[]
{"/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicy.xml"});
}
- @After
+ @AfterEach
public void tearDown() {
IOHelper.close(context);
}
@@ -44,19 +46,19 @@ public class SpringSecurityAuthorizationPolicyConfigTest
extends Assert {
public void testAuthorizationPolicy() {
SpringSecurityAuthorizationPolicy adminPolicy =
context.getBean("admin", SpringSecurityAuthorizationPolicy.class);
- assertNotNull("We should get admin policy", adminPolicy);
- assertNotNull("The accessDecisionManager should not be null",
adminPolicy.getAccessDecisionManager());
- assertNotNull("The authenticationManager should not be null",
adminPolicy.getAuthenticationManager());
- assertNotNull("The springSecurityAccessPolicy should not be null",
adminPolicy.getSpringSecurityAccessPolicy());
+ assertNotNull(adminPolicy, "We should get admin policy");
+ assertNotNull(adminPolicy.getAccessDecisionManager(), "The
accessDecisionManager should not be null");
+ assertNotNull(adminPolicy.getAuthenticationManager(), "The
authenticationManager should not be null");
+ assertNotNull(adminPolicy.getSpringSecurityAccessPolicy(), "The
springSecurityAccessPolicy should not be null");
SpringSecurityAuthorizationPolicy userPolicy = context.getBean("user",
SpringSecurityAuthorizationPolicy.class);
- assertNotNull("We should get user policy", userPolicy);
- assertNotNull("The accessDecisionManager should not be null",
userPolicy.getAccessDecisionManager());
- assertNotNull("The authenticationManager should not be null",
userPolicy.getAuthenticationManager());
- assertNotNull("The springSecurityAccessPolicy should not be null",
userPolicy.getSpringSecurityAccessPolicy());
+ assertNotNull(userPolicy, "We should get user policy");
+ assertNotNull(userPolicy.getAccessDecisionManager(), "The
accessDecisionManager should not be null");
+ assertNotNull(userPolicy.getAuthenticationManager(), "The
authenticationManager should not be null");
+ assertNotNull(userPolicy.getSpringSecurityAccessPolicy(), "The
springSecurityAccessPolicy should not be null");
- assertEquals("user policy and admin policy should have same
accessDecisionManager", adminPolicy.getAccessDecisionManager(),
userPolicy.getAccessDecisionManager());
- assertEquals("user policy and admin policy should have same
authenticationManager", adminPolicy.getAuthenticationManager(),
userPolicy.getAuthenticationManager());
+ assertEquals(adminPolicy.getAccessDecisionManager(),
userPolicy.getAccessDecisionManager(), "user policy and admin policy should
have same accessDecisionManager");
+ assertEquals(adminPolicy.getAuthenticationManager(),
userPolicy.getAuthenticationManager(), "user policy and admin policy should
have same authenticationManager");
}
}
