From 1a1ec50ea96bba9915a2c46946a83cc67d0643fe Mon Sep 17 00:00:00 2001
From: Herman Liang <hermanliang80@gmail.com>
Date: Fri, 17 Mar 2017 22:12:20 +0800
Subject: [PATCH] replace deprecated code & minor optimization

---
 .../java/com/parse/ParseClientConfigurationTest.java  | 10 +---------
 .../test/java/com/parse/ParseInstallationTest.java    | 11 ++---------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Parse/src/test/java/com/parse/ParseClientConfigurationTest.java b/Parse/src/test/java/com/parse/ParseClientConfigurationTest.java
index 1f6e37857..9f365c43b 100644
--- a/Parse/src/test/java/com/parse/ParseClientConfigurationTest.java
+++ b/Parse/src/test/java/com/parse/ParseClientConfigurationTest.java
@@ -8,8 +8,6 @@
  */
 package com.parse;
 
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 
 import com.parse.http.ParseNetworkInterceptor;
@@ -19,7 +17,6 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -34,7 +31,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class)
@@ -188,11 +184,7 @@ private void verifyMockMetaData(Bundle metaData) throws Exception {
 
   private Bundle setupMockMetaData() throws Exception {
     Bundle metaData = mock(Bundle.class);
-    ShadowPackageManager packageManager = shadowOf(RuntimeEnvironment.application.getPackageManager());
-    ApplicationInfo info = packageManager.getApplicationInfo(
-        RuntimeEnvironment.application.getPackageName(),
-        PackageManager.GET_META_DATA);
-    info.metaData = metaData;
+    RuntimeEnvironment.application.getApplicationInfo().metaData = metaData;
     return metaData;
   }
 
diff --git a/Parse/src/test/java/com/parse/ParseInstallationTest.java b/Parse/src/test/java/com/parse/ParseInstallationTest.java
index ecb3e5748..8bda7e9b9 100644
--- a/Parse/src/test/java/com/parse/ParseInstallationTest.java
+++ b/Parse/src/test/java/com/parse/ParseInstallationTest.java
@@ -9,7 +9,6 @@
 package com.parse;
 
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 
@@ -20,7 +19,6 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.res.builder.RobolectricPackageManager;
 
 import java.util.Arrays;
 import java.util.Locale;
@@ -34,9 +32,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -334,11 +330,8 @@ private static void mocksForUpdateBeforeSave() {
             mock(ParseCurrentInstallationController.class);
     when(controller.isCurrent(any(ParseInstallation.class))).thenReturn(true);
     ParseCorePlugins.getInstance().registerCurrentInstallationController(controller);
-    // Mock package manager
-    RobolectricPackageManager packageManager =
-            spy(RuntimeEnvironment.getRobolectricPackageManager());
-    doReturn("parseTest").when(packageManager).getApplicationLabel(any(ApplicationInfo.class));
-    RuntimeEnvironment.setRobolectricPackageManager(packageManager);
+    // Mock App Name
+    RuntimeEnvironment.application.getApplicationInfo().name = "parseTest";
     ParsePlugins.Android plugins = mock(ParsePlugins.Android.class);
     // Mock installationId
     InstallationId installationId = mock(InstallationId.class);