You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2021/04/19 14:51:58 UTC
[camel] branch master updated: CAMEL-16400: adjust manual
integration tests for camel-ldap (#5431)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c0ce6e5 CAMEL-16400: adjust manual integration tests for camel-ldap (#5431)
c0ce6e5 is described below
commit c0ce6e5d2a46793e654a1cb7c3609d14588649bb
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Mon Apr 19 16:50:44 2021 +0200
CAMEL-16400: adjust manual integration tests for camel-ldap (#5431)
---
components/camel-ldap/pom.xml | 28 +++++++---------------
.../{LdapRouteTest.java => LdapRouteManualIT.java} | 5 +++-
...RouteTwoTest.java => LdapRouteTwoManualIT.java} | 5 +++-
3 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index 3ad4bd2..854b22e 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -88,24 +88,12 @@
</dependency>
</dependencies>
- <!-- the tests does not work - due to complex ldap server tests - maybe try with testcontainers with existing ldap server -->
- <profiles>
- <profile>
- <id>ldap-skip-tests</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteManualIT.java
similarity index 96%
rename from components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java
rename to components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteManualIT.java
index cfdeb0f..fac5e49 100644
--- a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java
+++ b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteManualIT.java
@@ -37,6 +37,7 @@ import org.apache.directory.server.core.integ5.DirectoryExtension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.api.extension.ExtendWith;
import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
@@ -49,7 +50,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@ExtendWith(DirectoryExtension.class)
@CreateLdapServer(transports = { @CreateTransport(protocol = "LDAP") })
@ApplyLdifFiles("org/apache/camel/component/ldap/LdapRouteTest.ldif")
-public class LdapRouteTest extends AbstractLdapTestUnit {
+@EnabledIfSystemProperty(named = "enable.ldap.itests", matches = "true",
+ disabledReason = "the tests does not work due to complex ldap server environment")
+public class LdapRouteManualIT extends AbstractLdapTestUnit {
private CamelContext camel;
private ProducerTemplate template;
diff --git a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTwoTest.java b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTwoManualIT.java
similarity index 95%
rename from components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTwoTest.java
rename to components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTwoManualIT.java
index ebd28db..b3143ce 100644
--- a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTwoTest.java
+++ b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTwoManualIT.java
@@ -37,6 +37,7 @@ import org.apache.directory.server.core.integ5.DirectoryExtension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.api.extension.ExtendWith;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -46,7 +47,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@ExtendWith(DirectoryExtension.class)
@CreateLdapServer(transports = { @CreateTransport(protocol = "LDAP") })
@ApplyLdifFiles("org/apache/camel/component/ldap/LdapRouteTest.ldif")
-public class LdapRouteTwoTest extends AbstractLdapTestUnit {
+@EnabledIfSystemProperty(named = "enable.ldap.itests", matches = "true",
+ disabledReason = "the tests does not work due to complex ldap server environment")
+public class LdapRouteTwoManualIT extends AbstractLdapTestUnit {
private CamelContext camel;
private ProducerTemplate template;