Skip to content

Robolectric: replace deprecated code & minor optimization #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2017
Merged

Robolectric: replace deprecated code & minor optimization #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions Parse/src/test/java/com/parse/ParseClientConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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)
Expand Down Expand Up @@ -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;
}

Expand Down
11 changes: 2 additions & 9 deletions Parse/src/test/java/com/parse/ParseInstallationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down