Add Spring MVC Test framework

This commit adds the spring-test-mvc project [1] to the Spring
Framework as part of the spring-test module.

The sources are added as a root-level project called "spring-test-mvc"
instead of under "spring-test" because the new sources need to be
compiled with Servlet 3 while the current "spring-test" sources require
Servlet 2.5 and the Eclipse IDE does not support having different
classpaths for the same project.

The Gradle build produces a single spring-test jar that contains
sources from both "spring-test" and "spring-test-mvc". This merge is
made possible through merge-dist.gradle as follows:

- jar tasks of the "from" project execute tasks of the "to" project
- "to" project is added to the classpath of the "from" project
- "to" project pom is updated with entries from the "from" project

For further details see documentation in merge-dist.gradle.

Special thanks to everyone who contributed to the initial development
of the Spring MVC Test framework:

 Arjen Poutsma <poutsma@mac.com>
 Craig Walls <cwalls@vmware.com>
 Frans Flippo <fransflippo@utopia.orange11.nl>
 Harry Lascelles <harry@firstbanco.com>
 Irfan <mail.urfi@gmail.com>
 Jörg Rathlev <joerg.rathlev@s24.com>
 Keesun Baik <whiteship2000@gmail.com>
 Keesun Baik <whiteship@epril.com>
 Matthew Reid <matthew.reid@nakedwines.com>
 Nils-Helge Garli Hegvik <Nils-Helge.Hegvik@telenor.com>
 Rob Winch <rwinch@vmware.com>
 Scott Frederick <sfrederick@vmware.com>
 Sven Filatov <sven.filatov@gmail.com>
 Thomas Bruyelle <thomas.bruyelle@gmail.com>
 youngm <youngm@gmail.com>

[1]: https://github.com/SpringSource/spring-test-mvc

Issue: SPR-9859, SPR-7951

Author: rwinch

build.gradle

@@ -548,6 +548,48 @@ project('spring-test') {
     }
 }
 
+project('spring-test-mvc') {
+    description = 'Spring Test MVC Framework'
+    apply from: 'test-mvc.gradle'
+    dependencies {
+        compile project(":spring-context")
+        compile project(":spring-webmvc")
+        compile project(":spring-test").sourceSets.main.output
+        compile("org.apache.tomcat:tomcat-servlet-api:7.0.8", provided)
+        compile "org.hamcrest:hamcrest-all:1.1"
+        compile("com.jayway.jsonpath:json-path:0.8.1", optional)
+        compile("xmlunit:xmlunit:1.2", optional)
+        testCompile("org.slf4j:jcl-over-slf4j:1.6.1")
+        testCompile("org.slf4j:slf4j-log4j12:1.6.1") {
+            exclude group: 'log4j', module: 'log4j'
+        }
+        testCompile("log4j:log4j:1.2.15") {
+            exclude group: 'javax.mail', module: 'mail'
+            exclude group: 'javax.jms', module: 'jms'
+            exclude group: 'com.sun.jdmk', module: 'jmxtools'
+            exclude group: 'com.sun.jmx', module: 'jmxri'
+        }
+        testCompile "javax.servlet:jstl:1.2"
+        testCompile "org.apache.tiles:tiles-jsp:2.2.2"
+        testCompile "org.hibernate:hibernate-validator:4.2.0.Final"
+        testCompile "org.codehaus.jackson:jackson-mapper-asl:1.4.2"
+        testCompile project(":spring-oxm")
+        testCompile "com.thoughtworks.xstream:xstream:1.3.1"
+        testCompile "cglib:cglib-nodep:2.2"
+        testCompile "rome:rome:1.0"
+        testCompile "javax.xml.bind:jaxb-api:2.2.6"
+        testCompile("org.springframework.security:spring-security-core:3.1.2.RELEASE") {
+            exclude group: 'org.springframework'
+        }
+        testCompile("org.springframework.security:spring-security-web:3.1.2.RELEASE") {
+            exclude group: 'org.springframework'
+        }
+        testCompile("org.springframework.security:spring-security-config:3.1.2.RELEASE") {
+            exclude group: 'org.springframework'
+        }
+    }
+}
+
 project('spring-struts') {
     description = 'Spring Struts'
     dependencies {

merge-dist.gradle

@@ -0,0 +1,72 @@
+import org.gradle.plugins.ide.eclipse.model.ProjectDependency
+
+/**
+ * Will merge the distributions of the current project into mergeIntoProject. For
+ * example, to bundle spring-test-mvc in spring-test's jars. This script will perform the
+ * following steps:
+ * <ul>
+ *   <li>Ensure that jar tasks of the project being merged from will execute the tasks of
+ *     the project being merged into</li>
+ *   <li>Add the project being merged into to the classpath of the project being merged
+ *     from</li>
+ *   <li>Update the pom.xml of the project being merged into to contain the entries from
+ *     the project being merged from</li>
+ * </ul>
+ *
+ * Example Usage:
+ *
+ * ext.mergeIntoProject = project(':spring-test')
+ * apply from: "${rootProject.projectDir}/merge-dist.gradle"
+ */
+
+def mergeFromProject = project
+
+// invoking a task on mergeFromProject will invoke the task with the same name on mergeIntoProject
+def taskNamesToMerge = ['sourcesJar','jar','javadocJar','javadoc','install']
+taskNamesToMerge.each { taskName ->
+    def taskToRemove = tasks.getByPath(taskName)
+    taskToRemove.enabled = false
+    taskToRemove.dependsOn mergeIntoProject."$taskName"
+}
+
+// update mergeIntoProject artifacts to contain the mergeFromProject artifact contents
+mergeIntoProject."sourcesJar" {
+    from mergeFromProject.sourcesJar.source
+}
+mergeIntoProject."jar" {
+    from mergeFromProject.jar.source
+}
+mergeIntoProject."javadoc" {
+    source += mergeFromProject.javadoc.source
+    classpath += mergeFromProject.javadoc.classpath
+}
+
+// GRADLE-1116
+mergeFromProject.eclipse.classpath.file.whenMerged { classpath ->
+    classpath.entries.removeAll { entry -> entry.path.contains("/${mergeIntoProject.name}/build/") }
+    def dependency = new ProjectDependency("/${mergeIntoProject.name}", mergeIntoProject.path)
+    dependency.exported = true
+    classpath.entries.add(dependency)
+}
+
+// Update mergeIntoProject to contain additional configurations that contains all the dependencies from mergeFromProject
+// so that Maven pom generation works
+gradle.taskGraph.whenReady {
+    mergeFromProject.configurations.archives.artifacts.clear()
+
+    mergeFromProject.configurations.each { config->
+        def mapping = mergeFromProject.conf2ScopeMappings.getMapping([config])
+        if(mapping.scope) {
+            def newConfigName = mergeFromProject.name + "-"+ config.name
+            mergeIntoProject.configurations.add(newConfigName)
+            config.dependencies.each { dependency ->
+                mergeIntoProject.dependencies.add(newConfigName, dependency)
+            }
+            configure(mergeIntoProject.install.repositories.mavenInstaller.pom.scopeMappings) {
+                addMapping(mapping.priority + 100, mergeIntoProject.configurations."$newConfigName", mapping.scope)
+            }
+            mergeIntoProject.optionalDeps += mergeFromProject.optionalDeps
+            mergeIntoProject.providedDeps += mergeFromProject.providedDeps
+        }
+    }
+}

settings.gradle

@@ -15,6 +15,7 @@ include 'spring-orm'
 include 'spring-oxm'
 include 'spring-struts'
 include 'spring-test'
+include 'spring-test-mvc'
 include 'spring-tx'
 include 'spring-web'
 include 'spring-webmvc'

spring-test-mvc/src/main/java/org/springframework/test/web/mock/AssertionErrors.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * 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 org.springframework.test.web.mock;
+
+/**
+ * JUnit independent assertion class.
+ *
+ * @author Lukas Krecan
+ * @author Arjen Poutsma
+ * @since 3.2
+ */
+public abstract class AssertionErrors {
+
+    private AssertionErrors() {
+    }
+
+	/**
+	 * Fails a test with the given message.
+	 *
+	 * @param message the message
+	 */
+    public static void fail(String message) {
+        throw new AssertionError(message);
+    }
+
+	/**
+	 * Fails a test with the given message passing along expected and actual values to be added to the message.
+	 *
+	 * @param message the message
+	 * @param expected the expected value
+	 * @param actual   the actual value
+	 */
+    public static void fail(String message, Object expected, Object actual) {
+        throw new AssertionError(message + " expected:<" + expected + "> but was:<" + actual + ">");
+    }
+
+	/**
+	 * Asserts that a condition is {@code true}. If not, throws an {@link AssertionError} with the given message.
+	 *
+	 * @param message   the message
+	 * @param condition the condition to test for
+	 */
+    public static void assertTrue(String message, boolean condition) {
+        if (!condition) {
+            fail(message);
+        }
+    }
+
+	/**
+	 * Asserts that two objects are equal. If not, an {@link AssertionError} is thrown with the given message.
+	 *
+	 * @param message  the message
+	 * @param expected the expected value
+	 * @param actual   the actual value
+	 */
+    public static void assertEquals(String message, Object expected, Object actual) {
+        if (expected == null && actual == null) {
+            return;
+        }
+        if (expected != null && expected.equals(actual)) {
+            return;
+        }
+        fail(message, expected, actual);
+    }
+
+}