This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a2fff579522bbf78e7f02b6f2968595aac57571c Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Tue Apr 5 12:16:19 2022 +0200 Rework and fix most of the microprofile config TCK failures --- tck/microprofile-tck/config/debug-suite.xml | 12 ++++++++++++ tck/microprofile-tck/config/pom.xml | 21 +++++++++++++++++++-- .../config/src/test/resources/arquillian.xml | 13 +++++++++++++ tck/microprofile-tck/config/tck-suite.xml | 10 ++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/tck/microprofile-tck/config/debug-suite.xml b/tck/microprofile-tck/config/debug-suite.xml new file mode 100644 index 0000000000..90ddf86d13 --- /dev/null +++ b/tck/microprofile-tck/config/debug-suite.xml @@ -0,0 +1,12 @@ +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > + +<suite name="microprofile-config-TCK" verbose="2" configfailurepolicy="continue" > + <test name="microprofile-config 2.0 TCK"> + <classes> + <class name="org.eclipse.microprofile.config.tck.ConfigPropertiesTest"></class> + <class name="org.eclipse.microprofile.config.tck.ConfigProviderTest"></class> + <class name="org.eclipse.microprofile.config.tck.CDIPlainInjectionTest"></class> + <class name="org.eclipse.microprofile.config.tck.configsources.DefaultConfigSourceOrdinalTest"></class> + </classes> + </test> +</suite> \ No newline at end of file diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml index ec24534533..8cf6f5cb6d 100644 --- a/tck/microprofile-tck/config/pom.xml +++ b/tck/microprofile-tck/config/pom.xml @@ -33,16 +33,33 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>3.0.0-M6</version> <configuration> + <!-- <dependenciesToScan> <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency> </dependenciesToScan> + --> + <suiteXmlFiles> + <suiteXmlFile>tck-suite.xml</suiteXmlFile> + </suiteXmlFiles> <environmentVariables> + <MP_TCK_ENV_DUMMY>dummy</MP_TCK_ENV_DUMMY> <my_int_property>45</my_int_property> <MY_BOOLEAN_PROPERTY>true</MY_BOOLEAN_PROPERTY> <my_string_property>haha</my_string_property> <MY_STRING_PROPERTY>woohoo</MY_STRING_PROPERTY> + <config_ordinal>45</config_ordinal> + <customer_name>Bob</customer_name> </environmentVariables> + <systemPropertyVariables> + <mp.tck.prop.dummy>dummy</mp.tck.prop.dummy> + <customer.hobby>Tennis</customer.hobby> + <config_ordinal>120</config_ordinal> + </systemPropertyVariables> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <trimStackTrace>false</trimStackTrace> </configuration> </plugin> </plugins> @@ -63,7 +80,7 @@ <goal>test</goal> </goals> <configuration> - <systemPropertyVariables> + <systemPropertyVariables combine.children="append"> <arquillian.launch>tomee-plus</arquillian.launch> </systemPropertyVariables> </configuration> @@ -74,7 +91,7 @@ <goal>test</goal> </goals> <configuration> - <systemPropertyVariables> + <systemPropertyVariables combine.children="append"> <arquillian.launch>tomee-plume</arquillian.launch> </systemPropertyVariables> </configuration> diff --git a/tck/microprofile-tck/config/src/test/resources/arquillian.xml b/tck/microprofile-tck/config/src/test/resources/arquillian.xml index 5451a0c270..6f4e0053ed 100644 --- a/tck/microprofile-tck/config/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/config/src/test/resources/arquillian.xml @@ -26,6 +26,7 @@ <property name="httpPort">-1</property> <property name="ajpPort">-1</property> <property name="stopPort">-1</property> + <property name="debug">false</property> <property name="classifier">microprofile</property> <property name="conf">src/test/conf</property> <property name="dir">target/tomee</property> @@ -34,6 +35,10 @@ <property name="properties"> config.test = SUCCESS org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = false + + mp.tck.prop.dummy = dummy + customer.hobby = Tennis + config_ordinal = 120 </property> </configuration> </container> @@ -51,6 +56,10 @@ tomee.mp.scan = all config.test = SUCCESS org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = false + + mp.tck.prop.dummy = dummy + customer.hobby = Tennis + config_ordinal = 120 </property> </configuration> </container> @@ -68,6 +77,10 @@ tomee.mp.scan = all config.test = SUCCESS org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = false + + mp.tck.prop.dummy = dummy + customer.hobby = Tennis + config_ordinal = 120 </property> </configuration> </container> diff --git a/tck/microprofile-tck/config/tck-suite.xml b/tck/microprofile-tck/config/tck-suite.xml new file mode 100644 index 0000000000..a38a7643a3 --- /dev/null +++ b/tck/microprofile-tck/config/tck-suite.xml @@ -0,0 +1,10 @@ +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > + +<suite name="microprofile-config-TCK" verbose="2" configfailurepolicy="continue" > + <test name="microprofile-config 2.0 TCK"> + <packages> + <package name="org.eclipse.microprofile.config.tck.*"> + </package> + </packages> + </test> +</suite> \ No newline at end of file
