Skip to content
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

Jump to bottom

Remove mockito dependency. #1480

Closed
wants to merge 2 commits into from
Closed

Remove mockito dependency. #1480

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4142544
Remove mockito dependency as RC3
AdamBJohnsonx Jul 26, 2021
5d0d966
Update common/versioning/version.properties
AdamBJohnsonx Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/versioning/version.properties
View file
Open in desktop
@@ -1,4 +1,4 @@
#Tue Apr 06 22:55:08 UTC 2021
versionName=3.5.0-RC2
versionName=3.5.0-RC3
AdamBJohnsonx marked this conversation as resolved.
Show resolved Hide resolved
versionCode=1
latestPatchVersion=180
1 change: 0 additions & 1 deletion testutils/build.gradle
View file
Open in desktop
Expand Up @@ -191,7 +191,6 @@ dependencies {
implementation(group: 'com.microsoft.identity', name: 'labapi', version: '0.0.+')
}

implementation "org.mockito:mockito-inline:$rootProject.ext.mockitoCoreVersion"
implementation "androidx.test:core:$rootProject.ext.androidxTestCoreVersion"
implementation "com.google.code.gson:gson:$rootProject.ext.gsonVersion"
implementation "com.nimbusds:nimbus-jose-jwt:$rootProject.ext.nimbusVersion"
Expand Down
9 changes: 0 additions & 9 deletions testutils/src/main/java/com/microsoft/identity/internal/testutils/TestUtils.java
View file
Open in desktop
Expand Up @@ -34,8 +34,6 @@
import com.microsoft.identity.common.internal.cache.SharedPreferencesFileManager;
import com.microsoft.identity.common.internal.dto.CredentialType;

import org.mockito.Mockito;

import java.util.Map;

public class TestUtils {
Expand Down Expand Up @@ -67,13 +65,6 @@ public static SharedPreferencesFileManager getSharedPreferences(final String sha
return SharedPreferencesFileManager.getSharedPreferences(context, sharedPrefName, null);
}

public static Activity getMockActivity(final Context context) {
final Activity mockedActivity = Mockito.mock(Activity.class);
Mockito.when(mockedActivity.getApplicationContext()).thenReturn(context);

return mockedActivity;
}

/**
* Return a SharedPreferences instance that works with stores containing encrypted values.
*
Expand Down