Reviewers: jat,
Description:
Switching to the junit4 jars, although the @annotation stuff isn't
going to work.
Review by: j...@google.com
Please review this at http://gwt-code-reviews.appspot.com/1374801/
Affected files:
M build-tools/ant-gwt/build.xml
M common.ant.xml
M dev/build.xml
M doc/build.xml
M eclipse/build-tools/ant-gwt/.classpath
M eclipse/dev/.classpath
M eclipse/dev/compiler/.classpath
M eclipse/doc/.classpath
M eclipse/servlet/.classpath
M eclipse/user/.classpath
M tools/api-checker/build.xml
M tools/cldr-import/build.xml
M user/build.xml
M user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
Index: build-tools/ant-gwt/build.xml
===================================================================
--- build-tools/ant-gwt/build.xml (revision 9793)
+++ build-tools/ant-gwt/build.xml (working copy)
@@ -20,7 +20,7 @@
<gwt.javac srcdir="test" 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" />
</classpath>
</gwt.javac>
</target>
Index: common.ant.xml
===================================================================
--- common.ant.xml (revision 9793)
+++ common.ant.xml (working copy)
@@ -190,7 +190,7 @@
<sequential>
<taskdef name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
<classpath>
- <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.antlib}/ant-junit-1.6.5.jar"
/>
<pathelement
location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
</classpath>
@@ -233,7 +233,7 @@
<path refid="project.classpath.class" />
<pathelement location="${emma.lib}" />
<pathelement location="${gwt.dev.staging.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}/selenium/selenium-java-client-driver.jar" />
<pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
<pathelement
location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg1.jar" />
Index: dev/build.xml
===================================================================
--- dev/build.xml (revision 9793)
+++ dev/build.xml (working copy)
@@ -27,7 +27,7 @@
<classpath>
<pathelement location="${javac.out}" />
<pathelement location="${alldeps.jar}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
</classpath>
</gwt.javac>
<gwt.javac srcdir="${gwt.root}/user/src" destdir="${javac.junit.out}"
@@ -35,7 +35,7 @@
<classpath>
<pathelement location="${javac.out}" />
<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" />
@@ -213,7 +213,7 @@
<pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
<pathelement location="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" />
<pathelement
location="${gwt.tools.lib}/tomcat/commons-collections-3.1.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}/guava/guava-r06/guava-r06-rebased-2.jar" />
</classpath>
</gwt.javac>
@@ -224,7 +224,7 @@
<src path="core/src" />
<classpath>
<pathelement location="${alldeps.jar}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
</classpath>
</gwt.javac>
<copy todir="${javac.out}">
Index: doc/build.xml
===================================================================
--- doc/build.xml (revision 9793)
+++ doc/build.xml (working copy)
@@ -26,7 +26,7 @@
<pathelement location="${gwt.dev.jar}" />
<pathelement location="${gwt.user.jar}" />
<pathelement
location="${gwt.tools}/redist/json/r2_20080312/json-1.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}/javax/validation/validation-api-1.0.0.GA.jar" />
<pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar"
/>
<pathelement
location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
Index: eclipse/build-tools/ant-gwt/.classpath
===================================================================
--- eclipse/build-tools/ant-gwt/.classpath (revision 9793)
+++ eclipse/build-tools/ant-gwt/.classpath (working copy)
@@ -4,6 +4,6 @@
<classpathentry kind="src" path="core/test"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/ant-1.6.5.jar"
sourcepath="/GWT_TOOLS/lib/apache/ant-1.6.5-src.zip"/>
- <classpathentry exported="true" kind="var"
path="GWT_TOOLS/lib/junit/junit-3.8.1.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-3.8.1-src.zip"/>
+ <classpathentry exported="true" kind="var"
path="GWT_TOOLS/lib/junit/junit-4.8.2.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Index: eclipse/dev/.classpath
===================================================================
--- eclipse/dev/.classpath (revision 9793)
+++ eclipse/dev/.classpath (working copy)
@@ -8,7 +8,7 @@
<classpathentry kind="var"
path="GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2.jar"
sourcepath="/GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2-src.zip"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdt-3.4.2.jar"
sourcepath="/GWT_TOOLS/lib/eclipse/jdt-3.4.2-src.zip"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-6.1.11.jar"
sourcepath="/GWT_TOOLS/lib/jetty/jetty-6.1.11-src.zip"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-3.8.1.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-3.8.1-src.zip"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/tomcat/ant-launcher-1.6.5.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/tomcat/catalina-1.0.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/tomcat/catalina-optional-1.0.jar"/>
@@ -40,6 +40,6 @@
<classpathentry kind="var"
path="GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-core-js-r5940.jar"
sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-core-js-r5940-sources.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-r5940.jar"
sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-r5940-sources.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar"/>
- <classpathentry kind="var"
path="GWT_TOOLS/lib/guava/guava-r06/guava-r06-rebased.jar"/>
+ <classpathentry kind="var"
path="GWT_TOOLS/lib/guava/guava-r06/guava-r06-rebased.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Index: eclipse/dev/compiler/.classpath
===================================================================
--- eclipse/dev/compiler/.classpath (revision 9793)
+++ eclipse/dev/compiler/.classpath (working copy)
@@ -5,7 +5,7 @@
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/ant-1.6.5.jar"
sourcepath="/GWT_TOOLS/lib/apache/ant-1.6.5-src.zip"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdt-3.4.2.jar"
sourcepath="/GWT_TOOLS/lib/eclipse/jdt-3.4.2-src.zip"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-3.8.1.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-3.8.1-src.zip"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/tomcat/commons-collections-3.1.jar"
sourcepath="/GWT_TOOLS/lib/tomcat/commons-collections-3.1-src.zip"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/guava/guava-r06/guava-r06-rebased.jar"/>
<classpathentry kind="output" path="bin"/>
Index: eclipse/doc/.classpath
===================================================================
--- eclipse/doc/.classpath (revision 9793)
+++ eclipse/doc/.classpath (working copy)
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="core/src"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-user"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-3.8.1.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-3.8.1-src.zip"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-3.8.1-src.zip"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/tomcat/servlet-api-2.4.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
<classpathentry kind="output" path="bin"/>
Index: eclipse/servlet/.classpath
===================================================================
--- eclipse/servlet/.classpath (revision 9793)
+++ eclipse/servlet/.classpath (working copy)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry excluding="**/rebind/|**/tools/|com/google/gwt/json/|
com/google/gwt/junit/*.java|com/google/gwt/junit/benchmarks/|
com/google/gwt/junit/client/Benchmark.java|
com/google/gwt/junit/client/GWTTestCase.java|com/google/gwt/junit/remote/|
com/google/gwt/junit/server/" kind="src" path="core/src"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-3.8.1.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-3.8.1-src.zip"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/tomcat/servlet-api-2.4.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-user"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
Index: eclipse/user/.classpath
===================================================================
--- eclipse/user/.classpath (revision 9793)
+++ eclipse/user/.classpath (working copy)
@@ -7,7 +7,7 @@
<classpathentry kind="src" path="core/test"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="var"
path="GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2.jar"
sourcepath="/GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2-src.zip"/>
- <classpathentry exported="true" kind="var"
path="GWT_TOOLS/lib/junit/junit-3.8.1.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-3.8.1-src.zip"/>
+ <classpathentry exported="true" kind="var"
path="GWT_TOOLS/lib/junit/junit-4.8.2.jar"
sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.jar"/>
<classpathentry exported="true" kind="var"
path="GWT_TOOLS/lib/tomcat/servlet-api-2.5.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/apache/http/httpclient-4.0.1.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/apache/http/httpcore-4.0.1.jar"/>
Index: tools/api-checker/build.xml
===================================================================
--- tools/api-checker/build.xml (revision 9793)
+++ tools/api-checker/build.xml (working copy)
@@ -35,7 +35,7 @@
<gwt.javac srcdir="test" 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.dev.staging.jar}" />
<pathelement location="${gwt.dev.jar}" />
<pathelement location="${gwt.build.out}/dev/bin-test" />
Index: tools/cldr-import/build.xml
===================================================================
--- tools/cldr-import/build.xml (revision 9793)
+++ tools/cldr-import/build.xml (working copy)
@@ -54,7 +54,7 @@
<classpath>
<pathelement location="${gwt.dev.jar}" />
<pathelement location="${gwt.user.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="${javac.out}"/>
<pathelement location="${CLDR_TOOLS}/cldr.jar"/>
<pathelement location="${ICU}/icu4j.jar"/>
Index: user/build.xml
===================================================================
--- user/build.xml (revision 9793)
+++ user/build.xml (working copy)
@@ -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>
Index: user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
===================================================================
--- user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
(revision 9793)
+++ user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
(working copy)
@@ -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);
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
