GRAILS-3237 - Replace JUnit 3 with JUnit 4.

Our custom runner mimics JUnit 3 behaviours like the “test”, “setUp” and “tearDown” conventions for backwards compatibility.
fbxie · Mar 9, 2010 · 8a6d774 · 8a6d774
1 parent 041c47b
commit 8a6d774
Show file tree

Hide file tree

Showing 32 changed files with 658 additions and 479 deletions.
diff --git a/build.properties b/build.properties
@@ -19,7 +19,7 @@ bundlor.spring.version=3.0.0.RELEASE
 bundlor.ant.version=1.7.1
 bundlor.ivy.version=2.0.0
 bundlor.gant.version=1.9.1
-bundlor.junit.version=3.8.2
+bundlor.junit.version=4.8.1
 bundlor.commons.logging.version=1.1.0
 bundlor.commons.beanutils.version=1.8.0
 bundlor.commons.lang.version=2.4.0

diff --git a/dependencies.txt b/dependencies.txt
@@ -120,8 +120,8 @@ The following libraries are included in Grails because they are required either
 - Java Transaction API
 - required for running Grails applications
 
-* junit-3.8.2.jar
-- JUnit 3.8.2 (http://junit.org) CPL 1.0 License
+* junit-4.8.1.jar
+- JUnit 4.8.1 (http://junit.org) CPL 1.0 License
 - required for building Grails core
 - required for the command line tools (Gant)
 

diff --git a/grails.ipr b/grails.ipr
@@ -624,7 +624,7 @@
     </library>
     <library name="JUnit">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/lib/junit-3.8.2.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/junit-4.8.1.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/ant-junit-1.7.1.jar!/" />
       </CLASSES>
       <JAVADOC />

diff --git a/ivy.xml b/ivy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0">
     <info organisation="codehaus" module="grails"/>
     <dependencies>
@@ -16,7 +16,7 @@
         <dependency org="apache" name="commons-pool" rev="1.2"/>
         <dependency org="apache" name="commons-validator" rev="1.3.0"/>
         <dependency org="dom4j" name="dom4j" rev="1.6.1"/>
-        <dependency org="junit" name="junit" rev="3.8.1"/>		
+        <dependency org="junit" name="junit" rev="4.8.1"/>		
         <!--<dependency org="rhino" name="js" rev="1.6R2"/>		        -->
         <dependency org="log4j" name="log4j" rev="1.2.8"/>	  
         <!--<dependency org="ognl" name="ognl" rev="2.6.9"/>

diff --git a/lib/junit-3.8.2.jar b/lib/junit-3.8.2.jar
diff --git a/lib/junit-4.8.1.jar b/lib/junit-4.8.1.jar
diff --git a/maven/grails-core.pom.in b/maven/grails-core.pom.in
@@ -231,7 +231,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/maven/grails-crud.pom.in b/maven/grails-crud.pom.in
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/maven/grails-gorm.pom.in b/maven/grails-gorm.pom.in
@@ -184,7 +184,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/maven/grails-scripts.pom.in b/maven/grails-scripts.pom.in
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
+            <version>4.8.1</version>
         </dependency>
 
         <dependency>

diff --git a/maven/grails-spring.pom.in b/maven/grails-spring.pom.in
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/maven/grails-test.mf b/maven/grails-test.mf
@@ -19,4 +19,5 @@ Import-Template:
  org.codehaus.groovy.ant.*;version="${groovy.version:[=.=.=, =.+1.0)}",
  org.codehaus.groovy.tools.*;version="${groovy.version:[=.=.=, =.+1.0)}",
  org.codehaus.groovy.grails.*;version="${grails.version:[=.=.=, +1.0.0)}", 
- org.springframework.*;version="${spring.version:[=.=.=, +1.0.0)}"
+ org.springframework.*;version="${spring.version:[=.=.=, +1.0.0)}",
+ org.junit.*;version="${junit.version:[=.=.=, +1.0.0)}"
diff --git a/maven/grails-test.pom.in b/maven/grails-test.pom.in
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
+            <version>4.8.1</version>
             <scope>runtime</scope>
         </dependency>
 

diff --git a/maven/grails-web.pom.in b/maven/grails-web.pom.in
@@ -121,7 +121,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>

diff --git a/maven/grails-webflow.pom.in b/maven/grails-webflow.pom.in
@@ -142,7 +142,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/scripts/_GrailsTest.groovy b/scripts/_GrailsTest.groovy
@@ -20,8 +20,8 @@ import org.codehaus.groovy.grails.support.PersistenceContextInterceptor
 import org.codehaus.groovy.grails.web.context.GrailsConfigUtils
 import grails.util.GrailsUtil
 
-import org.codehaus.groovy.grails.test.junit3.JUnit3GrailsTestType
-import org.codehaus.groovy.grails.test.junit3.JUnit3GrailsTestTypeMode
+import org.codehaus.groovy.grails.test.junit4.JUnit4GrailsTestType
+import org.codehaus.groovy.grails.test.support.GrailsTestMode
 import org.codehaus.groovy.grails.test.report.junit.JUnitReportsFactory
 import org.codehaus.groovy.grails.test.report.junit.JUnitReportProcessor
 
@@ -128,14 +128,14 @@ target(allTests: "Runs the project's tests.") {
                 if (rawType instanceof CharSequence) {
                     def rawTypeString = rawType.toString()
                     if (phaseName in ['integration', 'functional']) {
-                        def mode = new JUnit3GrailsTestTypeMode(
+                        def mode = new GrailsTestMode(
                             autowire: true,
                             wrapInTransaction: phaseName == "integration",
                             wrapInRequestEnvironment: phaseName == "integration"
                         )
-                        new JUnit3GrailsTestType(rawTypeString, rawTypeString, mode)
+                        new JUnit4GrailsTestType(rawTypeString, rawTypeString, mode)
                     } else {
-                        new JUnit3GrailsTestType(rawTypeString, rawTypeString)
+                        new JUnit4GrailsTestType(rawTypeString, rawTypeString)
                     }
                 } else {
                     rawType

diff --git a/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy b/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
@@ -294,7 +294,7 @@ public class IvyDependencyManager extends AbstractIvyDependencyManager implement
 
 
                 // dependencies needed for running tests
-                test "junit:junit:3.8.2",
+                test "junit:junit:4.8.1",
                      "org.grails:grails-test:$grailsVersion",
                      "org.springframework:org.springframework.test:3.0.0.RELEASE"
 
@@ -359,7 +359,7 @@ public class IvyDependencyManager extends AbstractIvyDependencyManager implement
     }
 
     /**
-     * For usages such as addPluginDependency("foo", [group:"junit", name:"junit", version:"3.8.2"])
+     * For usages such as addPluginDependency("foo", [group:"junit", name:"junit", version:"4.8.1"])
      *
      * This method is designed to be used by the internal framework and plugins and not be end users.
      * The idea is that plugins can provide dependencies at runtime which are then inherited by

diff --git a/src/java/org/codehaus/groovy/grails/test/junit3/JUnit3GrailsEnvironmentTestSuite.groovy b/src/java/org/codehaus/groovy/grails/test/junit3/JUnit3GrailsEnvironmentTestSuite.groovy