You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by rm...@apache.org on 2015/05/04 20:27:55 UTC
svn commit: r1677649 - in /bval/trunk/bval-tck: pom.xml src/main/java/
src/test/java/ src/test/resources/custom-jsr303-tck-suite.xml
Author: rmannibucau
Date: Mon May 4 18:27:54 2015
New Revision: 1677649
URL: http://svn.apache.org/r1677649
Log:
excluding TCK from 1.0 suite which can't be passed with an implementation of 1.1 spec
Added:
bval/trunk/bval-tck/src/test/resources/custom-jsr303-tck-suite.xml
Removed:
bval/trunk/bval-tck/src/main/java/
bval/trunk/bval-tck/src/test/java/
Modified:
bval/trunk/bval-tck/pom.xml
Modified: bval/trunk/bval-tck/pom.xml
URL: http://svn.apache.org/viewvc/bval/trunk/bval-tck/pom.xml?rev=1677649&r1=1677648&r2=1677649&view=diff
==============================================================================
--- bval/trunk/bval-tck/pom.xml (original)
+++ bval/trunk/bval-tck/pom.xml Mon May 4 18:27:54 2015
@@ -29,7 +29,6 @@
<artifactId>bval-tck10-runner</artifactId>
<name>Apache BVal :: bval-tck-runner (TCK Runner)</name>
- <description>Aggregates dependencies and runs the JSR-349 TCK</description>
<repositories>
<!--
@@ -93,6 +92,12 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.8</version>
+ </dependency>
</dependencies>
<properties>
@@ -177,12 +182,6 @@
<artifactId>geronimo-validation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.8</version>
- </dependency>
- <dependency>
<groupId>org.hibernate.jsr303.tck</groupId>
<artifactId>jsr303-tck</artifactId>
<version>1.0.6.GA</version>
@@ -263,7 +262,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
- <suiteXmlFile>${project.build.directory}/dependency/jsr303-tck-suite.xml</suiteXmlFile>
+ <suiteXmlFile>${project.basedir}/src/test/resources/custom-jsr303-tck-suite.xml</suiteXmlFile>
</suiteXmlFiles>
<argLine>-Xmx512m</argLine>
<forkMode>once</forkMode>
@@ -323,7 +322,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
- <suiteXmlFile>${project.build.directory}/dependency/jsr303-tck-suite.xml</suiteXmlFile>
+ <suiteXmlFile>${project.basedir}/src/test/resources/custom-jsr303-tck-suite.xml</suiteXmlFile>
</suiteXmlFiles>
<systemProperties>
<property>
Added: bval/trunk/bval-tck/src/test/resources/custom-jsr303-tck-suite.xml
URL: http://svn.apache.org/viewvc/bval/trunk/bval-tck/src/test/resources/custom-jsr303-tck-suite.xml?rev=1677649&view=auto
==============================================================================
--- bval/trunk/bval-tck/src/test/resources/custom-jsr303-tck-suite.xml (added)
+++ bval/trunk/bval-tck/src/test/resources/custom-jsr303-tck-suite.xml Mon May 4 18:27:54 2015
@@ -0,0 +1,45 @@
+<!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="JSR-303-TCK" verbose="1">
+ <test name="JSR-303-TCK">
+ <method-selectors>
+ <method-selector>
+ <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector"/>
+ </method-selector>
+ <method-selector>
+ <selector-class name="org.jboss.testharness.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector"/>
+ </method-selector>
+ <method-selector> <!-- spec changed, we can't pass tck 1.0 and tck 1.1 so excluding the 1.0 since we target 1.1 -->
+ <script language="beanshell"><![CDATA[
+ !method.name.equals("testClassLevelConstraints")
+ || !method.declaringClass.name.equals("org.hibernate.jsr303.tck.tests.constraints.application.ValidationRequirementTest")
+ ]]></script>
+ </method-selector>
+ </method-selectors>
+ <groups>
+ <run>
+ <exclude name="underInvestigation"/>
+ <exclude name="ri-broken"/>
+ <exclude name="jboss-as-broken"/>
+ <exclude name="broken"/>
+ </run>
+ </groups>
+ <packages>
+ <package name="org.hibernate.jsr303.tck.tests" />
+ </packages>
+ </test>
+</suite>