Author: johndament
Date: Wed Aug 30 00:59:31 2017
New Revision: 1806656
URL: http://svn.apache.org/viewvc?rev=1806656&view=rev
Log:
Consolidating back to a single suite file.
Added:
geronimo/components/config/trunk/impl/ci-suite.xml
- copied, changed from r1806655, geronimo/components/config/trunk/impl/tck-suite.xml
geronimo/components/config/trunk/impl/tck-suite.xml
Removed:
geronimo/components/config/trunk/impl/internal-suite.xml
Modified:
geronimo/components/config/trunk/impl/pom.xml
geronimo/components/config/trunk/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java
Copied: geronimo/components/config/trunk/impl/ci-suite.xml (from r1806655, geronimo/components/config/trunk/impl/tck-suite.xml)
URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/ci-suite.xml?p2=geronimo/components/config/trunk/impl/ci-suite.xml&p1=geronimo/components/config/trunk/impl/tck-suite.xml&r1=1806655&r2=1806656&rev=1806656&view=diff
==============================================================================
--- geronimo/components/config/trunk/impl/tck-suite.xml (original)
+++ geronimo/components/config/trunk/impl/ci-suite.xml Wed Aug 30 00:59:31 2017
@@ -25,4 +25,11 @@
</packages>
</test>
+ <test name="Geronimo Config Tests">
+ <packages>
+ <package name="org.apache.geronimo.config.test.internal.*">
+ </package>
+ </packages>
+ </test>
+
</suite>
Modified: geronimo/components/config/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/pom.xml?rev=1806656&r1=1806655&r2=1806656&view=diff
==============================================================================
--- geronimo/components/config/trunk/impl/pom.xml (original)
+++ geronimo/components/config/trunk/impl/pom.xml Wed Aug 30 00:59:31 2017
@@ -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>
Modified: geronimo/components/config/trunk/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java
URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java?rev=1806656&r1=1806655&r2=1806656&view=diff
==============================================================================
--- geronimo/components/config/trunk/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java
(original)
+++ geronimo/components/config/trunk/impl/src/test/java/org/apache/geronimo/config/test/internal/ProviderTest.java
Wed Aug 30 00:59:31 2017
@@ -39,8 +39,7 @@ public class ProviderTest extends Arquil
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")
Added: geronimo/components/config/trunk/impl/tck-suite.xml
URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/tck-suite.xml?rev=1806656&view=auto
==============================================================================
--- geronimo/components/config/trunk/impl/tck-suite.xml (added)
+++ geronimo/components/config/trunk/impl/tck-suite.xml Wed Aug 30 00:59:31 2017
@@ -0,0 +1,26 @@
+<!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="MicroProfile-Config-TCK" verbose="2" configfailurepolicy="continue">
+
+ <test name="Microprofile Config TCK">
+ <packages>
+ <package name="org.eclipse.microprofile.config.tck.*"/>
+ </packages>
+ </test>
+
+</suite>
|