1 files changed, 65 insertions, 50 deletions
diff --git a/tests/src/com/android/libraries/entitlement/ServiceEntitlementTest.java b/tests/src/com/android/libraries/entitlement/ServiceEntitlementTest.java
index 4fc2e30..25812a9 100644
--- a/tests/src/com/android/libraries/entitlement/ServiceEntitlementTest.java
+++ b/tests/src/com/android/libraries/entitlement/ServiceEntitlementTest.java
@@ -71,6 +71,11 @@ public class ServiceEntitlementTest {
         mCarrierConfig = CarrierConfig.builder().setServerUrl(TEST_URL).build();
         mServiceEntitlement = new ServiceEntitlement(mCarrierConfig, mMockEapAkaApi);
         mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mMockTelephonyManager);
+        when(mMockTelephonyManager.createForSubscriptionId(SUB_ID))
+                .thenReturn(mMockTelephonyManagerForSubId);
+        when(mMockTelephonyManagerForSubId.getSubscriberId()).thenReturn(IMSI);
+        when(mMockTelephonyManagerForSubId.getSimOperator()).thenReturn(MCCMNC);
     }
 
     @Test
@@ -78,20 +83,16 @@ public class ServiceEntitlementTest {
         CarrierConfig config = CarrierConfig.builder().build();
         ServiceEntitlementRequest request = ServiceEntitlementRequest.builder().build();
         ServiceEntitlement serviceEntitlement = new ServiceEntitlement(mContext, config, SUB_ID);
-        when(mContext.getSystemService(TelephonyManager.class))
-                .thenReturn(mMockTelephonyManager);
-        when(mMockTelephonyManager.createForSubscriptionId(SUB_ID))
-                .thenReturn(mMockTelephonyManagerForSubId);
-        when(mMockTelephonyManagerForSubId.getSubscriberId()).thenReturn(IMSI);
-        when(mMockTelephonyManagerForSubId.getSimOperator()).thenReturn(MCCMNC);
 
-        ServiceEntitlementException exception = expectThrows(
-                ServiceEntitlementException.class,
-                () -> serviceEntitlement.queryEntitlementStatus(
-                        ImmutableList.of(ServiceEntitlement.APP_VOWIFI), request));
+        ServiceEntitlementException exception =
+                expectThrows(
+                        ServiceEntitlementException.class,
+                        () ->
+                                serviceEntitlement.queryEntitlementStatus(
+                                        ImmutableList.of(ServiceEntitlement.APP_VOWIFI), request));
 
-        assertThat(exception.getErrorCode()).isEqualTo(
-                ServiceEntitlementException.ERROR_SERVER_NOT_CONNECTABLE);
+        assertThat(exception.getErrorCode())
+                .isEqualTo(ServiceEntitlementException.ERROR_SERVER_NOT_CONNECTABLE);
         assertThat(exception.getMessage()).isEqualTo("Configure connection failed!");
         assertThat(exception.getHttpStatus()).isEqualTo(0);
         assertThat(exception.getRetryAfter()).isEmpty();
@@ -101,14 +102,16 @@ public class ServiceEntitlementTest {
     public void queryEntitlementStatus_appVolte_returnResult() throws Exception {
         ServiceEntitlementRequest request = ServiceEntitlementRequest.builder().build();
         when(mMockEapAkaApi.queryEntitlementStatus(
-                ImmutableList.of(ServiceEntitlement.APP_VOLTE), mCarrierConfig, request))
-                .thenAnswer(invocation -> {
-                    when(mMockHttpResponse.body()).thenReturn(QUERY_APP_VOLTE_RESULT);
-                    return mMockHttpResponse;
-                });
+                        ImmutableList.of(ServiceEntitlement.APP_VOLTE), mCarrierConfig, request))
+                .thenAnswer(
+                        invocation -> {
+                            when(mMockHttpResponse.body()).thenReturn(QUERY_APP_VOLTE_RESULT);
+                            return mMockHttpResponse;
+                        });
 
         assertThat(
-                mServiceEntitlement.queryEntitlementStatus(ServiceEntitlement.APP_VOLTE, request))
+                        mServiceEntitlement.queryEntitlementStatus(
+                                ServiceEntitlement.APP_VOLTE, request))
                 .isEqualTo(QUERY_APP_VOLTE_RESULT);
     }
 
@@ -116,16 +119,16 @@ public class ServiceEntitlementTest {
     public void queryEntitlementStatus_appVowifi_returnResult() throws Exception {
         ServiceEntitlementRequest request = ServiceEntitlementRequest.builder().build();
         when(mMockEapAkaApi.queryEntitlementStatus(
-                ImmutableList.of(ServiceEntitlement.APP_VOWIFI), mCarrierConfig, request))
-                .thenAnswer(invocation -> {
-                    when(mMockHttpResponse.body()).thenReturn(QUERY_APP_VOWIFI_RESULT);
-                    return mMockHttpResponse;
-                });
+                        ImmutableList.of(ServiceEntitlement.APP_VOWIFI), mCarrierConfig, request))
+                .thenAnswer(
+                        invocation -> {
+                            when(mMockHttpResponse.body()).thenReturn(QUERY_APP_VOWIFI_RESULT);
+                            return mMockHttpResponse;
+                        });
 
         assertThat(
-                mServiceEntitlement.queryEntitlementStatus(
-                        ImmutableList.of(ServiceEntitlement.APP_VOWIFI),
-                        request))
+                        mServiceEntitlement.queryEntitlementStatus(
+                                ImmutableList.of(ServiceEntitlement.APP_VOWIFI), request))
                 .isEqualTo(QUERY_APP_VOWIFI_RESULT);
     }
 
@@ -134,15 +137,20 @@ public class ServiceEntitlementTest {
         ServiceEntitlementRequest request = ServiceEntitlementRequest.builder().build();
         EsimOdsaOperation odsaOperation = EsimOdsaOperation.builder().build();
         when(mMockEapAkaApi.performEsimOdsaOperation(
-                ServiceEntitlement.APP_ODSA_COMPANION, mCarrierConfig, request, odsaOperation))
-                .thenAnswer(invocation -> {
-                    when(mMockHttpResponse.body()).thenReturn(QUERY_APP_ODSA_COMPANION_RESULT);
-                    return mMockHttpResponse;
-                });
+                        ServiceEntitlement.APP_ODSA_COMPANION,
+                        mCarrierConfig,
+                        request,
+                        odsaOperation))
+                .thenAnswer(
+                        invocation -> {
+                            when(mMockHttpResponse.body())
+                                    .thenReturn(QUERY_APP_ODSA_COMPANION_RESULT);
+                            return mMockHttpResponse;
+                        });
 
         assertThat(
-                mServiceEntitlement.performEsimOdsa(
-                        ServiceEntitlement.APP_ODSA_COMPANION, request, odsaOperation))
+                        mServiceEntitlement.performEsimOdsa(
+                                ServiceEntitlement.APP_ODSA_COMPANION, request, odsaOperation))
                 .isEqualTo(QUERY_APP_ODSA_COMPANION_RESULT);
     }
 
@@ -151,15 +159,20 @@ public class ServiceEntitlementTest {
         ServiceEntitlementRequest request = ServiceEntitlementRequest.builder().build();
         EsimOdsaOperation odsaOperation = EsimOdsaOperation.builder().build();
         when(mMockEapAkaApi.performEsimOdsaOperation(
-                ServiceEntitlement.APP_ODSA_PRIMARY, mCarrierConfig, request, odsaOperation))
-                .thenAnswer(invocation -> {
-                    when(mMockHttpResponse.body()).thenReturn(QUERY_APP_ODSA_PRIMARY_RESULT);
-                    return mMockHttpResponse;
-                });
+                        ServiceEntitlement.APP_ODSA_PRIMARY,
+                        mCarrierConfig,
+                        request,
+                        odsaOperation))
+                .thenAnswer(
+                        invocation -> {
+                            when(mMockHttpResponse.body())
+                                    .thenReturn(QUERY_APP_ODSA_PRIMARY_RESULT);
+                            return mMockHttpResponse;
+                        });
 
         assertThat(
-                mServiceEntitlement.performEsimOdsa(
-                        ServiceEntitlement.APP_ODSA_PRIMARY, request, odsaOperation))
+                        mServiceEntitlement.performEsimOdsa(
+                                ServiceEntitlement.APP_ODSA_PRIMARY, request, odsaOperation))
                 .isEqualTo(QUERY_APP_ODSA_PRIMARY_RESULT);
     }
 
@@ -167,27 +180,29 @@ public class ServiceEntitlementTest {
     public void acquireOidcAuthenticationEndpoint_returnResult() throws Exception {
         ServiceEntitlementRequest request = ServiceEntitlementRequest.builder().build();
         when(mMockEapAkaApi.acquireOidcAuthenticationEndpoint(
-                ServiceEntitlement.APP_ODSA_COMPANION, mCarrierConfig, request))
+                        ServiceEntitlement.APP_ODSA_COMPANION, mCarrierConfig, request))
                 .thenReturn(QUERY_OIDC_RESULT);
 
         assertThat(
-                mServiceEntitlement.acquireOidcAuthenticationEndpoint(
-                        ServiceEntitlement.APP_ODSA_COMPANION, request))
+                        mServiceEntitlement.acquireOidcAuthenticationEndpoint(
+                                ServiceEntitlement.APP_ODSA_COMPANION, request))
                 .isEqualTo(QUERY_OIDC_RESULT);
     }
 
     @Test
     public void queryEntitlementStatusFromOidc_returnResult() throws Exception {
         when(mMockEapAkaApi.queryEntitlementStatusFromOidc(
-                ServiceEntitlement.APP_ODSA_PRIMARY, mCarrierConfig, null))
-                .thenAnswer(invocation -> {
-                    when(mMockHttpResponse.body()).thenReturn(QUERY_ENTITLEMENT_STATUS_FROM_OIDC);
-                    return mMockHttpResponse;
-                });
+                        ServiceEntitlement.APP_ODSA_PRIMARY, mCarrierConfig, null))
+                .thenAnswer(
+                        invocation -> {
+                            when(mMockHttpResponse.body())
+                                    .thenReturn(QUERY_ENTITLEMENT_STATUS_FROM_OIDC);
+                            return mMockHttpResponse;
+                        });
 
         assertThat(
-                mServiceEntitlement.queryEntitlementStatusFromOidc(
-                        ServiceEntitlement.APP_ODSA_PRIMARY))
+                        mServiceEntitlement.queryEntitlementStatusFromOidc(
+                                ServiceEntitlement.APP_ODSA_PRIMARY))
                 .isEqualTo(QUERY_ENTITLEMENT_STATUS_FROM_OIDC);
     }
 }