Fixed the remaining failing errors

Author: pmathew92

auth0/src/test/java/com/auth0/android/authentication/request/ProfileRequestTest.java

@@ -1,12 +1,26 @@
 package com.auth0.android.authentication.request;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import com.auth0.android.authentication.AuthenticationException;
 import com.auth0.android.callback.Callback;
 import com.auth0.android.request.AuthenticationRequest;
+import com.auth0.android.request.HttpMethod;
 import com.auth0.android.request.ProfileRequest;
 import com.auth0.android.request.Request;
 import com.auth0.android.result.Authentication;
 import com.auth0.android.result.Credentials;
+import com.auth0.android.result.CredentialsMock;
 import com.auth0.android.result.UserProfile;
 
 import org.junit.Before;
@@ -15,30 +29,23 @@
 import org.mockito.ArgumentCaptor;
 import org.robolectric.RobolectricTestRunner;
 
+import java.util.Date;
 import java.util.Map;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(RobolectricTestRunner.class)
 public class ProfileRequestTest {
 
     private AuthenticationRequest authenticationMockRequest;
     private Request userInfoMockRequest;
     private ProfileRequest profileRequest;
 
+    private Credentials dummyCredentials = CredentialsMock.Companion.create("idToken", "accessToken", "Bearer", null, new Date(), null);
+
     @Before
     public void setUp() {
         userInfoMockRequest = mock(Request.class);
+        when(userInfoMockRequest.getHttpMethod()).thenReturn(HttpMethod.GET.INSTANCE);
+        when(userInfoMockRequest.getUrl()).thenReturn("www.api.com/example");
         authenticationMockRequest = mock(AuthenticationRequest.class);
         profileRequest = new ProfileRequest(authenticationMockRequest, userInfoMockRequest);
     }
@@ -87,7 +94,7 @@ public void shouldSetConnection() {
     @Test
     public void shouldReturnAuthenticationAfterStartingTheRequest() {
         final UserProfile userProfile = mock(UserProfile.class);
-        final Credentials credentials = mock(Credentials.class);
+        final Credentials credentials = dummyCredentials;
 
         final AuthenticationRequestMock authenticationRequestMock = new AuthenticationRequestMock(credentials, null);
         final RequestMock tokenInfoRequestMock = new RequestMock(userProfile, null);
@@ -130,7 +137,7 @@ public void shouldReturnErrorAfterStartingTheRequestIfAuthenticationRequestFails
 
     @Test
     public void shouldReturnErrorAfterStartingTheRequestIfTokenInfoRequestFails() {
-        final Credentials credentials = mock(Credentials.class);
+        final Credentials credentials = dummyCredentials;
         final AuthenticationException error = mock(AuthenticationException.class);
 
         final AuthenticationRequestMock authenticationRequestMock = new AuthenticationRequestMock(credentials, null);
@@ -148,7 +155,7 @@ public void shouldReturnErrorAfterStartingTheRequestIfTokenInfoRequestFails() {
 
     @Test
     public void shouldExecuteTheRequest() {
-        final Credentials credentials = mock(Credentials.class);
+        final Credentials credentials = dummyCredentials;
         when(authenticationMockRequest.execute()).thenAnswer(invocation -> credentials);
         final UserProfile userProfile = mock(UserProfile.class);
         when(userInfoMockRequest.addParameter(anyString(), anyString())).thenReturn(userInfoMockRequest);

auth0/src/test/java/com/auth0/android/dpop/DPoPProviderTest.kt

@@ -339,7 +339,7 @@ public class DPoPProviderTest {
 
     @Test
     public fun `isNonceRequiredError should return true for 400 response with nonce required error`() {
-        whenever(mockResponse.body).thenReturn("{\"error\":\"use_dpop_nonce\"}".toResponseBody())
+        whenever(mockResponse.peekBody(Long.MAX_VALUE)).thenReturn("{\"error\":\"use_dpop_nonce\"}".toResponseBody())
         whenever(mockResponse.code).thenReturn(400)
 
         val result = DPoPProvider.isNonceRequiredError(mockResponse)
@@ -358,7 +358,7 @@ public class DPoPProviderTest {
 
     @Test
     public fun `isNonceRequiredError should return false for 400 response with different error`() {
-        whenever(mockResponse.body).thenReturn("{\"error\":\"different_error\"}".toResponseBody())
+        whenever(mockResponse.peekBody(Long.MAX_VALUE)).thenReturn("{\"error\":\"different_error\"}".toResponseBody())
         whenever(mockResponse.code).thenReturn(400)
 
         val result = DPoPProvider.isNonceRequiredError(mockResponse)

auth0/src/test/java/com/auth0/android/provider/WebAuthProviderTest.kt

@@ -9,6 +9,8 @@ import androidx.test.espresso.intent.matcher.UriMatchers
 import com.auth0.android.Auth0
 import com.auth0.android.authentication.AuthenticationException
 import com.auth0.android.callback.Callback
+import com.auth0.android.dpop.DPoPKeyStore
+import com.auth0.android.dpop.DPoPProvider
 import com.auth0.android.provider.WebAuthProvider.login
 import com.auth0.android.provider.WebAuthProvider.logout
 import com.auth0.android.provider.WebAuthProvider.resume
@@ -65,6 +67,7 @@ public class WebAuthProviderTest {
     private lateinit var voidCallback: Callback<Void?, AuthenticationException>
     private lateinit var activity: Activity
     private lateinit var account: Auth0
+    private lateinit var mockKeyStore: DPoPKeyStore
 
     private val authExceptionCaptor: KArgumentCaptor<AuthenticationException> = argumentCaptor()
     private val intentCaptor: KArgumentCaptor<Intent> = argumentCaptor()
@@ -83,6 +86,10 @@ public class WebAuthProviderTest {
             Auth0.getInstance(JwtTestUtils.EXPECTED_AUDIENCE, JwtTestUtils.EXPECTED_BASE_DOMAIN)
         account.networkingClient = SSLTestUtils.testClient
 
+        mockKeyStore = mock()
+
+        DPoPProvider.keyStore = mockKeyStore
+
         //Next line is needed to avoid CustomTabService from being bound to Test environment
         Mockito.doReturn(false).`when`(activity).bindService(
             any(),
@@ -95,8 +102,11 @@ public class WebAuthProviderTest {
             null,
             null
         )
+
+        `when`(mockKeyStore.hasKeyPair()).thenReturn(false)
     }
 
+
     //** ** ** ** ** **  **//
     //** ** ** ** ** **  **//
     //** LOG IN  FEATURE **//
@@ -107,6 +117,7 @@ public class WebAuthProviderTest {
         login(account)
             .start(activity, callback)
         Assert.assertNotNull(WebAuthProvider.managerInstance)
+
     }
 
     @Test

auth0/src/test/java/com/auth0/android/request/DefaultClientTest.kt

@@ -82,15 +82,15 @@ public class DefaultClientTest {
 
     @Test
     public fun shouldHaveLoggingDisabledByDefault() {
-        assertThat(DefaultClient().okHttpClient.interceptors, empty())
+        assertThat(DefaultClient().okHttpClient.interceptors, hasSize(1))
     }
 
     @Test
     public fun shouldHaveLoggingEnabledIfSpecified() {
         val netClient = DefaultClient(enableLogging = true)
-        assertThat(netClient.okHttpClient.interceptors, hasSize(1))
+        assertThat(netClient.okHttpClient.interceptors, hasSize(2))
 
-        val interceptor: Interceptor = netClient.okHttpClient.interceptors[0]
+        val interceptor: Interceptor = netClient.okHttpClient.interceptors[1]
         assertThat(
             (interceptor as HttpLoggingInterceptor).level,
             equalTo(HttpLoggingInterceptor.Level.BODY)