Consolidating back to a single suite file.
git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/config/trunk@1806656 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/impl/ci-suite.xml b/impl/ci-suite.xml
new file mode 100644
index 0000000..871ccd5
--- /dev/null
+++ b/impl/ci-suite.xml
@@ -0,0 +1,35 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+-->
+<suite name="microprofileconfig-TCK" verbose="2" configfailurepolicy="continue" >
+
+ <test name="Microprofile-config 1_0 TCK">
+ <packages>
+ <package name="org.eclipse.microprofile.config.tck.*">
+ </package>
+
+ </packages>
+ </test>
+
+ <test name="Geronimo Config Tests">
+ <packages>
+ <package name="org.apache.geronimo.config.test.internal.*">
+ </package>
+ </packages>
+ </test>
+
+</suite>
diff --git a/impl/internal-suite.xml b/impl/internal-suite.xml
deleted file mode 100644
index 2652628..0000000
--- a/impl/internal-suite.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="microprofileconfig-TCK" verbose="2" configfailurepolicy="continue" >
-
- <test name="Geronimo Tests">
- <packages>
- <package name="org.apache.geronimo.config.test.internal.*">
- </package>
- </packages>
- </test>
-
-</suite>
diff --git a/impl/pom.xml b/impl/pom.xml
index 6e048e2..0c639aa 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -87,8 +87,7 @@
<version>2.19.1</version>
<configuration>
<suiteXmlFiles>
- <suiteXmlFile>tck-suite.xml</suiteXmlFile>
- <suiteXmlFile>internal-suite.xml</suiteXmlFile>
+ <suiteXmlFile>ci-suite.xml</suiteXmlFile>
</suiteXmlFiles>
<environmentVariables>
<CDPATH>value-for-tck-since-we-ignore-empty</CDPATH>
diff --git a/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java b/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java
index 98ad024..5a7bcad 100644
--- a/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java
+++ b/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java
@@ -39,8 +39,7 @@
JavaArchive testJar = ShrinkWrap
.create(JavaArchive.class, "configProviderTest.jar")
.addClasses(ProviderTest.class, SomeBean.class)
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
- .as(JavaArchive.class);
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
return ShrinkWrap
.create(WebArchive.class, "providerTest.war")
diff --git a/impl/tck-suite.xml b/impl/tck-suite.xml
index a9fd699..feed33a 100644
--- a/impl/tck-suite.xml
+++ b/impl/tck-suite.xml
@@ -15,13 +15,11 @@
the specific language governing permissions and limitations under the
License.
-->
-<suite name="microprofileconfig-TCK" verbose="2" configfailurepolicy="continue" >
+<suite name="MicroProfile-Config-TCK" verbose="2" configfailurepolicy="continue">
- <test name="Microprofile-config 1_0 TCK">
+ <test name="Microprofile Config TCK">
<packages>
- <package name="org.eclipse.microprofile.config.tck.*">
- </package>
-
+ <package name="org.eclipse.microprofile.config.tck.*"/>
</packages>
</test>
