Better usage of test helpers

Author: Avery-Dunn

msal4j-sdk/src/integrationtest/java/com/microsoft/aad/msal4j/AcquireTokenSilentIT.java

@@ -107,8 +107,7 @@ void acquireTokenSilent_ConfidentialClient_acquireTokenSilent() throws Exception
                 .build())
                 .get();
 
-        assertNotNull(result);
-        assertNotNull(result.accessToken());
+        IntegrationTestHelper.assertAccessTokenNotNull(result);
 
         String cachedAt = result.accessToken();
 
@@ -133,8 +132,7 @@ void acquireTokenSilent_ConfidentialClient_acquireTokenSilentDifferentScopeThrow
                 .build())
                 .get();
 
-        assertNotNull(result);
-        assertNotNull(result.accessToken());
+        IntegrationTestHelper.assertAccessTokenNotNull(result);
 
         //Acquiring token for different scope, expect exception to be thrown
         assertThrows(ExecutionException.class, () -> cca.acquireTokenSilently(SilentParameters

msal4j-sdk/src/integrationtest/java/com/microsoft/aad/msal4j/ClientCredentialsIT.java

@@ -75,8 +75,7 @@ void acquireTokenClientCredentials_Certificate_CiamCud() throws Exception {
                         .build())
                 .get();
 
-        assertNotNull(result);
-        assertNotNull(result.accessToken());
+        IntegrationTestHelper.assertAccessTokenNotNull(result);
     }
 
     @Test
@@ -117,8 +116,7 @@ void acquireTokenClientCredentials_DefaultCacheLookup() throws Exception {
                 .build())
                 .get();
 
-        assertNotNull(result1);
-        assertNotNull(result1.accessToken());
+        IntegrationTestHelper.assertAccessTokenNotNull(result1);
 
         IAuthenticationResult result2 = cca.acquireToken(ClientCredentialParameters
                 .builder(Collections.singleton(KEYVAULT_DEFAULT_SCOPE))
@@ -133,8 +131,7 @@ void acquireTokenClientCredentials_DefaultCacheLookup() throws Exception {
                 .build())
                 .get();
 
-        assertNotNull(result3);
-        assertNotNull(result3.accessToken());
+        IntegrationTestHelper.assertAccessTokenNotNull(result3);
         assertNotEquals(result2.accessToken(), result3.accessToken());
     }
 
@@ -164,8 +161,7 @@ private void assertAcquireTokenCommon(String clientId, IClientCredential credent
                 .build())
                 .get();
 
-        assertNotNull(result);
-        assertNotNull(result.accessToken());
+        IntegrationTestHelper.assertAccessTokenNotNull(result);
     }
 
     private void assertAcquireTokenCommon_withParameters(AppConfig app, IClientCredential credential, IClientCredential credentialParam) throws Exception {
@@ -180,8 +176,7 @@ private void assertAcquireTokenCommon_withParameters(AppConfig app, IClientCrede
                 .build())
                 .get();
 
-        assertNotNull(result);
-        assertNotNull(result.accessToken());
+        IntegrationTestHelper.assertAccessTokenNotNull(result);
     }
 
     private void assertAcquireTokenCommon_withRegion(AppConfig app, IClientCredential credential, String region, String regionalAuthority) throws Exception {
@@ -202,8 +197,7 @@ private void assertAcquireTokenCommon_withRegion(AppConfig app, IClientCredentia
                 .build())
                 .get();
 
-        assertNotNull(resultNoRegion);
-        assertNotNull(resultNoRegion.accessToken());
+        IntegrationTestHelper.assertAccessTokenNotNull(resultNoRegion);
         assertEquals(TestConstants.MICROSOFT_AUTHORITY_BASIC_HOST, resultNoRegion.environment());
 
         //Ensure regional tokens are properly cached and retrievable
@@ -212,17 +206,15 @@ private void assertAcquireTokenCommon_withRegion(AppConfig app, IClientCredentia
                 .build())
                 .get();
 
-        assertNotNull(resultRegion);
-        assertNotNull(resultRegion.accessToken());
-        assertEquals(resultRegion.environment(), regionalAuthority);
+        IntegrationTestHelper.assertAccessTokenNotNull(resultRegion);
+        assertEquals(regionalAuthority, resultRegion.environment());
 
         IAuthenticationResult resultRegionCached = ccaRegion.acquireToken(ClientCredentialParameters
                 .builder(Collections.singleton(KEYVAULT_DEFAULT_SCOPE))
                 .build())
                 .get();
 
-        assertNotNull(resultRegionCached);
-        assertNotNull(resultRegionCached.accessToken());
+        IntegrationTestHelper.assertAccessTokenNotNull(resultRegionCached);
         assertEquals(resultRegionCached.accessToken(), resultRegion.accessToken());
 
         //Tokens retrieved from regional endpoints should be interchangeable with non-regional, and vice-versa
@@ -233,8 +225,7 @@ private void assertAcquireTokenCommon_withRegion(AppConfig app, IClientCredentia
                 .build())
                 .get();
 
-        assertNotNull(resultNoRegion);
-        assertNotNull(resultNoRegion.accessToken());
+        IntegrationTestHelper.assertAccessTokenNotNull(resultNoRegion);
         assertEquals(resultNoRegion.accessToken(), resultRegion.accessToken());
     }
 }