CAMEL-10118: Fixed Sjms test dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6694368c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6694368c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6694368c Branch: refs/heads/master Commit: 6694368c2de67f74e9640c5fbbf2499612f17114 Parents: 15fc685 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Mon Jul 4 18:04:44 2016 +0200 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Mon Jul 4 18:04:44 2016 +0200 ---------------------------------------------------------------------- .../camel/itest/springboot/ITestConfigBuilder.java | 3 +++ .../apache/camel/itest/springboot/CamelSjmsTest.java | 8 ++++++-- .../itest/springboot/util/ArquillianPackager.java | 15 ++++++++++----- 3 files changed, 19 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6694368c/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java index 5863fb1..5f6caa9 100644 --- a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java +++ b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java @@ -105,6 +105,9 @@ public class ITestConfigBuilder { } public ITestConfigBuilder exclusion(String exclusionCanonicalForm) { + if (exclusionCanonicalForm.split(":").length != 2) { + throw new IllegalArgumentException("Expected exclusion in the form groupId:artifactId, got: " + exclusionCanonicalForm); + } if (config.getMavenExclusions() == null) { config.setMavenExclusions(new HashSet<String>()); } http://git-wip-us.apache.org/repos/asf/camel/blob/6694368c/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSjmsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSjmsTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSjmsTest.java index 26e6ec2..d5d8384 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSjmsTest.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSjmsTest.java @@ -35,8 +35,11 @@ public class CamelSjmsTest extends AbstractSpringBootTestSupport { public static ITestConfig createTestConfig() { return new ITestConfigBuilder() .module(inferModuleName(CamelSjmsTest.class)) + .exclusion("com.atomikos:transactions-jta") +// // to run unit tests // .dependency("com.atomikos:transactions-jdbc:3.9.3") // .dependency("com.atomikos:transactions-jms:3.9.3") +// .dependency("com.atomikos:transactions-api:3.9.3") // .dependency("javax.transaction:javax.transaction-api:1.2") // .disableJmx("org.apache.activemq:*") .build(); @@ -45,8 +48,9 @@ public class CamelSjmsTest extends AbstractSpringBootTestSupport { @Test public void componentTests() throws Exception { //this.runComponentTest(config); - this.runModuleUnitTestsIfEnabled(config); - } + // Unit tests can be enabled if required + //this.runModuleUnitTestsIfEnabled(config); + } } http://git-wip-us.apache.org/repos/asf/camel/blob/6694368c/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java index 102d42f..985427b 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java @@ -164,7 +164,7 @@ public final class ArquillianPackager { for (MavenResolvedArtifact art : moduleArtifacts) { MavenCoordinate c = art.getCoordinate(); - if (!validTestDependency(c)) { + if (!validTestDependency(config, c)) { continue; } MavenDependency dep = MavenDependencies.createDependency(c, ScopeType.RUNTIME, false, commonExclutionArray); @@ -227,9 +227,9 @@ public final class ArquillianPackager { // Adding configuration properties for (Map.Entry<Object, Object> e : System.getProperties().entrySet()) { - if(e.getKey() instanceof String && e.getValue() instanceof String) { + if (e.getKey() instanceof String && e.getValue() instanceof String) { String key = (String) e.getKey(); - if(key.startsWith(ITestConfigBuilder.CONFIG_PREFIX)) { + if (key.startsWith(ITestConfigBuilder.CONFIG_PREFIX)) { external.addSystemProperty(key, (String) e.getValue()); } } @@ -279,9 +279,10 @@ public final class ArquillianPackager { return cl; } - private static boolean validTestDependency(MavenCoordinate coordinate) { + private static boolean validTestDependency(ITestConfig config, MavenCoordinate coordinate) { - Pattern[] patterns = new Pattern[]{Pattern.compile("^log4j$"), Pattern.compile("^slf4j-log4j12$"), Pattern.compile("^slf4j-simple$"), Pattern.compile("^slf4j-jdk14$"), Pattern.compile("^logback-classic$"), Pattern.compile("^logback-core$")}; + Pattern[] patterns = new Pattern[]{Pattern.compile("^log4j$"), Pattern.compile("^slf4j-log4j12$"), Pattern.compile("^slf4j-simple$"), Pattern.compile("^slf4j-jdk14$"), Pattern.compile + ("^logback-classic$"), Pattern.compile("^logback-core$")}; boolean valid = true; for (Pattern p : patterns) { @@ -291,6 +292,10 @@ public final class ArquillianPackager { } } + if (valid && config.getMavenExclusions().contains(coordinate.getGroupId() + ":" + coordinate.getArtifactId())) { + valid = false; + } + if (!valid) { debug("Discarded test dependency " + coordinate.toCanonicalForm()); }
