commit 618aafc28d982d8e73db855adaf1246745b07f94
author fabbott@google.com <fabbott@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Mar 08 16:22:05 2011 +0000
committer fabbott@google.com <fabbott@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Mar 08 16:22:05 2011 +0000
tree 6a418d4f802f0ea731a74427a3a4a227e4cf7ae5
parent be549ad4fd1f6d422a0ef0e37fd06bc828334ee3

Switching to the junit4 jars, although the @annotation stuff isn't going to work.  Also switching to the non-junit4 testng jars, to avoid classpath order confusion.

Review at http://gwt-code-reviews.appspot.com/1374801

Review by: jat@google.com

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

user/build.xml

diff --git a/user/build.xml b/user/build.xml
index 5b5060e..6d4a2dc 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -81,7 +81,7 @@
     <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-api-1.0.0-sources.jar" />
     <pathelement location="${gwt.tools.lib}/jboss/test-harness/jboss-test-harness-api-1.0.0.jar" />
     <pathelement location="${gwt.tools.lib}/testng/testng-5.14.1-sources.jar" />
-    <pathelement location="${gwt.tools.lib}/testng/testng-5.14.1.jar" />
+    <pathelement location="${gwt.tools.lib}/testng/testng-5.14.1-nojunit.jar" />
     <pathelement location="${gwt.dev.jar}" />
   </path>
 
@@ -91,7 +91,7 @@
     <gwt.javac excludes="**/super/**">
       <classpath>
         <pathelement location="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar" />
-        <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+        <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
         <pathelement location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
         <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
         <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
@@ -131,7 +131,7 @@
     <gwt.javac srcdir="test" excludes="com/google/gwt/langtest/**" destdir="${javac.junit.out}">
       <classpath>
         <pathelement location="${javac.out}" />
-        <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+        <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
         <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
         <path refid="test.extraclasspath" />
       </classpath>

user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java

diff --git a/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
index de355f9..f9aa7d7 100644
--- a/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
+++ b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
@@ -82,17 +82,6 @@
     };
   }
 
-  /**
-   * Returns a test which will fail and log a warning message.
-   */
-  private static Test warning(final String message) {
-    return new TestCase("warning") {
-      protected void runTest() {
-        fail(message);
-      }
-    };
-  }
-
   public TckTestSuiteWrapper(String name) {
     super(name);
   }