Reviewers: Nick Chalko,
Description:
Reorganized the GWT test suite structure for the nested constraint
composition tests to fix errors.
Previously the nested constraint composition tests would not work in a
production (compiled JS) environment when included in a GWT test suite
that also includes tests from a different package. This is due to the
way GWTTest handles module creation. By moving the
nestedconstraintcomposition package tests to their own module they are
able to run without conflicts.
[JSR 303 TCK Result] 165 of 205 (80.49%) Pass with 32 Failures and 7
Errors.
Please review this at http://gwt-code-reviews.appspot.com/1765803/
Affected files:
M
user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
A
user/test/com/google/gwt/validation/tck/NestedConstraintCompositionGwtSuite.java
M
user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionGwtTest.java
Index:
user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
===================================================================
---
user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
(revision 11153)
+++
user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
(working copy)
@@ -19,7 +19,6 @@
import
org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.ConstraintCompositionCompileTest;
import
org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.ConstraintCompositionGwtTest;
-import
org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition.NestedConstraintCompositionGwtTest;
import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
/**
@@ -31,7 +30,6 @@
"TCK for GWT Validation, constraints composition package");
suite.addTestSuite(ConstraintCompositionCompileTest.class);
suite.addTestSuite(ConstraintCompositionGwtTest.class);
- suite.addTestSuite(NestedConstraintCompositionGwtTest.class);
return suite;
}
}
Index:
user/test/com/google/gwt/validation/tck/NestedConstraintCompositionGwtSuite.java
===================================================================
---
user/test/com/google/gwt/validation/tck/NestedConstraintCompositionGwtSuite.java
(revision 0)
+++
user/test/com/google/gwt/validation/tck/NestedConstraintCompositionGwtSuite.java
(revision 0)
@@ -0,0 +1,33 @@
+/*
+ * 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.validation.tck;
+
+import junit.framework.Test;
+
+import
org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition.NestedConstraintCompositionGwtTest;
+import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
+
+/**
+ * Tck Tests for the {@code nested constraints composition} package.
+ */
+public class NestedConstraintCompositionGwtSuite {
+ public static Test suite() {
+ TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
+ "TCK for GWT Validation, nested constraints composition package");
+ suite.addTestSuite(NestedConstraintCompositionGwtTest.class);
+ return suite;
+ }
+}
Index:
user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionGwtTest.java
===================================================================
---
user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionGwtTest.java
(revision 11153)
+++
user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionGwtTest.java
(working copy)
@@ -17,7 +17,6 @@
import com.google.gwt.junit.client.GWTTestCase;
-import org.hibernate.jsr303.tck.util.client.Failing;
import org.hibernate.jsr303.tck.util.client.NonTckTest;
/**
@@ -25,7 +24,7 @@
*/
public class NestedConstraintCompositionGwtTest extends GWTTestCase {
- //private NestedConstraintCompositionTest delegate = new
NestedConstraintCompositionTest();
+ private NestedConstraintCompositionTest delegate = new
NestedConstraintCompositionTest();
@Override
@@ -33,28 +32,20 @@
return "org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition.TckTest";
}
- @Failing(issue = 1744804)
public void
testCompositeConstraint1WithNestedConstraintSingleViolation() {
-
//delegate.testCompositeConstraint1WithNestedConstraintSingleViolation();
- fail();
+ delegate.testCompositeConstraint1WithNestedConstraintSingleViolation();
}
- @Failing(issue = 1744804)
public void
testCompositeConstraint2WithNestedConstraintSingleViolation() {
-
//delegate.testCompositeConstraint2WithNestedConstraintSingleViolation();
- fail();
+ delegate.testCompositeConstraint2WithNestedConstraintSingleViolation();
}
- @Failing(issue = 1744804)
public void testCompositeConstraint3WithNestedConstraint() {
- //delegate.testCompositeConstraint3WithNestedConstraint();
- fail();
+ delegate.testCompositeConstraint3WithNestedConstraint();
}
- @Failing(issue = 1744804)
public void
testCompositeConstraint4WithNestedConstraintSingleViolation() {
-
//delegate.testCompositeConstraint4WithNestedConstraintSingleViolation();
- fail();
+ delegate.testCompositeConstraint4WithNestedConstraintSingleViolation();
}
@NonTckTest
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
