Merge pull request #1481 from AzureAD/adjoh/update-mockito

Common 3.5.0
AzureAD · Jul 27, 2021 · a16f83e · a16f83e
2 parents faaabbe + 5d0d966
commit a16f83e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/common/versioning/version.properties b/common/versioning/version.properties
@@ -1,4 +1,4 @@
 #Tue Apr 06 22:55:08 UTC 2021
-versionName=3.5.0-RC2
+versionName=3.5.0
 versionCode=1
 latestPatchVersion=180
diff --git a/testutils/build.gradle b/testutils/build.gradle
@@ -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"

diff --git a/testutils/src/main/java/com/microsoft/identity/internal/testutils/TestUtils.java b/testutils/src/main/java/com/microsoft/identity/internal/testutils/TestUtils.java
@@ -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 {
@@ -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.
      *