This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 13ce699c626a8c2951c2f1a4dc711358559ecbaf Author: Andy McCright <[email protected]> AuthorDate: Thu Jun 3 08:49:13 2021 -0500 Ensure test runs without CDI/MP Config Signed-off-by: Andy McCright <[email protected]> --- systests/microprofile/client/nocdi/pom.xml | 215 +++++++++++---------- .../microprofile/rest/client/AsyncMethodTest.java | 4 +- 2 files changed, 117 insertions(+), 102 deletions(-) diff --git a/systests/microprofile/client/nocdi/pom.xml b/systests/microprofile/client/nocdi/pom.xml index 8044259..7319bd9 100644 --- a/systests/microprofile/client/nocdi/pom.xml +++ b/systests/microprofile/client/nocdi/pom.xml @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <artifactId>cxf-microprofile-tck</artifactId> <groupId>org.apache.cxf.systests</groupId> @@ -34,103 +35,117 @@ <cxf.module.name>org.apache.cxf.systests.microprofile.nocdi</cxf.module.name> <cxf.wiremock.params>--port=8765</cxf.wiremock.params> </properties> - <dependencies> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>1.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${cxf.commons-logging.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jakarta.ws.rs</groupId> - <artifactId>jakarta.ws.rs-api</artifactId> - <version>${cxf.javax.ws.rs.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.microprofile.rest.client</groupId> - <artifactId>microprofile-rest-client-api</artifactId> - <version>${cxf.microprofile.rest.client.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-core</artifactId> - <version>${cxf.johnzon.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.json.bind</groupId> - <artifactId>javax.json.bind-api</artifactId> - <version>${cxf.json.bind.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.json</groupId> - <artifactId>javax.json-api</artifactId> - <version>${cxf.json.api.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>${cxf.slf4j.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.config</groupId> - <artifactId>geronimo-config-impl</artifactId> - <version>${cxf.geronimo.config.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-mp-client</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-jsonb</artifactId> - <version>${cxf.johnzon.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.microprofile.rest.client</groupId> - <artifactId>microprofile-rest-client-tck</artifactId> - <version>${cxf.microprofile.rest.client.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.arquillian.testng</groupId> - <artifactId>arquillian-testng-container</artifactId> - </exclusion> - <exclusion> - <groupId>org.reactivestreams</groupId> - <artifactId>reactive-streams-tck</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock</artifactId> - <version>${cxf.wiremock.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-core</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${cxf.commons-logging.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> + <version>${cxf.javax.ws.rs.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.microprofile.rest.client</groupId> + <artifactId>microprofile-rest-client-api</artifactId> + <version>${cxf.microprofile.rest.client.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.johnzon</groupId> + <artifactId>johnzon-core</artifactId> + <version>${cxf.johnzon.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.json.bind</groupId> + <artifactId>javax.json.bind-api</artifactId> + <version>${cxf.json.bind.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + <version>${cxf.json.api.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${cxf.slf4j.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.config</groupId> + <artifactId>geronimo-config-impl</artifactId> + <version>${cxf.geronimo.config.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-mp-client</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.johnzon</groupId> + <artifactId>johnzon-jsonb</artifactId> + <version>${cxf.johnzon.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.microprofile.rest.client</groupId> + <artifactId>microprofile-rest-client-tck</artifactId> + <version>${cxf.microprofile.rest.client.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.arquillian.testng</groupId> + <artifactId>arquillian-testng-container</artifactId> + </exclusion> + <exclusion> + <groupId>org.reactivestreams</groupId> + <artifactId>reactive-streams-tck</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.github.tomakehurst</groupId> + <artifactId>wiremock</artifactId> + <version>${cxf.wiremock.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.xmlunit</groupId> + <artifactId>xmlunit-core</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <classpathDependencyExcludes> + <classpathDependencyExclude>org.eclipse.microprofile.config:microprofile-config-api</classpathDependencyExclude> + <classpathDependencyExclude>jakarta.enterprise:jakarta.enterprise.cdi-api</classpathDependencyExclude> + </classpathDependencyExcludes> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/systests/microprofile/client/nocdi/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java b/systests/microprofile/client/nocdi/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java index 3ed9c51..17a04d1 100644 --- a/systests/microprofile/client/nocdi/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java +++ b/systests/microprofile/client/nocdi/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java @@ -71,13 +71,13 @@ public class AsyncMethodTest { try { Class.forName("org.eclipse.microprofile.config.ConfigProvider"); fail("ConfigProvider API class is on the classpath - results from this test project are not valid"); - } catch (Throwable t) { + } catch (ClassNotFoundException expected) { // expected } try { Class.forName("javax.enterprise.inject.spi.BeanManager"); fail("BeanManager API class is on the classpath - results from this test project are not valid"); - } catch (Throwable t) { + } catch (ClassNotFoundException expected) { //expected } }
