Move all TCK test to users/test so they are run by the continuos build.
Review at http://gwt-code-reviews.appspot.com/1267801
Review by: rchandia@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9523 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/validationtck/build.xml b/samples/validationtck/build.xml
index 863f851..67094c5 100755
--- a/samples/validationtck/build.xml
+++ b/samples/validationtck/build.xml
@@ -83,6 +83,8 @@
</target>
+ <!-- TODO(nchalko) move the tck target to user/build.xml and then delete
+ all of samples/validaitontck -->
<target name="tck"
depends="tck.run,tck.report"
description="Run all tests for this project.">
diff --git a/user/build.xml b/user/build.xml
index 7ff87e8..1fc402f 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -68,6 +68,17 @@
<pathelement location="${gwt.tools.lib}/slf4j/slf4j-api/slf4j-api-1.6.1.jar" />
<pathelement location="${gwt.tools.lib}/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar" />
<pathelement location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
+ <!-- TCK jars -->
+ <pathelement location="${gwt.tools.lib}/hibernate/validator/tck/jsr303-tck-1.0.3.GA-sources.jar" />
+ <pathelement location="${gwt.tools.lib}/hibernate/validator/tck/jsr303-tck-1.0.3.GA.jar" />
+ <pathelement location="${gwt.tools.lib}/jboss/test-audit/jboss-test-audit-api-1.0.0-sources.jar" />
+ <pathelement location="${gwt.tools.lib}/jboss/test-audit/jboss-test-audit-api-1.0.0.jar" />
+ <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-1.0.0-sources.jar" />
+ <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-1.0.0.jar" />
+ <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-api-1.0.0-sources.jar" />
+ <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-api-1.0.0.jar" />
+ <pathelement location="${gwt.tools.lib}/testng/testng-5.14.1-sources.jar" />
+ <pathelement location="${gwt.tools.lib}/testng/testng-5.14.1.jar" />
<pathelement location="${gwt.dev.jar}" />
</path>
@@ -114,8 +125,7 @@
depends="compile.dev.tests, compile.emma.if.enabled"
unless="compile.tests.complete">
<mkdir dir="${javac.junit.out}" />
- <gwt.javac srcdir="test" excludes="com/google/gwt/langtest/**"
- destdir="${javac.junit.out}">
+ <gwt.javac srcdir="test" excludes="com/google/gwt/langtest/**" destdir="${javac.junit.out}">
<classpath>
<pathelement location="${javac.out}" />
<pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/common/TCKValidationProvider.java b/user/test-super/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/common/TCKValidationProvider.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/common/TCKValidationProvider.java
rename to user/test-super/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/common/TCKValidationProvider.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/common/TCKValidatorConfiguration.java b/user/test-super/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/common/TCKValidatorConfiguration.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/common/TCKValidatorConfiguration.java
rename to user/test-super/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/common/TCKValidatorConfiguration.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java b/user/test-super/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java
rename to user/test-super/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/tests/validation/ValidationTest.java b/user/test-super/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/tests/validation/ValidationTest.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/tests/validation/ValidationTest.java
rename to user/test-super/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/tests/validation/ValidationTest.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/util/TestUtil.java b/user/test-super/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/util/TestUtil.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/util/TestUtil.java
rename to user/test-super/org/hibernate/jsr303/tck/super/org/hibernate/jsr303/tck/util/TestUtil.java
diff --git a/samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/AbstractTest.java b/user/test-super/org/jboss/testharness/super/org/jboss/testharness/AbstractTest.java
similarity index 100%
rename from samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/AbstractTest.java
rename to user/test-super/org/jboss/testharness/super/org/jboss/testharness/AbstractTest.java
diff --git a/samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/api/Configuration.java b/user/test-super/org/jboss/testharness/super/org/jboss/testharness/api/Configuration.java
similarity index 100%
rename from samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/api/Configuration.java
rename to user/test-super/org/jboss/testharness/super/org/jboss/testharness/api/Configuration.java
diff --git a/samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/api/ResourceDescriptor.java b/user/test-super/org/jboss/testharness/super/org/jboss/testharness/api/ResourceDescriptor.java
similarity index 100%
rename from samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/api/ResourceDescriptor.java
rename to user/test-super/org/jboss/testharness/super/org/jboss/testharness/api/ResourceDescriptor.java
diff --git a/samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/impl/packaging/TCKArtifact.java b/user/test-super/org/jboss/testharness/super/org/jboss/testharness/impl/packaging/TCKArtifact.java
similarity index 100%
rename from samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/impl/packaging/TCKArtifact.java
rename to user/test-super/org/jboss/testharness/super/org/jboss/testharness/impl/packaging/TCKArtifact.java
diff --git a/samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/spi/Containers.java b/user/test-super/org/jboss/testharness/super/org/jboss/testharness/spi/Containers.java
similarity index 100%
rename from samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/spi/Containers.java
rename to user/test-super/org/jboss/testharness/super/org/jboss/testharness/spi/Containers.java
diff --git a/samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/spi/StandaloneContainers.java b/user/test-super/org/jboss/testharness/super/org/jboss/testharness/spi/StandaloneContainers.java
similarity index 100%
rename from samples/validationtck/test/org/jboss/testharness/super/org/jboss/testharness/spi/StandaloneContainers.java
rename to user/test-super/org/jboss/testharness/super/org/jboss/testharness/spi/StandaloneContainers.java
diff --git a/samples/validationtck/test/org/testng/super/org/testng/Assert.java b/user/test-super/org/testng/super/org/testng/Assert.java
similarity index 100%
rename from samples/validationtck/test/org/testng/super/org/testng/Assert.java
rename to user/test-super/org/testng/super/org/testng/Assert.java
diff --git a/samples/validationtck/test/org/testng/super/org/testng/IClass.java b/user/test-super/org/testng/super/org/testng/IClass.java
similarity index 100%
rename from samples/validationtck/test/org/testng/super/org/testng/IClass.java
rename to user/test-super/org/testng/super/org/testng/IClass.java
diff --git a/samples/validationtck/test/org/testng/super/org/testng/ITestNGMethod.java b/user/test-super/org/testng/super/org/testng/ITestNGMethod.java
similarity index 100%
rename from samples/validationtck/test/org/testng/super/org/testng/ITestNGMethod.java
rename to user/test-super/org/testng/super/org/testng/ITestNGMethod.java
diff --git a/samples/validationtck/test/org/testng/super/org/testng/collections/Maps.java b/user/test-super/org/testng/super/org/testng/collections/Maps.java
similarity index 100%
rename from samples/validationtck/test/org/testng/super/org/testng/collections/Maps.java
rename to user/test-super/org/testng/super/org/testng/collections/Maps.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintApplicationGwtSuite.java b/user/test/com/google/gwt/validation/tck/ConstraintApplicationGwtSuite.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintApplicationGwtSuite.java
rename to user/test/com/google/gwt/validation/tck/ConstraintApplicationGwtSuite.java
index 1baea81..56a7303 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintApplicationGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ConstraintApplicationGwtSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests;
+package com.google.gwt.validation.tck;
import junit.framework.Test;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintCompositionGwtSuite.java b/user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintCompositionGwtSuite.java
rename to user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
index b20e164..c5d791b 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintCompositionGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests;
+package com.google.gwt.validation.tck;
import junit.framework.Test;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsGroupsGwtSuite.java b/user/test/com/google/gwt/validation/tck/ConstraintsGroupsGwtSuite.java
similarity index 95%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsGroupsGwtSuite.java
rename to user/test/com/google/gwt/validation/tck/ConstraintsGroupsGwtSuite.java
index 40e730a..70b5111 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsGroupsGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ConstraintsGroupsGwtSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests;
+package com.google.gwt.validation.tck;
import junit.framework.Test;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsInheritanceGwtSuite.java b/user/test/com/google/gwt/validation/tck/ConstraintsInheritanceGwtSuite.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsInheritanceGwtSuite.java
rename to user/test/com/google/gwt/validation/tck/ConstraintsInheritanceGwtSuite.java
index 62347f7..9834fcc 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsInheritanceGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ConstraintsInheritanceGwtSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests;
+package com.google.gwt.validation.tck;
import junit.framework.Test;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/CustomConstraintGwtSuite.java b/user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/CustomConstraintGwtSuite.java
rename to user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java
index 02891ef..09beccb 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/CustomConstraintGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests;
+package com.google.gwt.validation.tck;
import junit.framework.Test;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/MessageInterpolationGwtSuite.java b/user/test/com/google/gwt/validation/tck/MessageInterpolationGwtSuite.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/MessageInterpolationGwtSuite.java
rename to user/test/com/google/gwt/validation/tck/MessageInterpolationGwtSuite.java
index 8cf690b..ad5e4db 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/MessageInterpolationGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/MessageInterpolationGwtSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests;
+package com.google.gwt.validation.tck;
import junit.framework.Test;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/MetadataGwtSuite.java b/user/test/com/google/gwt/validation/tck/MetadataGwtSuite.java
similarity index 95%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/MetadataGwtSuite.java
rename to user/test/com/google/gwt/validation/tck/MetadataGwtSuite.java
index 8cc4d27..3ce44a9 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/MetadataGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/MetadataGwtSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests;
+package com.google.gwt.validation.tck;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationGwtSuite.java b/user/test/com/google/gwt/validation/tck/ValidationGwtSuite.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationGwtSuite.java
rename to user/test/com/google/gwt/validation/tck/ValidationGwtSuite.java
index 2860955..b0335f3 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ValidationGwtSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests;
+package com.google.gwt.validation.tck;
import junit.framework.Test;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorFactoryGwtSuite.java b/user/test/com/google/gwt/validation/tck/ValidatorFactoryGwtSuite.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorFactoryGwtSuite.java
rename to user/test/com/google/gwt/validation/tck/ValidatorFactoryGwtSuite.java
index 2d97050..b9ff6d7 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorFactoryGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ValidatorFactoryGwtSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests;
+package com.google.gwt.validation.tck;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorResolutionGwtSuite.java b/user/test/com/google/gwt/validation/tck/ValidatorResolutionGwtSuite.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorResolutionGwtSuite.java
rename to user/test/com/google/gwt/validation/tck/ValidatorResolutionGwtSuite.java
index f5dede2..7a09f10 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorResolutionGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ValidatorResolutionGwtSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests;
+package com.google.gwt.validation.tck;
import junit.framework.Test;
diff --git a/samples/validationtck/test/log4j.properties b/user/test/log4j.properties
similarity index 100%
rename from samples/validationtck/test/log4j.properties
rename to user/test/log4j.properties
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/Jsr303Tck.gwt.xml b/user/test/org/hibernate/jsr303/tck/Jsr303Tck.gwt.xml
similarity index 73%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/Jsr303Tck.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/Jsr303Tck.gwt.xml
index 73bb554..0ed12fb 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/Jsr303Tck.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/Jsr303Tck.gwt.xml
@@ -10,10 +10,7 @@
<inherits name='org.testng.TestNg' />
<source path="">
<include name="common/*.java" />
- <include name="util/*.java" />
- <exclude name="util/StandaloneContainersImpl.java" />
- <exclude name="util/TckTestSuite*.java" />
- <exclude name="util/UtilJreSuite.java" />
+ <include name="util/client/*.java" />
</source>
<super-source path="super" />
</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationTck.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/ValidationTck.gwt.xml
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationTck.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/ValidationTck.gwt.xml
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTest.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTest.gwt.xml
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTest.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTest.gwt.xml
index cacbec4..920c549 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTest.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTest.gwt.xml
@@ -19,7 +19,6 @@
<inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
- <exclude name="super" />
</source>
<replace-with class="org.hibernate.jsr303.tck.tests.constraints.application.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTestValidatorFactory.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTestValidatorFactory.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTestValidatorFactory.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTestValidatorFactory.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementGwtTest.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementGwtTest.java
index 057a315..c692f28 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementGwtTest.java
@@ -17,7 +17,7 @@
import com.google.gwt.junit.client.GWTTestCase;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
/**
* Wraps {@link ValidationRequirementTest} .
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java
index 64a1509..9721c6e 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java
@@ -17,7 +17,7 @@
import com.google.gwt.junit.client.GWTTestCase;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
/**
* Wraps {@link ConstraintCompositionTest}.
@@ -55,6 +55,7 @@
delegate.testEachFailingConstraintCreatesConstraintViolation();
}
+ @Failing(issue = 5799)
public void testGroupsDefinedOnMainAnnotationAreInherited() {
delegate.testGroupsDefinedOnMainAnnotationAreInherited();
}
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTest.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTest.gwt.xml
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTest.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTest.gwt.xml
index 23c3a02..c2d6b12 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTest.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTest.gwt.xml
@@ -19,7 +19,6 @@
<inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
- <exclude name="super" />
</source>
<replace-with class="org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTestValidatorFactory.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTestValidatorFactory.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTestValidatorFactory.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTestValidatorFactory.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorGwtTest.java
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorGwtTest.java
index cff9882..69ad2d0 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorGwtTest.java
@@ -17,7 +17,7 @@
import com.google.gwt.junit.client.GWTTestCase;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
/**
* Test wrapper for {@link CustomConstraintValidatorTest}.
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTest.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTest.gwt.xml
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTest.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTest.gwt.xml
index 12a7dfd..a1abcb7 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTest.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTest.gwt.xml
@@ -19,7 +19,6 @@
<inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
- <exclude name="super" />
</source>
<replace-with class="org.hibernate.jsr303.tck.tests.constraints.customconstraint.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTestValidatorFactory.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTestValidatorFactory.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTestValidatorFactory.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTestValidatorFactory.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/GroupGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/groups/GroupGwtTest.java
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/GroupGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/groups/GroupGwtTest.java
index f6ec82e..76aa763 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/GroupGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/groups/GroupGwtTest.java
@@ -17,7 +17,7 @@
import com.google.gwt.junit.client.GWTTestCase;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
/**
* Test wrapper for {@link GroupTest}.
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTest.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTest.gwt.xml
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTest.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTest.gwt.xml
index 6b1a69f..dab9c49 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTest.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTest.gwt.xml
@@ -19,7 +19,6 @@
<inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
- <exclude name="super" />
</source>
<replace-with class="org.hibernate.jsr303.tck.tests.constraints.groups.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTestValidatorFactory.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTestValidatorFactory.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTestValidatorFactory.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTestValidatorFactory.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceGwtTest.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceGwtTest.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTest.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTest.gwt.xml
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTest.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTest.gwt.xml
index bda35dc..0246c75 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTest.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTest.gwt.xml
@@ -19,7 +19,6 @@
<inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
- <exclude name="super" />
</source>
<replace-with class="org.hibernate.jsr303.tck.tests.constraints.inheritance.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTestValidatorFactory.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTestValidatorFactory.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTestValidatorFactory.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTestValidatorFactory.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTest.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTest.gwt.xml
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTest.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTest.gwt.xml
index 5bddcc0..96c8942 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTest.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTest.gwt.xml
@@ -19,7 +19,6 @@
<inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
- <exclude name="super" />
</source>
<replace-with class="org.hibernate.jsr303.tck.tests.constraints.validatorresolution.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTestValidatorFactory.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTestValidatorFactory.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTestValidatorFactory.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTestValidatorFactory.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtTest.java
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtTest.java
index e96fee4..0472ca9 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtTest.java
@@ -17,7 +17,7 @@
import com.google.gwt.junit.client.GWTTestCase;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
/**
* Wraps {@link ValidatorResolutionTest} .
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationGwtTest.java
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationGwtTest.java
index 250e02b..5a71397 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationGwtTest.java
@@ -17,7 +17,7 @@
import com.google.gwt.junit.client.GWTTestCase;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
/**
* Wraps {@link MessageInterpolationTest}.
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTest.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTest.gwt.xml
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTest.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTest.gwt.xml
index 734efca..668b796 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTest.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTest.gwt.xml
@@ -19,7 +19,6 @@
<inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
- <exclude name="super" />
</source>
<replace-with class="org.hibernate.jsr303.tck.tests.messageinterpolation.TckUserValidationMessageProvider">
<when-type-is class="com.google.gwt.validation.client.UserValidationMessagesResolver" />
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTestValidatorFactory.java b/user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTestValidatorFactory.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTestValidatorFactory.java
rename to user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTestValidatorFactory.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckUserValidationMessageProvider.java b/user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckUserValidationMessageProvider.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckUserValidationMessageProvider.java
rename to user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckUserValidationMessageProvider.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.java b/user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.java
rename to user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties b/user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties
rename to user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties b/user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties
rename to user/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorGwtTest.java
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorGwtTest.java
index d3c6943..07ef6af 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorGwtTest.java
@@ -17,7 +17,7 @@
import com.google.gwt.junit.client.GWTTestCase;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
/**
* Test wrapper for {@link BeanDescriptorTest}.
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTest.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/metadata/TckTest.gwt.xml
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTest.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/metadata/TckTest.gwt.xml
index 1685e92..cddeb2b 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTest.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/tests/metadata/TckTest.gwt.xml
@@ -19,7 +19,6 @@
<inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
- <exclude name="super" />
</source>
<replace-with class="org.hibernate.jsr303.tck.tests.metadata.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTestValidatorFactory.java b/user/test/org/hibernate/jsr303/tck/tests/metadata/TckTestValidatorFactory.java
similarity index 95%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTestValidatorFactory.java
rename to user/test/org/hibernate/jsr303/tck/tests/metadata/TckTestValidatorFactory.java
index 2c2915a..9813906 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTestValidatorFactory.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/metadata/TckTestValidatorFactory.java
@@ -24,7 +24,7 @@
/**
* Test {@link AbstractGwtValidatorFactory} for
- * {@link org.hibernate.jsr303.tck.tests.MetadataGwtSuite}.
+ * {@link com.google.gwt.validation.tck.MetadataGwtSuite}.
*/
public final class TckTestValidatorFactory extends AbstractGwtValidatorFactory {
/**
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/AbstractValidationTest.java b/user/test/org/hibernate/jsr303/tck/tests/validation/AbstractValidationTest.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/AbstractValidationTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/validation/AbstractValidationTest.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/PropertyPathGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/validation/PropertyPathGwtTest.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/PropertyPathGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/validation/PropertyPathGwtTest.java
index 6da41ea..c4361d4 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/PropertyPathGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/validation/PropertyPathGwtTest.java
@@ -15,7 +15,7 @@
*/
package org.hibernate.jsr303.tck.tests.validation;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
/**
* Test wrapper for {@link PropertyPathTest}.
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTest.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/validation/TckTest.gwt.xml
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTest.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/validation/TckTest.gwt.xml
index 053bf2a..45a6717 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTest.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/tests/validation/TckTest.gwt.xml
@@ -19,7 +19,6 @@
<inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
- <exclude name="super" />
</source>
<replace-with class="org.hibernate.jsr303.tck.tests.validation.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTestValidatorFactory.java b/user/test/org/hibernate/jsr303/tck/tests/validation/TckTestValidatorFactory.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTestValidatorFactory.java
rename to user/test/org/hibernate/jsr303/tck/tests/validation/TckTestValidatorFactory.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyGwtTest.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyGwtTest.java
index c8c819d..535d08b 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyGwtTest.java
@@ -15,7 +15,7 @@
*/
package org.hibernate.jsr303.tck.tests.validation;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
import javax.validation.ValidationException;
@@ -30,6 +30,7 @@
delegate.testIllegalArgumentExceptionIsThrownForNullValue();
}
+ @Failing(issue = 5804)
public void testPassingNullAsGroup() {
delegate.testPassingNullAsGroup();
}
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidateValueGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/validation/ValidateValueGwtTest.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidateValueGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/validation/ValidateValueGwtTest.java
index 98107e8..8bd1a93 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidateValueGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/validation/ValidateValueGwtTest.java
@@ -15,7 +15,7 @@
*/
package org.hibernate.jsr303.tck.tests.validation;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
/**
* Test wrapper for {@link ValidateValueTest}.
@@ -39,6 +39,7 @@
delegate.testValidateValueFailure();
}
+ @Failing(issue = 5804)
public void testValidateValuePassingNullAsGroup() {
delegate.testValidateValuePassingNullAsGroup();
}
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidationGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/validation/ValidationGwtTest.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidationGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/validation/ValidationGwtTest.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorGwtTest.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorGwtTest.java
rename to user/test/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorGwtTest.java
index 73df34e..6b4569e 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorGwtTest.java
@@ -17,7 +17,7 @@
import com.google.gwt.junit.client.GWTTestCase;
-import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.client.Failing;
/**
* Wraps
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTest.gwt.xml b/user/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTest.gwt.xml
similarity index 97%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTest.gwt.xml
rename to user/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTest.gwt.xml
index c5445cb..d562da5 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTest.gwt.xml
+++ b/user/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTest.gwt.xml
@@ -19,7 +19,6 @@
<inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
- <exclude name="super" />
</source>
<replace-with class="org.hibernate.jsr303.tck.tests.validatorfactory.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTestValidatorFactory.java b/user/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTestValidatorFactory.java
similarity index 100%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTestValidatorFactory.java
rename to user/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTestValidatorFactory.java
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
similarity index 96%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
rename to user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
index 51214da..9eaafe0 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
+++ b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
@@ -27,6 +27,10 @@
import junit.framework.Test;
import junit.framework.TestCase;
+import org.hibernate.jsr303.tck.util.client.Failing;
+import org.hibernate.jsr303.tck.util.client.NonTckTest;
+import org.hibernate.jsr303.tck.util.client.NotSupported;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapperTest.java b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapperTest.java
similarity index 92%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapperTest.java
rename to user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapperTest.java
index dc427e8..1e6e5cd 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapperTest.java
+++ b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapperTest.java
@@ -19,7 +19,10 @@
import junit.framework.TestCase;
-import org.hibernate.jsr303.tck.util.NotSupported.Reason;
+import org.hibernate.jsr303.tck.util.client.Failing;
+import org.hibernate.jsr303.tck.util.client.NonTckTest;
+import org.hibernate.jsr303.tck.util.client.NotSupported;
+import org.hibernate.jsr303.tck.util.client.NotSupported.Reason;
/**
* Tests for {@link TckTestSuiteWrapper}.
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/util/UtilJreSuite.java b/user/test/org/hibernate/jsr303/tck/util/UtilJreSuite.java
similarity index 99%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/util/UtilJreSuite.java
rename to user/test/org/hibernate/jsr303/tck/util/UtilJreSuite.java
index 4800375..5e87704 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/util/UtilJreSuite.java
+++ b/user/test/org/hibernate/jsr303/tck/util/UtilJreSuite.java
@@ -18,6 +18,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+
/**
* Test Suite for non GWT tests.
*/
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/util/Failing.java b/user/test/org/hibernate/jsr303/tck/util/client/Failing.java
similarity index 93%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/util/Failing.java
rename to user/test/org/hibernate/jsr303/tck/util/client/Failing.java
index d4fc0e9..f742a30 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/util/Failing.java
+++ b/user/test/org/hibernate/jsr303/tck/util/client/Failing.java
@@ -13,7 +13,9 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.util;
+package org.hibernate.jsr303.tck.util.client;
+
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/util/NonTckTest.java b/user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java
similarity index 92%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/util/NonTckTest.java
rename to user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java
index 4fe665e..ef1f899 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/util/NonTckTest.java
+++ b/user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java
@@ -13,7 +13,9 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.util;
+package org.hibernate.jsr303.tck.util.client;
+
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/util/NotSupported.java b/user/test/org/hibernate/jsr303/tck/util/client/NotSupported.java
similarity index 93%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/util/NotSupported.java
rename to user/test/org/hibernate/jsr303/tck/util/client/NotSupported.java
index d3e8605..cf49ea7 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/util/NotSupported.java
+++ b/user/test/org/hibernate/jsr303/tck/util/client/NotSupported.java
@@ -13,7 +13,9 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.util;
+package org.hibernate.jsr303.tck.util.client;
+
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/samples/validationtck/test/org/jboss/test/audit/JbossTestAudit.gwt.xml b/user/test/org/jboss/test/audit/JbossTestAudit.gwt.xml
similarity index 81%
rename from samples/validationtck/test/org/jboss/test/audit/JbossTestAudit.gwt.xml
rename to user/test/org/jboss/test/audit/JbossTestAudit.gwt.xml
index 3e95704..28f34b9 100644
--- a/samples/validationtck/test/org/jboss/test/audit/JbossTestAudit.gwt.xml
+++ b/user/test/org/jboss/test/audit/JbossTestAudit.gwt.xml
@@ -6,7 +6,5 @@
<module>
<inherits name="com.google.gwt.user.User" />
<source path="">
- <exclude name="super/" />
</source>
- <super-source path="super" />
</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/org/jboss/testharness/JbossTestHarness.gwt.xml b/user/test/org/jboss/testharness/JbossTestHarness.gwt.xml
similarity index 73%
rename from samples/validationtck/test/org/jboss/testharness/JbossTestHarness.gwt.xml
rename to user/test/org/jboss/testharness/JbossTestHarness.gwt.xml
index bb851ef..8c8fa5d 100644
--- a/samples/validationtck/test/org/jboss/testharness/JbossTestHarness.gwt.xml
+++ b/user/test/org/jboss/testharness/JbossTestHarness.gwt.xml
@@ -5,9 +5,8 @@
-->
<module>
<inherits name="org.testng.TestNg" />
- <source path="">
- <exclude name="super/" />
- <include name="api/DeploymentException.java"/>
+ <source path="api">
+ <include name="DeploymentException.java"/>
</source>
<super-source path="super" />
</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/org/testng/TestNg.gwt.xml b/user/test/org/testng/TestNg.gwt.xml
similarity index 100%
rename from samples/validationtck/test/org/testng/TestNg.gwt.xml
rename to user/test/org/testng/TestNg.gwt.xml
