Fixed MicroProfile Config TCK tests.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/47b1f6f7 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/47b1f6f7 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/47b1f6f7 Branch: refs/heads/master Commit: 47b1f6f774d1df5ce310aa3448485a3bd0b6047d Parents: 1c6613b Author: Roberto Cortez <radcor...@yahoo.com> Authored: Sun Mar 4 23:32:21 2018 +0000 Committer: Roberto Cortez <radcor...@yahoo.com> Committed: Sun Mar 4 23:32:21 2018 +0000 ---------------------------------------------------------------------- tck/microprofile-tck/config/pom.xml | 31 ++++++++++++++++++ .../MicroProfileConfigTCKArchiveProcessor.java | 33 ++++++++++++++++++++ .../config/MicroProfileConfigTCKExtension.java | 11 +++++++ ....jboss.arquillian.core.spi.LoadableExtension | 1 + .../config/src/test/resources/arquillian.xml | 10 +----- 5 files changed, 77 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/47b1f6f7/tck/microprofile-tck/config/pom.xml ---------------------------------------------------------------------- diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml index 491241c..4b6b61d 100644 --- a/tck/microprofile-tck/config/pom.xml +++ b/tck/microprofile-tck/config/pom.xml @@ -51,6 +51,10 @@ <dependenciesToScan> <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency> </dependenciesToScan> + <!-- TODO - This requires a fix in geronimo-config-impl to use the Thread ClassLoader in ClassConverter. --> + <excludes> + <exclude>org.eclipse.microprofile.config.tck.ClassConverterTest</exclude> + </excludes> </configuration> </plugin> </plugins> @@ -93,6 +97,33 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.jboss.arquillian.testng</groupId> + <artifactId>arquillian-testng-core</artifactId> + <version>1.1.13.Final</version> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-api-maven</artifactId> + <version>2.2.2</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-impl-maven</artifactId> + <version>2.2.2</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-spi</artifactId> + <version>2.2.2</version> + <scope>test</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/tomee/blob/47b1f6f7/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java ---------------------------------------------------------------------- diff --git a/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java new file mode 100644 index 0000000..0cad5eb --- /dev/null +++ b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java @@ -0,0 +1,33 @@ +package org.apache.openejb.tck.microprofile.config; + +import org.eclipse.microprofile.config.tck.converters.UpperCaseDuckConverter; +import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; +import org.jboss.arquillian.test.spi.TestClass; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; + +import java.io.File; + +public class MicroProfileConfigTCKArchiveProcessor implements ApplicationArchiveProcessor { + @Override + public void process(final Archive<?> archive, final TestClass testClass) { + if (archive instanceof WebArchive) { + // TODO - this could be fixed in the TCK by adding UpperCaseDuckConverter into org.eclipse.microprofile.config.tck.ConverterTest + JavaArchive configJar = ShrinkWrap + .create(JavaArchive.class, "config-tck-additional.jar") + .addClass(UpperCaseDuckConverter.class) + ; + ((WebArchive) archive).addAsLibraries(configJar); + + File[] requiredLibraries = Maven.resolver() + .loadPomFromFile("pom.xml") + .resolve("org.hamcrest:hamcrest-all:1.3") + .withTransitivity() + .asFile(); + ((WebArchive) archive).addAsLibraries(requiredLibraries); + } + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/47b1f6f7/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKExtension.java ---------------------------------------------------------------------- diff --git a/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKExtension.java b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKExtension.java new file mode 100644 index 0000000..e30ece7 --- /dev/null +++ b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKExtension.java @@ -0,0 +1,11 @@ +package org.apache.openejb.tck.microprofile.config; + +import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; +import org.jboss.arquillian.core.spi.LoadableExtension; + +public class MicroProfileConfigTCKExtension implements LoadableExtension { + @Override + public void register(final ExtensionBuilder extensionBuilder) { + extensionBuilder.service(ApplicationArchiveProcessor.class, MicroProfileConfigTCKArchiveProcessor.class); + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/47b1f6f7/tck/microprofile-tck/config/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension ---------------------------------------------------------------------- diff --git a/tck/microprofile-tck/config/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/tck/microprofile-tck/config/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension new file mode 100644 index 0000000..8644cce --- /dev/null +++ b/tck/microprofile-tck/config/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension @@ -0,0 +1 @@ +org.apache.openejb.tck.microprofile.config.MicroProfileConfigTCKExtension http://git-wip-us.apache.org/repos/asf/tomee/blob/47b1f6f7/tck/microprofile-tck/config/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/tck/microprofile-tck/config/src/test/resources/arquillian.xml b/tck/microprofile-tck/config/src/test/resources/arquillian.xml index 1bacc58..ecddd0c 100644 --- a/tck/microprofile-tck/config/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/config/src/test/resources/arquillian.xml @@ -33,15 +33,7 @@ <property name="cleanOnStartUp">true</property> <property name="properties"> config.test = SUCCESS - </property> - <property name="additionalLibs"> - mvn:org.hamcrest:hamcrest-all:1.3 - mvn:org.hamcrest:hamcrest-core:1.3 - mvn:org.eclipse.microprofile.config:microprofile-config-tck:1.2 - mvn:org.testng:testng:6.9.9 - mvn:org.jboss.arquillian.test:arquillian-test-spi:1.1.13.Final - mvn:org.jboss.arquillian.testng:arquillian-testng-core:1.1.13.Final - mvn:org.jboss.shrinkwrap:shrinkwrap-api:1.2.6 + org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = false </property> </configuration> </container>