This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch cxf4
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/cxf4 by this push:
new 83ce5140f7 TOMEE-4139 - Fix up Rest Client TCK (run state dependent
test in additional exec)
83ce5140f7 is described below
commit 83ce5140f7a4e20d78fac5631031036ab9e21a79
Author: Richard Zowalla <[email protected]>
AuthorDate: Wed Aug 23 14:48:18 2023 +0200
TOMEE-4139 - Fix up Rest Client TCK (run state dependent test in additional
exec)
---
tck/microprofile-tck/rest-client/pom.xml | 42 +++++++++++++---------
.../{tck-suite.xml => tck-suite-jsonb-solo.xml} | 7 +---
tck/microprofile-tck/rest-client/tck-suite.xml | 2 +-
3 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/tck/microprofile-tck/rest-client/pom.xml
b/tck/microprofile-tck/rest-client/pom.xml
index 88bc5bb99b..8263f6e267 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -65,22 +65,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>tck-suite.xml</suiteXmlFile>
- </suiteXmlFiles>
- <!--
- <dependenciesToScan>
-
<dependency>org.eclipse.microprofile.rest.client:microprofile-rest-client-tck</dependency>
- </dependenciesToScan>
- -->
- <excludes>
- <!-- TODO - Remove once issue
https://github.com/eclipse/microprofile-rest-client/issues/166 is solved -->
-
<exclude>org.eclipse.microprofile.rest.client.tck.InvokeWithJsonBProviderTest</exclude>
- <!-- TODO - Will pass in solo mode. State?! -->
-
<exclude>org.eclipse.microprofile.rest.client.tck.jsonb.InvokeWithJsonBProviderTest</exclude>
- </excludes>
- </configuration>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>tck-suite.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mp-clienb-jsonb-solo</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>tck-suite-jsonb-solo.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/tck/microprofile-tck/rest-client/tck-suite.xml
b/tck/microprofile-tck/rest-client/tck-suite-jsonb-solo.xml
similarity index 72%
copy from tck/microprofile-tck/rest-client/tck-suite.xml
copy to tck/microprofile-tck/rest-client/tck-suite-jsonb-solo.xml
index c4a13a86be..973f2adf76 100644
--- a/tck/microprofile-tck/rest-client/tck-suite.xml
+++ b/tck/microprofile-tck/rest-client/tck-suite-jsonb-solo.xml
@@ -20,12 +20,7 @@
<test name="microprofile-rest-client TCK">
<packages>
- <package name="org.eclipse.microprofile.rest.client.tck.*">
- <!-- bug in MyEventSourceServlet which depends on javax servlet api -->
- <exclude
name="org.eclipse.microprofile.rest.client.tck.sse.*"></exclude>
- <!-- will pass if run in solo mode -->
- <exclude
name="org.eclipse.microprofile.rest.client.tck.jsonb.*"></exclude>
- </package>
+ <package
name="org.eclipse.microprofile.rest.client.tck.jsonb.*"></package>
</packages>
</test>
diff --git a/tck/microprofile-tck/rest-client/tck-suite.xml
b/tck/microprofile-tck/rest-client/tck-suite.xml
index c4a13a86be..49ddb969fb 100644
--- a/tck/microprofile-tck/rest-client/tck-suite.xml
+++ b/tck/microprofile-tck/rest-client/tck-suite.xml
@@ -21,7 +21,7 @@
<test name="microprofile-rest-client TCK">
<packages>
<package name="org.eclipse.microprofile.rest.client.tck.*">
- <!-- bug in MyEventSourceServlet which depends on javax servlet api -->
+ <!-- bug in MyEventSourceServlet which depends on javax servlet api,
see https://github.com/eclipse/microprofile-rest-client/issues/316-->
<exclude
name="org.eclipse.microprofile.rest.client.tck.sse.*"></exclude>
<!-- will pass if run in solo mode -->
<exclude
name="org.eclipse.microprofile.rest.client.tck.jsonb.*"></exclude>
