2 files changed, 25 insertions, 5 deletions
diff --git a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
index e430cb6103..8cc26a5c7f 100644
--- a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
+++ b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
@@ -73,7 +73,7 @@ public class TransactionListenersConcurrency extends TestCase {
 
                         app.start(new ApplicationStartEvent(new URL(
                                 "http://localhost/"), new Properties(),
-                                context, true, null));
+                                context, true));
                     } catch (MalformedURLException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
diff --git a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java b/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
index 99b77b0d29..aa9753ebcc 100644
--- a/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
+++ b/tests/server-side/com/vaadin/tests/server/component/root/CustomRootClassLoader.java
@@ -6,9 +6,12 @@ import java.util.Properties;
 
 import junit.framework.TestCase;
 
+import org.easymock.EasyMock;
+
 import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
 import com.vaadin.RootRequiresMoreInformationException;
+import com.vaadin.terminal.DeploymentConfiguration;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.ui.Root;
 
@@ -50,12 +53,28 @@ public class CustomRootClassLoader extends TestCase {
     public void testWithNullClassLoader() throws Exception {
         Application application = createStubApplication();
         application.start(new ApplicationStartEvent(null, new Properties(),
-                null, false, null));
+                null, false));
 
-        Root root = application.getRootForRequest(null);
+        Root root = application.getRootForRequest(createRequestMock(null));
         assertTrue(root instanceof MyRoot);
     }
 
+    private static WrappedRequest createRequestMock(ClassLoader classloader) {
+        // Mock a DeploymentConfiguration to give the passed classloader
+        DeploymentConfiguration configurationMock = EasyMock
+                .createMock(DeploymentConfiguration.class);
+        EasyMock.expect(configurationMock.getClassLoader()).andReturn(
+                classloader);
+
+        // Mock a WrappedRequest to give the mocked deployment configuration
+        WrappedRequest requestMock = EasyMock.createMock(WrappedRequest.class);
+        EasyMock.expect(requestMock.getDeploymentConfiguration()).andReturn(
+                configurationMock);
+
+        EasyMock.replay(configurationMock, requestMock);
+        return requestMock;
+    }
+
     /**
      * Tests that the ClassLoader passed in the ApplicationStartEvent is used to
      * load Root classes.
@@ -68,9 +87,10 @@ public class CustomRootClassLoader extends TestCase {
 
         Application application = createStubApplication();
         application.start(new ApplicationStartEvent(null, new Properties(),
-                null, false, loggingClassLoader));
+                null, false));
 
-        Root root = application.getRootForRequest(null);
+        Root root = application
+                .getRootForRequest(createRequestMock(loggingClassLoader));
         assertTrue(root instanceof MyRoot);
         assertEquals(1, loggingClassLoader.requestedClasses.size());
         assertEquals(MyRoot.class.getName(),