Prevent cross-test pollution of Configuration.

3 files changed, 9 insertions, 9 deletions

diff --git a/robolectric/src/main/java/org/robolectric/android/internal/ParallelUniverse.java b/robolectric/src/main/java/org/robolectric/android/internal/ParallelUniverse.java
index 20b7e211f..065361705 100644
--- a/robolectric/src/main/java/org/robolectric/android/internal/ParallelUniverse.java
+++ b/robolectric/src/main/java/org/robolectric/android/internal/ParallelUniverse.java
@@ -79,12 +79,12 @@ public class ParallelUniverse implements ParallelUniverseInterface {
     }
 
     Resources systemResources = Resources.getSystem();
-    Configuration configuration = systemResources.getConfiguration();
+    Configuration configuration = new Configuration();
     DisplayMetrics displayMetrics = new DisplayMetrics();
-    String qualifiers = Bootstrap.applySystemConfiguration(config.qualifiers(),
+    String qualifiers = Bootstrap.applyQualifiers(config.qualifiers(),
         sdkConfig.getApiLevel(), configuration, displayMetrics);
 
-    systemResources.updateConfiguration(configuration, systemResources.getDisplayMetrics());
+    systemResources.updateConfiguration(configuration, displayMetrics);
     RuntimeEnvironment.setQualifiers(qualifiers);
 
     Class<?> contextImplClass = ReflectionHelpers.loadClass(getClass().getClassLoader(), shadowsAdapter.getShadowContextImplClassName());
diff --git a/robolectric/src/test/java/org/robolectric/android/BootstrapTest.java b/robolectric/src/test/java/org/robolectric/android/BootstrapTest.java
index 77883cf81..13061f90e 100644
--- a/robolectric/src/test/java/org/robolectric/android/BootstrapTest.java
+++ b/robolectric/src/test/java/org/robolectric/android/BootstrapTest.java
@@ -53,7 +53,7 @@ public class BootstrapTest {
     DisplayMetrics displayMetrics = new DisplayMetrics();
     ParallelUniverse parallelUniverse = new ParallelUniverse();
     parallelUniverse.setSdkConfig(new SdkConfig(RuntimeEnvironment.getApiLevel()));
-    String outQualifiers = Bootstrap.applySystemConfiguration("", RuntimeEnvironment.getApiLevel(), configuration, displayMetrics);
+    String outQualifiers = Bootstrap.applyQualifiers("", RuntimeEnvironment.getApiLevel(), configuration, displayMetrics);
 
     assertThat(outQualifiers).isEqualTo("sw320dp-w320dp-v" + RuntimeEnvironment.getApiLevel());
 
@@ -87,7 +87,7 @@ public class BootstrapTest {
     DisplayMetrics displayMetrics = new DisplayMetrics();
     ParallelUniverse parallelUniverse = new ParallelUniverse();
     parallelUniverse.setSdkConfig(new SdkConfig(RuntimeEnvironment.getApiLevel()));
-    String outQualifiers = Bootstrap.applySystemConfiguration(
+    String outQualifiers = Bootstrap.applyQualifiers(
         "mcc310-mnc004-fr-rFR-ldrtl-sw400dp-w480dp-h456dp-xlarge-long-round-land-"
             + "appliance-night-hdpi-notouch-keyshidden-12key-navhidden-dpad",
         RuntimeEnvironment.getApiLevel(), configuration, displayMetrics
@@ -139,7 +139,7 @@ public class BootstrapTest {
     ParallelUniverse parallelUniverse = new ParallelUniverse();
     parallelUniverse.setSdkConfig(new SdkConfig(RuntimeEnvironment.getApiLevel()));
     try {
-      Bootstrap.applySystemConfiguration("notareal-qualifier-sw400dp-w480dp-more-wrong-stuff",
+      Bootstrap.applyQualifiers("notareal-qualifier-sw400dp-w480dp-more-wrong-stuff",
           RuntimeEnvironment.getApiLevel(), new Configuration(), new DisplayMetrics()
       );
       fail("should have thrown");
@@ -154,7 +154,7 @@ public class BootstrapTest {
     ParallelUniverse parallelUniverse = new ParallelUniverse();
     parallelUniverse.setSdkConfig(new SdkConfig(RuntimeEnvironment.getApiLevel()));
     try {
-      Bootstrap.applySystemConfiguration("sw400dp-w480dp-v7",
+      Bootstrap.applyQualifiers("sw400dp-w480dp-v7",
           RuntimeEnvironment.getApiLevel(), new Configuration(), new DisplayMetrics()
       );
       fail("should have thrown");
@@ -171,7 +171,7 @@ public class BootstrapTest {
     DisplayMetrics displayMetrics = new DisplayMetrics();
     ParallelUniverse parallelUniverse = new ParallelUniverse();
     parallelUniverse.setSdkConfig(new SdkConfig(RuntimeEnvironment.getApiLevel()));
-    String outQualifiers = Bootstrap.applySystemConfiguration("hdpi", RuntimeEnvironment.getApiLevel(), configuration, displayMetrics);
+    String outQualifiers = Bootstrap.applyQualifiers("hdpi", RuntimeEnvironment.getApiLevel(), configuration, displayMetrics);
     assertThat(displayMetrics.density).isEqualTo(1.5f);
     assertThat(displayMetrics.densityDpi).isEqualTo(240);
   }
diff --git a/shadows/framework/src/main/java/org/robolectric/android/Bootstrap.java b/shadows/framework/src/main/java/org/robolectric/android/Bootstrap.java
index 52bddc07d..bb006c5b5 100644
--- a/shadows/framework/src/main/java/org/robolectric/android/Bootstrap.java
+++ b/shadows/framework/src/main/java/org/robolectric/android/Bootstrap.java
@@ -14,7 +14,7 @@ import org.robolectric.res.android.ResTable_config;
 public class Bootstrap {
 
   @VisibleForTesting
-  public static String applySystemConfiguration(String qualifiers, int apiLevel,
+  public static String applyQualifiers(String qualifiers, int apiLevel,
       Configuration configuration,
       DisplayMetrics displayMetrics) {
     ConfigDescription configDescription = new ConfigDescription();