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 bb700b262d290d5286902ec9230137bdb9bbcdec
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 10:51:33 2020 +0200
[CAMEL-11807] Upgrade camel-spring-ldap to junit5
---
components/camel-spring-ldap/pom.xml | 4 +-
.../springldap/SpringLdapComponentTest.java | 11 +++---
.../springldap/SpringLdapProducerTest.java | 45 +++++++++++++---------
3 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/components/camel-spring-ldap/pom.xml
b/components/camel-spring-ldap/pom.xml
index 1e3cd66..01d8708 100644
--- a/components/camel-spring-ldap/pom.xml
+++ b/components/camel-spring-ldap/pom.xml
@@ -73,12 +73,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java
b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java
index c471549..f052a3e 100644
---
a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java
+++
b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java
@@ -28,23 +28,24 @@ import javax.naming.directory.SearchControls;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
import org.mockito.Captor;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.ldap.core.AttributesMapper;
import org.springframework.ldap.core.LdapTemplate;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class SpringLdapComponentTest extends CamelSpringTestSupport {
private LdapTemplate ldapTemplate;
diff --git
a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
index c244b50..04acd20 100644
---
a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
+++
b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
@@ -30,25 +30,26 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.DefaultMessage;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.ldap.core.AttributesMapper;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.core.LdapTemplate;
import org.springframework.ldap.query.LdapQuery;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class SpringLdapProducerTest extends CamelTestSupport {
@Mock
@@ -60,37 +61,40 @@ public class SpringLdapProducerTest extends
CamelTestSupport {
private SpringLdapProducer ldapProducer;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
when(ldapEndpoint.getLdapTemplate()).thenReturn(ldapTemplate);
ldapProducer = new SpringLdapProducer(ldapEndpoint);
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testEmptyExchange() throws Exception {
Exchange exchange = new DefaultExchange(context);
- ldapProducer.process(exchange);
+ assertThrows(UnsupportedOperationException.class,
+ () -> ldapProducer.process(exchange));
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testWrongBodyType() throws Exception {
Exchange exchange = new DefaultExchange(context);
Message in = new DefaultMessage(context);
in.setBody("");
exchange.setIn(in);
- ldapProducer.process(exchange);
+ assertThrows(UnsupportedOperationException.class,
+ () -> ldapProducer.process(exchange));
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testNoDN() throws Exception {
Exchange exchange = new DefaultExchange(context);
Message in = new DefaultMessage(context);
Map<String, Object> body = new HashMap<>();
- processBody(exchange, in, body);
+ assertThrows(UnsupportedOperationException.class,
+ () -> processBody(exchange, in, body));
}
@Test
@@ -112,7 +116,7 @@ public class SpringLdapProducerTest extends
CamelTestSupport {
ldapProducer.process(exchange);
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testEmptyDN() throws Exception {
Exchange exchange = new DefaultExchange(context);
Message in = new DefaultMessage(context);
@@ -120,10 +124,11 @@ public class SpringLdapProducerTest extends
CamelTestSupport {
Map<String, Object> body = new HashMap<>();
body.put(SpringLdapProducer.DN, "");
- processBody(exchange, in, body);
+ assertThrows(UnsupportedOperationException.class,
+ () -> processBody(exchange, in, body));
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testNullDN() throws Exception {
Exchange exchange = new DefaultExchange(context);
Message in = new DefaultMessage(context);
@@ -131,10 +136,11 @@ public class SpringLdapProducerTest extends
CamelTestSupport {
Map<String, Object> body = new HashMap<>();
body.put(SpringLdapProducer.DN, null);
- processBody(exchange, in, body);
+ assertThrows(UnsupportedOperationException.class,
+ () -> processBody(exchange, in, body));
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testNullOperation() throws Exception {
Exchange exchange = new DefaultExchange(context);
Message in = new DefaultMessage(context);
@@ -142,7 +148,8 @@ public class SpringLdapProducerTest extends
CamelTestSupport {
Map<String, Object> body = new HashMap<>();
body.put(SpringLdapProducer.DN, " ");
- processBody(exchange, in, body);
+ assertThrows(UnsupportedOperationException.class,
+ () -> processBody(exchange, in, body));
}
@Test
