Move all tests to org/hibernate/jsr303/tck
[JSR 303 TCK Result] 54 of 258 (20.93%) Pass with 28 Failures and 13 Errors.
Review at http://gwt-code-reviews.appspot.com/1255801
Review by: rchandia@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9494 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/validationtck/build.xml b/samples/validationtck/build.xml
index 693e682..863f851 100755
--- a/samples/validationtck/build.xml
+++ b/samples/validationtck/build.xml
@@ -60,8 +60,8 @@
<property name="emma.merged.out" value="${junit.out}/emma-coverage" />
<property name="gwt.junit.testcase.web.includes" value="${gwt.junit.testcase.includes}" />
<property name="gwt.junit.testcase.web.excludes" value="" />
- <property name="gwt.junit.testcase.dev.includes" value="${gwt.junit.testcase.includes}" />
- <property name="gwt.junit.testcase.dev.excludes" value="com/google/gwt/sample/validationtck/util/*.class" />
+ <property name="gwt.junit.testcase.dev.includes" value="org/hibernate/jsr303/tck/tests/**/*GwtSuite.class" />
+ <property name="gwt.junit.testcase.dev.excludes" value="org/hibernate/jsr303/tck/util/*.class" />
<!--
Compiles the test code for this project
diff --git a/samples/validationtck/src/com/google/gwt/sample/validationtck/ValidationTck.gwt.xml b/samples/validationtck/src/com/google/gwt/sample/validationtck/SampleValidationTck.gwt.xml
similarity index 94%
rename from samples/validationtck/src/com/google/gwt/sample/validationtck/ValidationTck.gwt.xml
rename to samples/validationtck/src/com/google/gwt/sample/validationtck/SampleValidationTck.gwt.xml
index 76ba619..24885ee 100644
--- a/samples/validationtck/src/com/google/gwt/sample/validationtck/ValidationTck.gwt.xml
+++ b/samples/validationtck/src/com/google/gwt/sample/validationtck/SampleValidationTck.gwt.xml
@@ -17,7 +17,6 @@
-->
<module rename-to="validationtck">
<inherits name="com.google.gwt.user.User" />
- <inherits name="org.hibernate.jsr303.tck.Jsr303Tck" />
<inherits name="org.hibernate.validator.HibernateValidator" />
<source path="">
<exclude name="super" />
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/TckTest.gwt.xml b/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/TckTest.gwt.xml
deleted file mode 100644
index 3e949ba..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/TckTest.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/src/gwt-module.dtd">
-<!--
- Copyright 2010 Google Inc.
-
- Licensed 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.
--->
-<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
- <source path="">
- <include name="*.java" />
- <exclude name="super" />
- </source>
- <replace-with class="com.google.gwt.sample.validationtck.constraints.application.TckTestValidatorFactory">
- <when-type-is class="javax.validation.ValidatorFactory"/>
- </replace-with>
-</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/TckTestValidatorFactory.java b/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/TckTestValidatorFactory.java
deleted file mode 100644
index cf77183..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/TckTestValidatorFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed 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.
- */
-package com.google.gwt.sample.validationtck.constraints.application;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.GwtValidation;
-import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
-import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-
-import org.hibernate.jsr303.tck.tests.constraints.application.Building;
-import org.hibernate.jsr303.tck.tests.constraints.application.SuperWoman;
-import org.hibernate.jsr303.tck.tests.constraints.application.Visibility;
-import org.hibernate.jsr303.tck.tests.constraints.application.Woman;
-
-import javax.validation.Validator;
-
-/**
- * {@link AbstractGwtValidatorFactory} implementation that uses
- * {@link com.google.gwt.validation.client.GwtValidation GwtValidation}.
- */
-public final class TckTestValidatorFactory extends AbstractGwtValidatorFactory {
- /**
- * Marker Interface for {@link GWT#create(Class)}.
- */
- @GwtValidation(value = {
- Building.class, SuperWoman.class, Visibility.class, Woman.class})
- public static interface GwtValidator extends Validator {
- }
-
- @Override
- public AbstractGwtValidator createValidator() {
- return GWT.create(GwtValidator.class);
- }
-}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/TckTest.gwt.xml b/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/TckTest.gwt.xml
deleted file mode 100644
index 7710cf0..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/TckTest.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/src/gwt-module.dtd">
-<!--
- Copyright 2010 Google Inc.
-
- Licensed 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.
--->
-<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
- <source path="">
- <include name="*.java" />
- <exclude name="super" />
- </source>
- <replace-with class="com.google.gwt.sample.validationtck.constraints.constraintcomposition.TckTestValidatorFactory">
- <when-type-is class="javax.validation.ValidatorFactory"/>
- </replace-with>
-</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/TckTestValidatorFactory.java b/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/TckTestValidatorFactory.java
deleted file mode 100644
index 0d6bfd8..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/TckTestValidatorFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed 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.
- */
-package com.google.gwt.sample.validationtck.constraints.constraintcomposition;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
-import com.google.gwt.validation.client.GwtValidation;
-import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-
-import org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.Address;
-import org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.FrenchAddress;
-import org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.Friend;
-import org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.GermanAddress;
-import org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.Shoe;
-
-import javax.validation.Validator;
-
-/**
- * {@link AbstractGwtValidatorFactory} implementation that uses
- * {@link com.google.gwt.validation.client.GwtValidation GwtValidation}.
- */
-public final class TckTestValidatorFactory extends AbstractGwtValidatorFactory {
- /**
- * Marker Interface for {@link GWT#create(Class)}.
- */
- @GwtValidation(value = {
- Address.class, FrenchAddress.class, Friend.class, GermanAddress.class,
- Shoe.class
- // TODO(nchalko) handle ConstraintDefinitionException
- // ConstraintCompositionTest.DummyEntityWithZipCode.class
- })
- public static interface GwtValidator extends Validator {
- }
-
- @Override
- public AbstractGwtValidator createValidator() {
- return GWT.create(GwtValidator.class);
- }
-}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/TckTest.gwt.xml b/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/TckTest.gwt.xml
deleted file mode 100644
index 3a619ba..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/TckTest.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/src/gwt-module.dtd">
-<!--
- Copyright 2010 Google Inc.
-
- Licensed 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.
--->
-<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
- <source path="">
- <include name="*.java" />
- <exclude name="super" />
- </source>
- <replace-with class="com.google.gwt.sample.validationtck.constraints.customconstraint.TckTestValidatorFactory">
- <when-type-is class="javax.validation.ValidatorFactory"/>
- </replace-with>
-</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/TckTest.gwt.xml b/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/TckTest.gwt.xml
deleted file mode 100644
index f295c1a..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/TckTest.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/src/gwt-module.dtd">
-<!--
- Copyright 2010 Google Inc.
-
- Licensed 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.
--->
-<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
- <source path="">
- <include name="*.java" />
- <exclude name="super" />
- </source>
- <replace-with class="com.google.gwt.sample.validationtck.constraints.groups.TckTestValidatorFactory">
- <when-type-is class="javax.validation.ValidatorFactory"/>
- </replace-with>
-</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/TckTestValidatorFactory.java b/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/TckTestValidatorFactory.java
deleted file mode 100644
index 22409be..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/TckTestValidatorFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed 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.
- */
-package com.google.gwt.sample.validationtck.constraints.groups;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.GwtValidation;
-import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
-import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-
-import org.hibernate.jsr303.tck.tests.constraints.groups.Animal;
-import org.hibernate.jsr303.tck.tests.constraints.groups.Book;
-import org.hibernate.jsr303.tck.tests.constraints.groups.Order;
-import org.hibernate.jsr303.tck.tests.constraints.groups.User;
-
-import javax.validation.Validator;
-
-/**
- * {@link AbstractGwtValidatorFactory} implementation that uses
- * {@link com.google.gwt.validation.client.GwtValidation GwtValidation}.
- */
-public final class TckTestValidatorFactory extends AbstractGwtValidatorFactory {
- /**
- * Marker Interface to {@link GWT#create(Class)}.
- */
- @GwtValidation(value = {Animal.class, Book.class, Order.class, User.class})
- public static interface GwtValidator extends Validator {
- }
-
- @Override
- public AbstractGwtValidator createValidator() {
- return GWT.create(GwtValidator.class);
- }
-}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTest.gwt.xml b/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTest.gwt.xml
deleted file mode 100644
index 1708896..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTest.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/src/gwt-module.dtd">
-<!--
- Copyright 2010 Google Inc.
-
- Licensed 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.
--->
-<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
- <source path="">
- <include name="*.java" />
- <exclude name="super" />
- </source>
- <replace-with class="com.google.gwt.sample.validationtck.constraints.inheritance.TckTestValidatorFactory">
- <when-type-is class="javax.validation.ValidatorFactory"/>
- </replace-with>
-</module>
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTestValidatorFactory.java b/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTestValidatorFactory.java
deleted file mode 100644
index 4b8ace9..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTestValidatorFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed 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.
- */
-package com.google.gwt.sample.validationtck.metadata;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.GwtValidation;
-import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
-import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-
-import org.hibernate.jsr303.tck.tests.metadata.Account;
-import org.hibernate.jsr303.tck.tests.metadata.Customer;
-import org.hibernate.jsr303.tck.tests.metadata.Man;
-import org.hibernate.jsr303.tck.tests.metadata.Order;
-import org.hibernate.jsr303.tck.tests.metadata.UnconstraintEntity;
-
-import javax.validation.Validator;
-
-/**
- * Test {@link AbstractGwtValidatorFactory} for {@link MetadataGwtSuite}.
- */
-public final class TckTestValidatorFactory extends AbstractGwtValidatorFactory {
- /**
- * Marker Interface to {@link GWT#create(Class)}.
- */
- @GwtValidation(value = {
- Account.class, Customer.class, Man.class, Order.class,
- UnconstraintEntity.class})
- public static interface GwtValidator extends Validator {
- }
-
- @Override
- public AbstractGwtValidator createValidator() {
- return GWT.create(GwtValidator.class);
- }
-}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/TckTest.gwt.xml b/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/TckTest.gwt.xml
deleted file mode 100644
index 9dce00e..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/TckTest.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/src/gwt-module.dtd">
-<!--
- Copyright 2010 Google Inc.
-
- Licensed 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.
--->
-<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
- <source path="">
- <include name="*.java" />
- <exclude name="super" />
- </source>
- <replace-with class="com.google.gwt.sample.validationtck.validation.TckTestValidatorFactory">
- <when-type-is class="javax.validation.ValidatorFactory"/>
- </replace-with>
-</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/TckTestValidatorFactory.java b/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/TckTestValidatorFactory.java
deleted file mode 100644
index 79bec12..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/TckTestValidatorFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed 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.
- */
-package com.google.gwt.sample.validationtck.validation;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
-import com.google.gwt.validation.client.GwtValidation;
-import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-
-import org.hibernate.jsr303.tck.tests.validation.Actor;
-import org.hibernate.jsr303.tck.tests.validation.ActorArrayBased;
-import org.hibernate.jsr303.tck.tests.validation.ActorListBased;
-import org.hibernate.jsr303.tck.tests.validation.Address;
-import org.hibernate.jsr303.tck.tests.validation.BadlyBehavedEntity;
-import org.hibernate.jsr303.tck.tests.validation.Customer;
-import org.hibernate.jsr303.tck.tests.validation.Engine;
-import org.hibernate.jsr303.tck.tests.validation.Order;
-
-import javax.validation.Validator;
-
-/**
- * {@link AbstractGwtValidatorFactory} implementation that uses
- * {@link com.google.gwt.validation.client.GwtValidation GwtValidation}.
- */
-public final class TckTestValidatorFactory extends AbstractGwtValidatorFactory {
- /**
- * Marker Interface for {@link GWT#create(Class)}.
- */
- @GwtValidation(value = {
- Actor.class, ActorArrayBased.class, ActorListBased.class, Address.class,
- BadlyBehavedEntity.class, Customer.class, Engine.class, Order.class})
- public static interface GwtValidator extends Validator {
- }
-
- @Override
- public AbstractGwtValidator createValidator() {
- return GWT.create(GwtValidator.class);
- }
-}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidationGwtSuite.java b/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidationGwtSuite.java
deleted file mode 100644
index f3d80d8..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidationGwtSuite.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed 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.
- */
-package com.google.gwt.sample.validationtck.validation;
-
-import com.google.gwt.sample.validationtck.util.TckTestSuiteWrapper;
-
-import junit.framework.Test;
-
-/**
- * Tck Tests for the {@code validation} package.
- */
-public class ValidationGwtSuite {
- public static Test suite() {
- TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
- "TCK for GWT Validation, validation package");
- suite.addTestSuite(PropertyPathTest.class);
- suite.addTestSuite(ValidatePropertyTest.class);
- suite.addTestSuite(ValidateValueTest.class);
- suite.addTestSuite(ValidationTest.class);
- return suite;
- }
-}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/TckTest.gwt.xml b/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/TckTest.gwt.xml
deleted file mode 100644
index fbb2c15..0000000
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/TckTest.gwt.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/src/gwt-module.dtd">
-<!--
- Copyright 2010 Google Inc.
-
- Licensed 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.
--->
-<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
- <source path="">
- <include name="*.java" />
- <exclude name="super" />
- </source>
- <replace-with class="com.google.gwt.sample.validationtck.validatorfactory.TckTestValidatorFactory">
- <when-type-is class="javax.validation.ValidatorFactory"/>
- </replace-with>
-</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/Jsr303Tck.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/Jsr303Tck.gwt.xml
index 6b7a77a..73bb554 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/Jsr303Tck.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/Jsr303Tck.gwt.xml
@@ -9,14 +9,11 @@
<inherits name='org.jboss.testharness.JbossTestHarness' />
<inherits name='org.testng.TestNg' />
<source path="">
- <exclude name="super/" />
- <!-- things not used in any current test -->
- <exclude name="tests/bootstrap/" />
- <exclude name="tests/constraints/builtinconstraints/" />
- <exclude name="tests/messageinterpolation/" />
- <exclude name="tests/xmlconfiguration/" />
- <exclude name="tests/validation/UnknownProviderBootstrapTest.java" />
+ <include name="common/*.java" />
+ <include name="util/*.java" />
<exclude name="util/StandaloneContainersImpl.java" />
+ <exclude name="util/TckTestSuite*.java" />
+ <exclude name="util/UtilJreSuite.java" />
</source>
<super-source path="super" />
</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/ConstraintApplicationGwtSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintApplicationGwtSuite.java
similarity index 78%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/ConstraintApplicationGwtSuite.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintApplicationGwtSuite.java
index 9b9c80e..1baea81 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/ConstraintApplicationGwtSuite.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintApplicationGwtSuite.java
@@ -13,12 +13,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.application;
+package org.hibernate.jsr303.tck.tests;
-import com.google.gwt.sample.validationtck.util.TckTestSuiteWrapper;
import junit.framework.Test;
+import org.hibernate.jsr303.tck.tests.constraints.application.ValidationRequirementGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
/**
* Tck Tests for the {@code constraints application} package.
*/
@@ -26,7 +28,7 @@
public static Test suite() {
TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
"TCK for GWT Validation, constraints application package");
- suite.addTestSuite(ValidationRequirementTest.class);
+ suite.addTestSuite(ValidationRequirementGwtTest.class);
return suite;
}
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/ConstraintCompositionGwtSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintCompositionGwtSuite.java
similarity index 77%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/ConstraintCompositionGwtSuite.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintCompositionGwtSuite.java
index 2ee2d19..b20e164 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/ConstraintCompositionGwtSuite.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintCompositionGwtSuite.java
@@ -13,12 +13,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.constraintcomposition;
+package org.hibernate.jsr303.tck.tests;
-import com.google.gwt.sample.validationtck.util.TckTestSuiteWrapper;
import junit.framework.Test;
+import org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.ConstraintCompositionGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
/**
* Tck Tests for the {@code constraints composition} package.
*/
@@ -26,7 +28,7 @@
public static Test suite() {
TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
"TCK for GWT Validation, constraints composition package");
- suite.addTestSuite(ConstraintCompositionTest.class);
+ suite.addTestSuite(ConstraintCompositionGwtTest.class);
return suite;
}
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/ConstraintsGroupsGwtSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsGroupsGwtSuite.java
similarity index 80%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/ConstraintsGroupsGwtSuite.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsGroupsGwtSuite.java
index a617542..40e730a 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/ConstraintsGroupsGwtSuite.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsGroupsGwtSuite.java
@@ -13,12 +13,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.groups;
+package org.hibernate.jsr303.tck.tests;
-import com.google.gwt.sample.validationtck.util.TckTestSuiteWrapper;
import junit.framework.Test;
+import org.hibernate.jsr303.tck.tests.constraints.groups.GroupGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
/**
* Tck Tests for the {@code constraints groups} package.
*/
@@ -26,7 +28,7 @@
public static Test suite() {
TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
"TCK for GWT Validation, constraints groups package");
- suite.addTestSuite(GroupTest.class);
+ suite.addTestSuite(GroupGwtTest.class);
return suite;
}
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/ConstraintsInheritanceGwtSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsInheritanceGwtSuite.java
similarity index 78%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/ConstraintsInheritanceGwtSuite.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsInheritanceGwtSuite.java
index f584741..62347f7 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/ConstraintsInheritanceGwtSuite.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ConstraintsInheritanceGwtSuite.java
@@ -13,12 +13,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.inheritance;
+package org.hibernate.jsr303.tck.tests;
-import com.google.gwt.sample.validationtck.util.TckTestSuiteWrapper;
import junit.framework.Test;
+import org.hibernate.jsr303.tck.tests.constraints.inheritance.ConstraintInheritanceGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
/**
* Tck Tests for the {@code constraints inheritance} package.
*/
@@ -26,7 +28,7 @@
public static Test suite() {
TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
"TCK for GWT Validation, constraints inheritance package");
- suite.addTestSuite(ConstraintInheritanceTest.class);
+ suite.addTestSuite(ConstraintInheritanceGwtTest.class);
return suite;
}
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/CustomConstraintGwtSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/CustomConstraintGwtSuite.java
similarity index 82%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/CustomConstraintGwtSuite.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/CustomConstraintGwtSuite.java
index 73cff0b..02891ef 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/CustomConstraintGwtSuite.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/CustomConstraintGwtSuite.java
@@ -13,12 +13,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.customconstraint;
+package org.hibernate.jsr303.tck.tests;
-import com.google.gwt.sample.validationtck.util.TckTestSuiteWrapper;
import junit.framework.Test;
+import org.hibernate.jsr303.tck.tests.constraints.customconstraint.CustomConstraintValidatorGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
/**
* Tck Tests for the {@code constraints customconstraint} package.
*/
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/MessageInterpolationGwtSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/MessageInterpolationGwtSuite.java
similarity index 78%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/MessageInterpolationGwtSuite.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/MessageInterpolationGwtSuite.java
index 84620b0..8cf690b 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/MessageInterpolationGwtSuite.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/MessageInterpolationGwtSuite.java
@@ -13,12 +13,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.messageinterpolation;
+package org.hibernate.jsr303.tck.tests;
-import com.google.gwt.sample.validationtck.util.TckTestSuiteWrapper;
import junit.framework.Test;
+import org.hibernate.jsr303.tck.tests.messageinterpolation.MessageInterpolationGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
/**
* Tck Tests for the {@code messageinterpolation} package.
*/
@@ -26,7 +28,7 @@
public static Test suite() {
TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
"TCK for GWT Validation, messageinterpolation package");
- suite.addTestSuite(MessageInterpolationTest.class);
+ suite.addTestSuite(MessageInterpolationGwtTest.class);
return suite;
}
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/MetadataGwtSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/MetadataGwtSuite.java
similarity index 79%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/MetadataGwtSuite.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/MetadataGwtSuite.java
index 8980163..8cc4d27 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/MetadataGwtSuite.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/MetadataGwtSuite.java
@@ -13,12 +13,15 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.metadata;
+package org.hibernate.jsr303.tck.tests;
-import com.google.gwt.sample.validationtck.util.TckTestSuiteWrapper;
+
import junit.framework.Test;
+import org.hibernate.jsr303.tck.tests.metadata.BeanDescriptorGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
/**
* Tck Tests for the {@code metadata} package.
*/
@@ -26,7 +29,7 @@
public static Test suite() {
TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
"TCK for GWT Validation, metadata package");
- suite.addTestSuite(BeanDescriptorTest.class);
+ suite.addTestSuite(BeanDescriptorGwtTest.class);
return suite;
}
}
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationGwtSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationGwtSuite.java
new file mode 100644
index 0000000..31c1bc8
--- /dev/null
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationGwtSuite.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed 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.
+ */
+package org.hibernate.jsr303.tck.tests;
+
+
+
+import junit.framework.Test;
+
+import org.hibernate.jsr303.tck.tests.validation.PropertyPathGwtTest;
+import org.hibernate.jsr303.tck.tests.validation.ValidatePropertyGwtTest;
+import org.hibernate.jsr303.tck.tests.validation.ValidateValueGwtTest;
+import org.hibernate.jsr303.tck.tests.validation.ValidationGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
+/**
+ * Tck Tests for the {@code validation} package.
+ */
+public class ValidationGwtSuite {
+ public static Test suite() {
+ TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
+ "TCK for GWT Validation, validation package");
+ suite.addTestSuite(PropertyPathGwtTest.class);
+ suite.addTestSuite(ValidatePropertyGwtTest.class);
+ suite.addTestSuite(ValidateValueGwtTest.class);
+ suite.addTestSuite(ValidationGwtTest.class);
+ return suite;
+ }
+}
diff --git a/samples/validationtck/src/com/google/gwt/sample/validationtck/ValidationTck.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationTck.gwt.xml
similarity index 88%
copy from samples/validationtck/src/com/google/gwt/sample/validationtck/ValidationTck.gwt.xml
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationTck.gwt.xml
index 76ba619..8a58706 100644
--- a/samples/validationtck/src/com/google/gwt/sample/validationtck/ValidationTck.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidationTck.gwt.xml
@@ -15,12 +15,12 @@
License for the specific language governing permissions and limitations under
the License.
-->
-<module rename-to="validationtck">
+<module >
+ <!-- all tck test inherit this module -->
<inherits name="com.google.gwt.user.User" />
<inherits name="org.hibernate.jsr303.tck.Jsr303Tck" />
<inherits name="org.hibernate.validator.HibernateValidator" />
<source path="">
- <exclude name="super" />
+ <include name="none" />
</source>
- <entry-point class="com.google.gwt.sample.validationtck.Tck" />
</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/ValidatorFactoryGwtSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorFactoryGwtSuite.java
similarity index 77%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/ValidatorFactoryGwtSuite.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorFactoryGwtSuite.java
index d905968..2d97050 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/ValidatorFactoryGwtSuite.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorFactoryGwtSuite.java
@@ -13,12 +13,15 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.validatorfactory;
+package org.hibernate.jsr303.tck.tests;
-import com.google.gwt.sample.validationtck.util.TckTestSuiteWrapper;
+
import junit.framework.Test;
+import org.hibernate.jsr303.tck.tests.validatorfactory.CustomConstraintValidatorGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
/**
* Tck Tests for the {@code validatorfactory} package.
*/
@@ -26,7 +29,7 @@
public static Test suite() {
TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
"TCK for GWT Validation, validatorfactory package");
- suite.addTestSuite(CustomConstraintValidatorTest.class);
+ suite.addTestSuite(CustomConstraintValidatorGwtTest.class);
return suite;
}
}
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorResolutionGwtSuite.java
similarity index 82%
rename from samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtSuite.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorResolutionGwtSuite.java
index a08071c..f5dede2 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtSuite.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/ValidatorResolutionGwtSuite.java
@@ -13,12 +13,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.hibernate.jsr303.tck.tests.constraints.validatorresolution;
+package org.hibernate.jsr303.tck.tests;
-import com.google.gwt.sample.validationtck.util.TckTestSuiteWrapper;
import junit.framework.Test;
+import org.hibernate.jsr303.tck.tests.constraints.validatorresolution.ValidatorResolutionGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
/**
* Tck Tests for the {@code validator resolution} package.
*/
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTest.gwt.xml
similarity index 84%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTest.gwt.xml
index 6e19709..cacbec4 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTest.gwt.xml
@@ -16,12 +16,12 @@
the License.
-->
<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
+ <inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
<exclude name="super" />
</source>
- <replace-with class="com.google.gwt.sample.validationtck.metadata.TckTestValidatorFactory">
+ <replace-with class="org.hibernate.jsr303.tck.tests.constraints.application.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
</replace-with>
-</module>
+</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTestValidatorFactory.java
similarity index 84%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTestValidatorFactory.java
index 7f35236..2916689 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/TckTestValidatorFactory.java
@@ -13,15 +13,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.inheritance;
+package org.hibernate.jsr303.tck.tests.constraints.application;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
+import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-import org.hibernate.jsr303.tck.tests.constraints.inheritance.Bar;
-
import javax.validation.Validator;
/**
@@ -30,9 +28,10 @@
*/
public final class TckTestValidatorFactory extends AbstractGwtValidatorFactory {
/**
- * Marker Interface to {@link GWT#create(Class)}.
+ * Marker Interface for {@link GWT#create(Class)}.
*/
- @GwtValidation(value = {Bar.class})
+ @GwtValidation(value = {
+ Building.class, SuperWoman.class, Visibility.class, Woman.class})
public static interface GwtValidator extends Validator {
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/ValidationRequirementTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementGwtTest.java
similarity index 71%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/ValidationRequirementTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementGwtTest.java
index cdb04e2..057a315 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/application/ValidationRequirementTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementGwtTest.java
@@ -13,19 +13,17 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.application;
+package org.hibernate.jsr303.tck.tests.constraints.application;
import com.google.gwt.junit.client.GWTTestCase;
-import com.google.gwt.sample.validationtck.util.Failing;
+
+import org.hibernate.jsr303.tck.util.Failing;
/**
- * Wraps
- * {@link org.hibernate.jsr303.tck.tests.constraints.application.ValidationRequirementTest}
- * .
+ * Wraps {@link ValidationRequirementTest} .
*/
-public class ValidationRequirementTest extends GWTTestCase {
- org.hibernate.jsr303.tck.tests.constraints.application.ValidationRequirementTest delegate =
- new org.hibernate.jsr303.tck.tests.constraints.application.ValidationRequirementTest();
+public class ValidationRequirementGwtTest extends GWTTestCase {
+ ValidationRequirementTest delegate = new ValidationRequirementTest();
/**
* This test is disabled in the TCK.
@@ -36,7 +34,7 @@
@Override
public String getModuleName() {
- return "com.google.gwt.sample.validationtck.constraints.application.TckTest";
+ return "org.hibernate.jsr303.tck.tests.constraints.application.TckTest";
}
@Failing(issue = 5798)
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/ConstraintCompositionTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java
similarity index 76%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/ConstraintCompositionTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java
index 7da5a5d..64a1509 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/constraintcomposition/ConstraintCompositionTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java
@@ -13,23 +13,21 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.constraintcomposition;
+package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition;
import com.google.gwt.junit.client.GWTTestCase;
-import com.google.gwt.sample.validationtck.util.Failing;
+
+import org.hibernate.jsr303.tck.util.Failing;
/**
- * Wraps
- * {@link org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.ConstraintCompositionTest}
- * .
+ * Wraps {@link ConstraintCompositionTest}.
*/
-public class ConstraintCompositionTest extends GWTTestCase {
- private final org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.ConstraintCompositionTest delegate =
- new org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.ConstraintCompositionTest();
+public class ConstraintCompositionGwtTest extends GWTTestCase {
+ private final ConstraintCompositionTest delegate = new ConstraintCompositionTest();
@Override
public String getModuleName() {
- return "com.google.gwt.sample.validationtck.constraints.constraintcomposition.TckTest";
+ return "org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.TckTest";
}
@Failing(issue = 5799)
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTest.gwt.xml
similarity index 84%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTest.gwt.xml
index 6e19709..23c3a02 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTest.gwt.xml
@@ -16,12 +16,12 @@
the License.
-->
<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
+ <inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
<exclude name="super" />
</source>
- <replace-with class="com.google.gwt.sample.validationtck.metadata.TckTestValidatorFactory">
+ <replace-with class="org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
</replace-with>
-</module>
+</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/TckTestValidatorFactory.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTestValidatorFactory.java
similarity index 79%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/TckTestValidatorFactory.java
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTestValidatorFactory.java
index 2e7a862..38aaa79 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/TckTestValidatorFactory.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/TckTestValidatorFactory.java
@@ -13,16 +13,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.validatorfactory;
+package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition;
import com.google.gwt.core.client.GWT;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-import org.hibernate.jsr303.tck.tests.validatorfactory.CustomConstraintValidatorTest.Dummy;
-import org.hibernate.jsr303.tck.tests.validatorfactory.CustomConstraintValidatorTest.SecondDummy;
-
import javax.validation.Validator;
/**
@@ -33,7 +30,12 @@
/**
* Marker Interface for {@link GWT#create(Class)}.
*/
- @GwtValidation(value = {Dummy.class, SecondDummy.class})
+ @GwtValidation(value = {
+ Address.class, FrenchAddress.class, Friend.class, GermanAddress.class,
+ Shoe.class
+ // TODO(nchalko) handle ConstraintDefinitionException
+ // ConstraintCompositionGwtTest.DummyEntityWithZipCode.class
+ })
public static interface GwtValidator extends Validator {
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/CustomConstraintValidatorGwtTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorGwtTest.java
similarity index 86%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/CustomConstraintValidatorGwtTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorGwtTest.java
index 8c221b8..cff9882 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/CustomConstraintValidatorGwtTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorGwtTest.java
@@ -13,12 +13,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.customconstraint;
+package org.hibernate.jsr303.tck.tests.constraints.customconstraint;
import com.google.gwt.junit.client.GWTTestCase;
-import com.google.gwt.sample.validationtck.util.Failing;
-import org.hibernate.jsr303.tck.tests.constraints.customconstraint.CustomConstraintValidatorTest;
+import org.hibernate.jsr303.tck.util.Failing;
/**
* Test wrapper for {@link CustomConstraintValidatorTest}.
@@ -28,7 +27,7 @@
@Override
public String getModuleName() {
- return "com.google.gwt.sample.validationtck.constraints.customconstraint.TckTest";
+ return "org.hibernate.jsr303.tck.tests.constraints.customconstraint.TckTest";
}
@Failing(issue = 5800)
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTest.gwt.xml
similarity index 84%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTest.gwt.xml
index 6e19709..12a7dfd 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTest.gwt.xml
@@ -16,12 +16,12 @@
the License.
-->
<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
+ <inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
<exclude name="super" />
</source>
- <replace-with class="com.google.gwt.sample.validationtck.metadata.TckTestValidatorFactory">
+ <replace-with class="org.hibernate.jsr303.tck.tests.constraints.customconstraint.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
</replace-with>
-</module>
+</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/TckTestValidatorFactory.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTestValidatorFactory.java
similarity index 91%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/TckTestValidatorFactory.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTestValidatorFactory.java
index 86f96b3..c224a78 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/customconstraint/TckTestValidatorFactory.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/customconstraint/TckTestValidatorFactory.java
@@ -13,14 +13,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.customconstraint;
+package org.hibernate.jsr303.tck.tests.constraints.customconstraint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-import org.hibernate.jsr303.tck.tests.constraints.customconstraint.Author;
import org.hibernate.jsr303.tck.tests.constraints.customconstraint.CustomConstraintValidatorTest.Freezer;
import org.hibernate.jsr303.tck.tests.constraints.customconstraint.CustomConstraintValidatorTest.OddShoe;
import org.hibernate.jsr303.tck.tests.constraints.customconstraint.CustomConstraintValidatorTest.Shoe;
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/GroupTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/GroupGwtTest.java
similarity index 77%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/GroupTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/GroupGwtTest.java
index a242128..f6ec82e 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/groups/GroupTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/GroupGwtTest.java
@@ -13,22 +13,21 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.groups;
+package org.hibernate.jsr303.tck.tests.constraints.groups;
import com.google.gwt.junit.client.GWTTestCase;
-import com.google.gwt.sample.validationtck.util.Failing;
+
+import org.hibernate.jsr303.tck.util.Failing;
/**
- * Test wrapper for
- * {@link org.hibernate.jsr303.tck.tests.constraints.groups.GroupTest}.
+ * Test wrapper for {@link GroupTest}.
*/
-public class GroupTest extends GWTTestCase {
- private final org.hibernate.jsr303.tck.tests.constraints.groups.GroupTest delegate =
- new org.hibernate.jsr303.tck.tests.constraints.groups.GroupTest();
+public class GroupGwtTest extends GWTTestCase {
+ private final GroupTest delegate = new GroupTest();
@Override
public String getModuleName() {
- return "com.google.gwt.sample.validationtck.constraints.groups.TckTest";
+ return "org.hibernate.jsr303.tck.tests.constraints.groups.TckTest";
}
public void testConstraintCanBelongToMoreThanOneGroup() {
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTest.gwt.xml
similarity index 85%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTest.gwt.xml
index 6e19709..6b1a69f 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTest.gwt.xml
@@ -16,12 +16,12 @@
the License.
-->
<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
+ <inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
<exclude name="super" />
</source>
- <replace-with class="com.google.gwt.sample.validationtck.metadata.TckTestValidatorFactory">
+ <replace-with class="org.hibernate.jsr303.tck.tests.constraints.groups.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
</replace-with>
-</module>
+</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTestValidatorFactory.java
similarity index 88%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTestValidatorFactory.java
index 7f35236..709ee5b 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/groups/TckTestValidatorFactory.java
@@ -13,15 +13,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.inheritance;
+package org.hibernate.jsr303.tck.tests.constraints.groups;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
+import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-import org.hibernate.jsr303.tck.tests.constraints.inheritance.Bar;
-
import javax.validation.Validator;
/**
@@ -32,7 +30,7 @@
/**
* Marker Interface to {@link GWT#create(Class)}.
*/
- @GwtValidation(value = {Bar.class})
+ @GwtValidation(value = {Animal.class, Book.class, Order.class, User.class})
public static interface GwtValidator extends Validator {
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/ConstraintInheritanceTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceGwtTest.java
similarity index 63%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/ConstraintInheritanceTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceGwtTest.java
index 357d78e..5b71fb4 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/ConstraintInheritanceTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceGwtTest.java
@@ -13,22 +13,19 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.inheritance;
+package org.hibernate.jsr303.tck.tests.constraints.inheritance;
import com.google.gwt.junit.client.GWTTestCase;
/**
- * Test wrapper for
- * {@link org.hibernate.jsr303.tck.tests.constraints.inheritance.ConstraintInheritanceTest}
- * .
+ * Test wrapper for {@link ConstraintInheritanceTest}. .
*/
-public class ConstraintInheritanceTest extends GWTTestCase {
- private final org.hibernate.jsr303.tck.tests.constraints.inheritance.ConstraintInheritanceTest delegate =
- new org.hibernate.jsr303.tck.tests.constraints.inheritance.ConstraintInheritanceTest();
+public class ConstraintInheritanceGwtTest extends GWTTestCase {
+ private final ConstraintInheritanceTest delegate = new ConstraintInheritanceTest();
@Override
public String getModuleName() {
- return "com.google.gwt.sample.validationtck.constraints.inheritance.TckTest";
+ return "org.hibernate.jsr303.tck.tests.constraints.inheritance.TckTest";
}
public void testConstraintsOnInterfaceAreInherited() {
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTest.gwt.xml
similarity index 84%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTest.gwt.xml
index 6e19709..bda35dc 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTest.gwt.xml
@@ -16,12 +16,12 @@
the License.
-->
<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
+ <inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
<exclude name="super" />
</source>
- <replace-with class="com.google.gwt.sample.validationtck.metadata.TckTestValidatorFactory">
+ <replace-with class="org.hibernate.jsr303.tck.tests.constraints.inheritance.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
</replace-with>
</module>
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTestValidatorFactory.java
similarity index 90%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTestValidatorFactory.java
index 7f35236..0686d7d 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/inheritance/TckTestValidatorFactory.java
@@ -13,15 +13,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.inheritance;
+package org.hibernate.jsr303.tck.tests.constraints.inheritance;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
+import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-import org.hibernate.jsr303.tck.tests.constraints.inheritance.Bar;
-
import javax.validation.Validator;
/**
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTest.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTest.gwt.xml
index 3a147bf..5bddcc0 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTest.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/TckTest.gwt.xml
@@ -16,7 +16,7 @@
the License.
-->
<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
+ <inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
<exclude name="super" />
diff --git a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtTest.java
index 9808674..92dd40a 100644
--- a/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionGwtTest.java
@@ -16,7 +16,8 @@
package org.hibernate.jsr303.tck.tests.constraints.validatorresolution;
import com.google.gwt.junit.client.GWTTestCase;
-import com.google.gwt.sample.validationtck.util.Failing;
+
+import org.hibernate.jsr303.tck.util.Failing;
/**
* Wraps {@link ValidatorResolutionTest} .
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/MessageInterpolationTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationGwtTest.java
similarity index 78%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/MessageInterpolationTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationGwtTest.java
index 7122962..250e02b 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/MessageInterpolationTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationGwtTest.java
@@ -13,23 +13,21 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.messageinterpolation;
+package org.hibernate.jsr303.tck.tests.messageinterpolation;
import com.google.gwt.junit.client.GWTTestCase;
-import com.google.gwt.sample.validationtck.util.Failing;
+
+import org.hibernate.jsr303.tck.util.Failing;
/**
- * Wraps
- * {@link org.hibernate.jsr303.tck.tests.messageinterpolation.MessageInterpolationTest}
- * .
+ * Wraps {@link MessageInterpolationTest}.
*/
-public class MessageInterpolationTest extends GWTTestCase {
- private final org.hibernate.jsr303.tck.tests.messageinterpolation.MessageInterpolationTest delegate =
- new org.hibernate.jsr303.tck.tests.messageinterpolation.MessageInterpolationTest();
+public class MessageInterpolationGwtTest extends GWTTestCase {
+ private final MessageInterpolationTest delegate = new MessageInterpolationTest();
@Override
public String getModuleName() {
- return "com.google.gwt.sample.validationtck.messageinterpolation.TckTest";
+ return "org.hibernate.jsr303.tck.tests.messageinterpolation.TckTest";
}
public void testConstraintAttributeValuesAreInterpolated() {
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/TckTest.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTest.gwt.xml
similarity index 78%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/TckTest.gwt.xml
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTest.gwt.xml
index b0197cd..734efca 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/TckTest.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTest.gwt.xml
@@ -16,15 +16,15 @@
the License.
-->
<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
+ <inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
<exclude name="super" />
</source>
- <replace-with class="com.google.gwt.sample.validationtck.messageinterpolation.TckUserValidationMessageProvider">
+ <replace-with class="org.hibernate.jsr303.tck.tests.messageinterpolation.TckUserValidationMessageProvider">
<when-type-is class="com.google.gwt.validation.client.UserValidationMessagesResolver" />
</replace-with>
- <replace-with class="com.google.gwt.sample.validationtck.messageinterpolation.TckTestValidatorFactory">
+ <replace-with class="org.hibernate.jsr303.tck.tests.messageinterpolation.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
</replace-with>
</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/TckTestValidatorFactory.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTestValidatorFactory.java
similarity index 95%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/TckTestValidatorFactory.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTestValidatorFactory.java
index aadb753..e4dadc9 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/TckTestValidatorFactory.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckTestValidatorFactory.java
@@ -13,11 +13,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.messageinterpolation;
+package org.hibernate.jsr303.tck.tests.messageinterpolation;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
+import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.impl.AbstractGwtValidator;
import org.hibernate.jsr303.tck.tests.messageinterpolation.MessageInterpolationTest.DummyEntity;
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/TckUserValidationMessageProvider.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckUserValidationMessageProvider.java
similarity index 94%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/TckUserValidationMessageProvider.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckUserValidationMessageProvider.java
index d0c0fb5..1e06390 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/TckUserValidationMessageProvider.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/TckUserValidationMessageProvider.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.messageinterpolation;
+package org.hibernate.jsr303.tck.tests.messageinterpolation;
import com.google.gwt.core.client.GWT;
import com.google.gwt.i18n.client.ConstantsWithLookup;
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/ValidationMessages.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.java
similarity index 95%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/ValidationMessages.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.java
index e8a76c2..0f1e9cc 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/ValidationMessages.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.messageinterpolation;
+package org.hibernate.jsr303.tck.tests.messageinterpolation;
/**
* Interface to represent the constants contained in resource bundle:
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/ValidationMessages.properties b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties
similarity index 100%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/ValidationMessages.properties
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/ValidationMessages_de.properties b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties
similarity index 100%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/messageinterpolation/ValidationMessages_de.properties
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/BeanDescriptorTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorGwtTest.java
similarity index 80%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/BeanDescriptorTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorGwtTest.java
index 520541b..d3c6943 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/BeanDescriptorTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorGwtTest.java
@@ -13,22 +13,21 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.metadata;
+package org.hibernate.jsr303.tck.tests.metadata;
import com.google.gwt.junit.client.GWTTestCase;
-import com.google.gwt.sample.validationtck.util.Failing;
+
+import org.hibernate.jsr303.tck.util.Failing;
/**
- * Test wrapper for
- * {@link org.hibernate.jsr303.tck.tests.constraints.groups.GroupTest}.
+ * Test wrapper for {@link BeanDescriptorTest}.
*/
-public class BeanDescriptorTest extends GWTTestCase {
- private final org.hibernate.jsr303.tck.tests.metadata.BeanDescriptorTest delegate =
- new org.hibernate.jsr303.tck.tests.metadata.BeanDescriptorTest();
+public class BeanDescriptorGwtTest extends GWTTestCase {
+ private final BeanDescriptorTest delegate = new BeanDescriptorTest();
@Override
public String getModuleName() {
- return "com.google.gwt.sample.validationtck.metadata.TckTest";
+ return "org.hibernate.jsr303.tck.tests.metadata.TckTest";
}
public void testGetConstrainedProperties() {
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTest.gwt.xml
similarity index 85%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTest.gwt.xml
index 6e19709..1685e92 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTest.gwt.xml
@@ -16,12 +16,12 @@
the License.
-->
<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
+ <inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
<exclude name="super" />
</source>
- <replace-with class="com.google.gwt.sample.validationtck.metadata.TckTestValidatorFactory">
+ <replace-with class="org.hibernate.jsr303.tck.tests.metadata.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
</replace-with>
</module>
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTestValidatorFactory.java
similarity index 78%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTestValidatorFactory.java
index 7f35236..2c2915a 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/metadata/TckTestValidatorFactory.java
@@ -13,26 +13,26 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.inheritance;
+package org.hibernate.jsr303.tck.tests.metadata;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
+import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-import org.hibernate.jsr303.tck.tests.constraints.inheritance.Bar;
-
import javax.validation.Validator;
/**
- * {@link AbstractGwtValidatorFactory} implementation that uses
- * {@link com.google.gwt.validation.client.GwtValidation GwtValidation}.
+ * Test {@link AbstractGwtValidatorFactory} for
+ * {@link org.hibernate.jsr303.tck.tests.MetadataGwtSuite}.
*/
public final class TckTestValidatorFactory extends AbstractGwtValidatorFactory {
/**
* Marker Interface to {@link GWT#create(Class)}.
*/
- @GwtValidation(value = {Bar.class})
+ @GwtValidation(value = {
+ Account.class, Customer.class, Man.class, Order.class,
+ UnconstraintEntity.class})
public static interface GwtValidator extends Validator {
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/AbstractValidationTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/AbstractValidationTest.java
similarity index 87%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/validation/AbstractValidationTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/AbstractValidationTest.java
index b35ebb5..a51d70b 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/AbstractValidationTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/AbstractValidationTest.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.validation;
+package org.hibernate.jsr303.tck.tests.validation;
import com.google.gwt.junit.client.GWTTestCase;
@@ -28,6 +28,6 @@
@Override
public String getModuleName() {
- return "com.google.gwt.sample.validationtck.validation.TckTest";
+ return "org.hibernate.jsr303.tck.tests.validation.TckTest";
}
}
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/PropertyPathTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/PropertyPathGwtTest.java
similarity index 74%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/validation/PropertyPathTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/PropertyPathGwtTest.java
index 8af4bed..60a80d7 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/PropertyPathTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/PropertyPathGwtTest.java
@@ -13,19 +13,17 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.validation;
+package org.hibernate.jsr303.tck.tests.validation;
-import com.google.gwt.sample.validationtck.util.Failing;
-import com.google.gwt.sample.validationtck.util.NonTckTest;
+import org.hibernate.jsr303.tck.util.Failing;
+import org.hibernate.jsr303.tck.util.NonTckTest;
/**
- * Test wrapper for
- * {@link org.hibernate.jsr303.tck.tests.validation.PropertyPathTest}.
+ * Test wrapper for {@link PropertyPathTest}.
*/
-public class PropertyPathTest extends AbstractValidationTest {
+public class PropertyPathGwtTest extends AbstractValidationTest {
- org.hibernate.jsr303.tck.tests.validation.PropertyPathTest delegate =
- new org.hibernate.jsr303.tck.tests.validation.PropertyPathTest();
+ private final PropertyPathTest delegate = new PropertyPathTest();
@NonTckTest
public void testPlaceHolder() {
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTest.gwt.xml
similarity index 85%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTest.gwt.xml
index 6e19709..053bf2a 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTest.gwt.xml
@@ -16,12 +16,12 @@
the License.
-->
<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
+ <inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
<exclude name="super" />
</source>
- <replace-with class="com.google.gwt.sample.validationtck.metadata.TckTestValidatorFactory">
+ <replace-with class="org.hibernate.jsr303.tck.tests.validation.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
</replace-with>
-</module>
+</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTestValidatorFactory.java
similarity index 81%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTestValidatorFactory.java
index 7f35236..59c033e 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/constraints/inheritance/TckTestValidatorFactory.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/TckTestValidatorFactory.java
@@ -13,15 +13,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.constraints.inheritance;
+package org.hibernate.jsr303.tck.tests.validation;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
+import com.google.gwt.validation.client.GwtValidation;
import com.google.gwt.validation.client.impl.AbstractGwtValidator;
-import org.hibernate.jsr303.tck.tests.constraints.inheritance.Bar;
-
import javax.validation.Validator;
/**
@@ -30,9 +28,11 @@
*/
public final class TckTestValidatorFactory extends AbstractGwtValidatorFactory {
/**
- * Marker Interface to {@link GWT#create(Class)}.
+ * Marker Interface for {@link GWT#create(Class)}.
*/
- @GwtValidation(value = {Bar.class})
+ @GwtValidation(value = {
+ Actor.class, ActorArrayBased.class, ActorListBased.class, Address.class,
+ BadlyBehavedEntity.class, Customer.class, Engine.class, Order.class})
public static interface GwtValidator extends Validator {
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidatePropertyTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyGwtTest.java
similarity index 80%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidatePropertyTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyGwtTest.java
index e2006ae..c8c819d 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidatePropertyTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyGwtTest.java
@@ -13,20 +13,18 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.validation;
+package org.hibernate.jsr303.tck.tests.validation;
-import com.google.gwt.sample.validationtck.util.Failing;
+import org.hibernate.jsr303.tck.util.Failing;
import javax.validation.ValidationException;
/**
- * Test wrapper for
- * {@link org.hibernate.jsr303.tck.tests.validation.ValidatePropertyTest}.
+ * Test wrapper for {@link ValidatePropertyTest}.
*/
-public class ValidatePropertyTest extends AbstractValidationTest {
+public class ValidatePropertyGwtTest extends AbstractValidationTest {
- private final org.hibernate.jsr303.tck.tests.validation.ValidatePropertyTest delegate =
- new org.hibernate.jsr303.tck.tests.validation.ValidatePropertyTest();
+ private final ValidatePropertyTest delegate = new ValidatePropertyTest();
public void testIllegalArgumentExceptionIsThrownForNullValue() {
delegate.testIllegalArgumentExceptionIsThrownForNullValue();
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidateValueTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidateValueGwtTest.java
similarity index 79%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidateValueTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidateValueGwtTest.java
index 0edc976..986a2f6 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidateValueTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidateValueGwtTest.java
@@ -13,19 +13,16 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.validation;
+package org.hibernate.jsr303.tck.tests.validation;
-import com.google.gwt.sample.validationtck.util.Failing;
-
+import org.hibernate.jsr303.tck.util.Failing;
/**
- * Test wrapper for
- * {@link org.hibernate.jsr303.tck.tests.validation.ValidateValueTest}.
+ * Test wrapper for {@link ValidateValueTest}.
*/
-public class ValidateValueTest extends AbstractValidationTest {
+public class ValidateValueGwtTest extends AbstractValidationTest {
- private final org.hibernate.jsr303.tck.tests.validation.ValidateValueTest delegate =
- new org.hibernate.jsr303.tck.tests.validation.ValidateValueTest();
+ private final ValidateValueTest delegate = new ValidateValueTest();
@Failing(issue = 5804)
public void testExistingPropertyWoConstraintsNorCascaded() {
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidationTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidationGwtTest.java
similarity index 75%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidationTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidationGwtTest.java
index 36bce27..b8d4b22 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validation/ValidationTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validation/ValidationGwtTest.java
@@ -13,15 +13,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.validation;
+package org.hibernate.jsr303.tck.tests.validation;
/**
- * Test wrapper for
- * {@link org.hibernate.jsr303.tck.tests.validation.ValidationTest}.
+ * Test wrapper for {@link ValidationTest}.
*/
-public class ValidationTest extends AbstractValidationTest {
+public class ValidationGwtTest extends AbstractValidationTest {
- private final org.hibernate.jsr303.tck.tests.validation.ValidationTest delegate = new org.hibernate.jsr303.tck.tests.validation.ValidationTest();
+ private final ValidationTest delegate = new ValidationTest();
public void notGwtCompatibleTestVerifyMethodsOfValidationObjects() {
// This test relies on reflection so it is not run.
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/CustomConstraintValidatorTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorGwtTest.java
similarity index 73%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/CustomConstraintValidatorTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorGwtTest.java
index 2994ad2..73df34e 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/CustomConstraintValidatorTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorGwtTest.java
@@ -13,22 +13,23 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.validatorfactory;
+package org.hibernate.jsr303.tck.tests.validatorfactory;
import com.google.gwt.junit.client.GWTTestCase;
-import com.google.gwt.sample.validationtck.util.Failing;
+
+import org.hibernate.jsr303.tck.util.Failing;
/**
* Wraps
* {@link org.hibernate.jsr303.tck.tests.constraints.customconstraint.CustomConstraintValidatorTest}
* .
*/
-public class CustomConstraintValidatorTest extends GWTTestCase {
- org.hibernate.jsr303.tck.tests.validatorfactory.CustomConstraintValidatorTest delegate = new org.hibernate.jsr303.tck.tests.validatorfactory.CustomConstraintValidatorTest();
+public class CustomConstraintValidatorGwtTest extends GWTTestCase {
+ CustomConstraintValidatorTest delegate = new CustomConstraintValidatorTest();
@Override
public String getModuleName() {
- return "com.google.gwt.sample.validationtck.validatorfactory.TckTest";
+ return "org.hibernate.jsr303.tck.tests.validatorfactory.TckTest";
}
@Failing(issue = 5805)
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTest.gwt.xml
similarity index 85%
copy from samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
copy to samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTest.gwt.xml
index 6e19709..c5445cb 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/metadata/TckTest.gwt.xml
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTest.gwt.xml
@@ -16,12 +16,12 @@
the License.
-->
<module>
- <inherits name="com.google.gwt.sample.validationtck.ValidationTck" />
+ <inherits name="org.hibernate.jsr303.tck.tests.ValidationTck" />
<source path="">
<include name="*.java" />
<exclude name="super" />
</source>
- <replace-with class="com.google.gwt.sample.validationtck.metadata.TckTestValidatorFactory">
+ <replace-with class="org.hibernate.jsr303.tck.tests.validatorfactory.TckTestValidatorFactory">
<when-type-is class="javax.validation.ValidatorFactory"/>
</replace-with>
-</module>
+</module>
\ No newline at end of file
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/TckTestValidatorFactory.java b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTestValidatorFactory.java
similarity index 95%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/TckTestValidatorFactory.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTestValidatorFactory.java
index 2e7a862..2ae5b00 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/validatorfactory/TckTestValidatorFactory.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/tests/validatorfactory/TckTestValidatorFactory.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.validatorfactory;
+package org.hibernate.jsr303.tck.tests.validatorfactory;
import com.google.gwt.core.client.GWT;
import com.google.gwt.validation.client.AbstractGwtValidatorFactory;
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/Failing.java b/samples/validationtck/test/org/hibernate/jsr303/tck/util/Failing.java
similarity index 96%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/util/Failing.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/util/Failing.java
index 7c7e885..d4fc0e9 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/Failing.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/util/Failing.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.util;
+package org.hibernate.jsr303.tck.util;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/NonTckTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/util/NonTckTest.java
similarity index 96%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/util/NonTckTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/util/NonTckTest.java
index d15ae9f..4fe665e 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/NonTckTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/util/NonTckTest.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.util;
+package org.hibernate.jsr303.tck.util;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/NotSupported.java b/samples/validationtck/test/org/hibernate/jsr303/tck/util/NotSupported.java
similarity index 96%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/util/NotSupported.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/util/NotSupported.java
index b57d0bf..d3e8605 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/NotSupported.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/util/NotSupported.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.util;
+package org.hibernate.jsr303.tck.util;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/TckTestSuiteWrapper.java b/samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
similarity index 98%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/util/TckTestSuiteWrapper.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
index 1756d12..51214da 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/TckTestSuiteWrapper.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.util;
+package org.hibernate.jsr303.tck.util;
import static com.google.gwt.thirdparty.guava.common.base.Predicates.and;
import static com.google.gwt.thirdparty.guava.common.base.Predicates.not;
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/TckTestSuiteWrapperTest.java b/samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapperTest.java
similarity index 93%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/util/TckTestSuiteWrapperTest.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapperTest.java
index 887630f..dc427e8 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/TckTestSuiteWrapperTest.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapperTest.java
@@ -13,13 +13,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.util;
+package org.hibernate.jsr303.tck.util;
import com.google.gwt.junit.client.GWTTestCase;
-import com.google.gwt.sample.validationtck.util.NotSupported.Reason;
import junit.framework.TestCase;
+import org.hibernate.jsr303.tck.util.NotSupported.Reason;
+
/**
* Tests for {@link TckTestSuiteWrapper}.
*/
@@ -104,7 +105,7 @@
@Override
public final String getModuleName() {
- return "com.google.gwt.sample.validationtck.metadata.TckTest";
+ return "org.hibernate.jsr303.tck.tests.metadata.TckTest";
}
}
diff --git a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/UtilJreSuite.java b/samples/validationtck/test/org/hibernate/jsr303/tck/util/UtilJreSuite.java
similarity index 94%
rename from samples/validationtck/test/com/google/gwt/sample/validationtck/util/UtilJreSuite.java
rename to samples/validationtck/test/org/hibernate/jsr303/tck/util/UtilJreSuite.java
index c22f04f..4800375 100644
--- a/samples/validationtck/test/com/google/gwt/sample/validationtck/util/UtilJreSuite.java
+++ b/samples/validationtck/test/org/hibernate/jsr303/tck/util/UtilJreSuite.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.sample.validationtck.util;
+package org.hibernate.jsr303.tck.util;
import junit.framework.Test;
import junit.framework.TestSuite;
