Integrate r11134 into releases/2.5.

Review by: rdayal@google.com

git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.5@11271 8db76d5a-ed1c-0410-87a9-c151d255dfc7

user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java

diff --git a/user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java b/user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
index 4ee69a1..bc983b4 100644
--- a/user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/ConstraintCompositionGwtSuite.java
@@ -19,7 +19,7 @@
 
 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.NestedConstraintCompositionTest;
+import org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition.NestedConstraintCompositionGwtTest;
 import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
 
 /**
@@ -31,7 +31,7 @@
         "TCK for GWT Validation, constraints composition package");
     suite.addTestSuite(ConstraintCompositionCompileTest.class);
     suite.addTestSuite(ConstraintCompositionGwtTest.class);
-    suite.addTestSuite(NestedConstraintCompositionTest.class);
+    suite.addTestSuite(NestedConstraintCompositionGwtTest.class);
     return suite;
   }
 }

user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java

diff --git a/user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java b/user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java
index 0ca6128..3ca6491 100644
--- a/user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java
+++ b/user/test/com/google/gwt/validation/tck/CustomConstraintGwtSuite.java
@@ -17,6 +17,7 @@
 
 import junit.framework.Test;
 
+import org.hibernate.jsr303.tck.tests.constraints.customconstraint.CustomConstraintValidatorCompileTest;
 import org.hibernate.jsr303.tck.tests.constraints.customconstraint.CustomConstraintValidatorGwtTest;
 import org.hibernate.jsr303.tck.util.TckTestSuiteWrapper;
 
@@ -28,6 +29,7 @@
     TckTestSuiteWrapper suite = new TckTestSuiteWrapper(
         "TCK for GWT Validation, constraints customconstraint package");
     suite.addTestSuite(CustomConstraintValidatorGwtTest.class);
+    suite.addTestSuite(CustomConstraintValidatorCompileTest.class);
     return suite;
   }
 }

user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionGwtTest.java

diff --git a/user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionGwtTest.java b/user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionGwtTest.java
index 52f1d40..b22b24d 100644
--- a/user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionGwtTest.java
+++ b/user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionGwtTest.java
@@ -17,12 +17,15 @@
 
 import com.google.gwt.junit.client.GWTTestCase;
 
+import org.hibernate.jsr303.tck.util.client.Failing;
+import org.hibernate.jsr303.tck.util.client.NonTckTest;
+
 /**
  * Test wrapper for {@link NestedConstraintCompositionTest}.
  */
 public class NestedConstraintCompositionGwtTest extends GWTTestCase {
 
-  private NestedConstraintCompositionTest delegate = new NestedConstraintCompositionTest();
+  //private NestedConstraintCompositionTest delegate = new NestedConstraintCompositionTest();
 
 
   @Override
@@ -30,19 +33,30 @@
     return "org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition.TckTest";
   }
 
+  @Failing(issue = 1744804)
   public void testCompositeConstraint1WithNestedConstraintSingleViolation() {
-    delegate.testCompositeConstraint1WithNestedConstraintSingleViolation();
+    //delegate.testCompositeConstraint1WithNestedConstraintSingleViolation();
+    fail();
   }
 
+  @Failing(issue = 1744804)
   public void testCompositeConstraint2WithNestedConstraintSingleViolation() {
-    delegate.testCompositeConstraint2WithNestedConstraintSingleViolation();
+    //delegate.testCompositeConstraint2WithNestedConstraintSingleViolation();
+    fail();
   }
 
+  @Failing(issue = 1744804)
   public void testCompositeConstraint3WithNestedConstraint() {
-    delegate.testCompositeConstraint3WithNestedConstraint();
+    //delegate.testCompositeConstraint3WithNestedConstraint();
+    fail();
   }
 
+  @Failing(issue = 1744804)
   public void testCompositeConstraint4WithNestedConstraintSingleViolation() {
-    delegate.testCompositeConstraint4WithNestedConstraintSingleViolation();
+    //delegate.testCompositeConstraint4WithNestedConstraintSingleViolation();
+    fail();
   }
+  
+  @NonTckTest
+  public void testThereMustBeOnePassingTest() {}
 }