Fix to make robolectric usable with Roboguice
diff --git a/pom.xml b/pom.xml
index 4d80f14..63027f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,21 +25,9 @@
</dependency>
<dependency>
- <groupId>android</groupId>
- <artifactId>android</artifactId>
- <version>2.2_r2</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.android</groupId>
- <artifactId>android-test</artifactId>
- <version>2.2.1</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.android.maps</groupId>
- <artifactId>maps</artifactId>
- <version>8_r2</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
</dependency>
<dependency>
@@ -61,16 +49,28 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- </dependency>
-
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.8.5</version>
</dependency>
+
+ <dependency>
+ <groupId>android</groupId>
+ <artifactId>android</artifactId>
+ <version>2.2_r2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android-test</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.android.maps</groupId>
+ <artifactId>maps</artifactId>
+ <version>8_r2</version>
+ </dependency>
</dependencies>
<repositories>
diff --git a/src/com/xtremelabs/robolectric/RobolectricTestRunner.java b/src/com/xtremelabs/robolectric/RobolectricTestRunner.java
index 4924077..98ba68b 100644
--- a/src/com/xtremelabs/robolectric/RobolectricTestRunner.java
+++ b/src/com/xtremelabs/robolectric/RobolectricTestRunner.java
@@ -1,20 +1,7 @@
package com.xtremelabs.robolectric;
-import android.app.Application;
-import android.net.Uri__FromAndroid;
-import com.xtremelabs.robolectric.res.ResourceLoader;
-import com.xtremelabs.robolectric.shadows.ShadowApplication;
-import com.xtremelabs.robolectric.util.RealObject;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.Statement;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
+import static java.io.File.separator;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -23,7 +10,23 @@
import java.util.HashMap;
import java.util.Map;
-import static java.io.File.separator;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import android.app.Application;
+import android.net.Uri__FromAndroid;
+
+import com.xtremelabs.robolectric.res.ResourceLoader;
+import com.xtremelabs.robolectric.shadows.ShadowApplication;
+import com.xtremelabs.robolectric.util.RealObject;
/**
* Installs a {@link RobolectricClassLoader} and {@link com.xtremelabs.robolectric.res.ResourceLoader} in order to
@@ -242,7 +245,7 @@
return new Application();
}
- private ResourceLoader createResourceLoader(String projectRoot, String resourceDirectory) {
+ protected ResourceLoader createResourceLoader(String projectRoot, String resourceDirectory) {
RootAndDirectory rootAndDirectory = new RootAndDirectory(projectRoot, resourceDirectory);
ResourceLoader resourceLoader = resourceLoaderForRootAndDirectory.get(rootAndDirectory);
if (resourceLoader == null) {
