Skip to content

Commit 38b1e29

Browse files
hermanliangrogerhu
authored andcommitted
replace deprecated code & minor optimization (#629)
1 parent d66c5a3 commit 38b1e29

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

Parse/src/test/java/com/parse/ParseClientConfigurationTest.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
*/
99
package com.parse;
1010

11-
import android.content.pm.ApplicationInfo;
12-
import android.content.pm.PackageManager;
1311
import android.os.Bundle;
1412

1513
import com.parse.http.ParseNetworkInterceptor;
@@ -19,7 +17,6 @@
1917
import org.robolectric.RobolectricTestRunner;
2018
import org.robolectric.RuntimeEnvironment;
2119
import org.robolectric.annotation.Config;
22-
import org.robolectric.shadows.ShadowPackageManager;
2320

2421
import java.net.URL;
2522
import java.util.ArrayList;
@@ -34,7 +31,6 @@
3431
import static org.mockito.Mockito.mock;
3532
import static org.mockito.Mockito.verify;
3633
import static org.mockito.Mockito.when;
37-
import static org.robolectric.Shadows.shadowOf;
3834

3935
@RunWith(RobolectricTestRunner.class)
4036
@Config(constants = BuildConfig.class)
@@ -188,11 +184,7 @@ private void verifyMockMetaData(Bundle metaData) throws Exception {
188184

189185
private Bundle setupMockMetaData() throws Exception {
190186
Bundle metaData = mock(Bundle.class);
191-
ShadowPackageManager packageManager = shadowOf(RuntimeEnvironment.application.getPackageManager());
192-
ApplicationInfo info = packageManager.getApplicationInfo(
193-
RuntimeEnvironment.application.getPackageName(),
194-
PackageManager.GET_META_DATA);
195-
info.metaData = metaData;
187+
RuntimeEnvironment.application.getApplicationInfo().metaData = metaData;
196188
return metaData;
197189
}
198190

Parse/src/test/java/com/parse/ParseInstallationTest.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
package com.parse;
1010

1111
import android.content.Context;
12-
import android.content.pm.ApplicationInfo;
1312
import android.content.pm.PackageInfo;
1413
import android.content.pm.PackageManager;
1514

@@ -20,7 +19,6 @@
2019
import org.robolectric.RobolectricTestRunner;
2120
import org.robolectric.RuntimeEnvironment;
2221
import org.robolectric.annotation.Config;
23-
import org.robolectric.res.builder.RobolectricPackageManager;
2422

2523
import java.util.Arrays;
2624
import java.util.Locale;
@@ -34,9 +32,7 @@
3432
import static org.junit.Assert.assertTrue;
3533
import static org.mockito.Matchers.any;
3634
import static org.mockito.Matchers.eq;
37-
import static org.mockito.Mockito.doReturn;
3835
import static org.mockito.Mockito.mock;
39-
import static org.mockito.Mockito.spy;
4036
import static org.mockito.Mockito.times;
4137
import static org.mockito.Mockito.verify;
4238
import static org.mockito.Mockito.when;
@@ -334,11 +330,8 @@ private static void mocksForUpdateBeforeSave() {
334330
mock(ParseCurrentInstallationController.class);
335331
when(controller.isCurrent(any(ParseInstallation.class))).thenReturn(true);
336332
ParseCorePlugins.getInstance().registerCurrentInstallationController(controller);
337-
// Mock package manager
338-
RobolectricPackageManager packageManager =
339-
spy(RuntimeEnvironment.getRobolectricPackageManager());
340-
doReturn("parseTest").when(packageManager).getApplicationLabel(any(ApplicationInfo.class));
341-
RuntimeEnvironment.setRobolectricPackageManager(packageManager);
333+
// Mock App Name
334+
RuntimeEnvironment.application.getApplicationInfo().name = "parseTest";
342335
ParsePlugins.Android plugins = mock(ParsePlugins.Android.class);
343336
// Mock installationId
344337
InstallationId installationId = mock(InstallationId.class);

0 commit comments

Comments
 (0)