Merge pull request #1501 from AzureAD/release/2.2.0

Merge 2.2.0 to master for release

Author: Brian Melton-Grace

changelog

@@ -1,4 +1,9 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
+
+Version 2.2.0
+----------
+- Picks up [email protected]
+
 Version 2.1.0
 ----------
 - Picks up [email protected]

common

@@ -274,9 +274,9 @@ dependencies {
         transitive = false
     }
 
-    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '3.4.4', changing: true)
+    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '3.6.0', changing: true)
 
-    distApi("com.microsoft.identity:common:3.4.4") {
+    distApi("com.microsoft.identity:common:3.6.0") {
         transitive = false
     }
 }

msal/build.gradle

@@ -43,6 +43,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
 
 import java.io.File;
@@ -62,7 +63,8 @@ public class CommandParametersTest {
     @Before
     public void setup() {
         mContext = ApplicationProvider.getApplicationContext();
-        mActivity = TestUtils.getMockActivity(mContext);
+        mActivity = Mockito.mock(Activity.class);
+        Mockito.when(mActivity.getApplicationContext()).thenReturn(mContext);
     }
 
 

msal/src/test/java/com/microsoft/identity/client/CommandParametersTest.java

@@ -34,6 +34,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.robolectric.ParameterizedRobolectricTestRunner;
 
 import java.util.Arrays;
@@ -78,7 +79,8 @@ public static Collection<Object[]> data() {
     @Before
     public void setup() {
         mContext = ApplicationProvider.getApplicationContext();
-        mActivity = TestUtils.getMockActivity(mContext);
+        mActivity = Mockito.mock(Activity.class);
+        Mockito.when(mActivity.getApplicationContext()).thenReturn(mContext);
     }
 
     @Test

msal/src/test/java/com/microsoft/identity/client/TokenParametersAuthorityMyOrgTest.java

@@ -34,6 +34,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.robolectric.ParameterizedRobolectricTestRunner;
 
 import java.util.Arrays;
@@ -90,7 +91,8 @@ public static Collection<Object[]> data() {
     @Before
     public void setup() {
         mContext = ApplicationProvider.getApplicationContext();
-        mActivity = TestUtils.getMockActivity(mContext);
+        mActivity = Mockito.mock(Activity.class);
+        Mockito.when(mActivity.getApplicationContext()).thenReturn(mContext);
     }
 
     @Test

msal/src/test/java/com/microsoft/identity/client/TokenParametersAuthorityTest.java

@@ -32,9 +32,9 @@
 import com.microsoft.identity.client.PublicClientApplication;
 import com.microsoft.identity.client.exception.MsalException;
 import com.microsoft.identity.common.internal.controllers.CommandDispatcherHelper;
-import com.microsoft.identity.internal.testutils.TestUtils;
 
 import org.junit.Before;
+import org.mockito.Mockito;
 
 import java.io.File;
 
@@ -52,7 +52,8 @@ public abstract class PublicClientApplicationAbstractTest implements IPublicClie
     @Before
     public void setup() {
         mContext = ApplicationProvider.getApplicationContext();
-        mActivity = TestUtils.getMockActivity(mContext);
+        mActivity = Mockito.mock(Activity.class);
+        Mockito.when(mActivity.getApplicationContext()).thenReturn(mContext);
         setupPCA();
         Logger.getInstance().setEnableLogcatLog(true);
         Logger.getInstance().setEnablePII(true);

msal/src/test/java/com/microsoft/identity/client/e2e/tests/PublicClientApplicationAbstractTest.java

@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=2.1.0
+versionName=2.2.0
 versionCode=0