351868 - fixes missing mock call getEnvironment() after upgrading to Spring framework version 3.2.10.RELEASE
diff --git a/build.gradle b/build.gradle
index ab4969a..d819123 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,8 @@
project(':web:org.eclipse.virgo.web.dm') {
dependencies {
testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ // we don't provide OSGi-ified version of org.springframework.test
+ testCompile group: "org.springframework", name: "spring-test", version: springframeworkVersion, configuration: "compile", ext: "jar"
testCompile group: "org.apache.commons", name: "com.springsource.org.apache.commons.logging", version: commonsLoggingVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
diff --git a/org.eclipse.virgo.web.dm/src/test/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContextTests.java b/org.eclipse.virgo.web.dm/src/test/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContextTests.java
index cfbb850..d19b4a4 100644
--- a/org.eclipse.virgo.web.dm/src/test/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContextTests.java
+++ b/org.eclipse.virgo.web.dm/src/test/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContextTests.java
@@ -19,11 +19,11 @@
import javax.servlet.ServletContext;
-import org.eclipse.virgo.web.dm.ServerOsgiBundleXmlWebApplicationContext;
+import org.eclipse.gemini.blueprint.context.ConfigurableOsgiBundleApplicationContext;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import org.eclipse.gemini.blueprint.context.ConfigurableOsgiBundleApplicationContext;
+import org.springframework.mock.env.MockEnvironment;
public class ServerOsgiBundleXmlWebApplicationContextTests {
@@ -51,6 +51,7 @@
Bundle bundle = createNiceMock(Bundle.class);
expect(bundleContext.getBundle()).andReturn(bundle);
expect(parent.getBundleContext()).andReturn(bundleContext);
+ expect(parent.getEnvironment()).andReturn(new MockEnvironment());
replay(parent, bundleContext, bundle);
ServerOsgiBundleXmlWebApplicationContext applicationContext = new ServerOsgiBundleXmlWebApplicationContext(parent);
