separated b2c and adfs tests

Author: siddhijain

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

@@ -32,13 +32,6 @@ private static Object[][] getAadClouds(){
         };
     }
 
-    @DataProvider(name = "b2cAdfsClouds")
-    private static Object[][] getNonAadClouds(){
-        return new Object[][] {{"https://contoso.com/adfs"},//ADFS
-//                {"https://login.b2clogin.com/contoso/b2c_policy"}//B2C
-        };
-    }
-
     /**
      * when instance_discovery flag is set to true (by default), an instance_discovery is performed for authorityType = AAD
      */
@@ -47,8 +40,7 @@ public void aadInstanceDiscoveryTrue(String authority) throws Exception{
         app = PowerMock.createPartialMock(PublicClientApplication.class,
                 new String[]{"acquireTokenCommon"},
                 PublicClientApplication.builder(TestConfiguration.AAD_CLIENT_ID)
-                        .authority(authority)
-                        .instanceDiscovery(true));
+                        .authority(authority));
 
         Capture<MsalRequest> capturedMsalRequest = Capture.newInstance();
 
@@ -90,14 +82,64 @@ public void aadInstanceDiscoveryTrue(String authority) throws Exception{
     }
 
     /**
-     * when instance_discovery flag is set to true (by default), an instance_discovery is NOT performed for b2c.
+     * when instance_discovery flag is set to false, instance_discovery is not performed
      */
-    @Test(  dataProvider = "b2cAdfsClouds")
-    public void b2cAdfsInstanceDiscoveryTrue(String authority) throws Exception{
+    @Test (dataProvider = "aadClouds")
+    public void aadInstanceDiscoveryFalse(String authority) throws Exception {
+
         app = PowerMock.createPartialMock(PublicClientApplication.class,
                 new String[]{"acquireTokenCommon"},
-                PublicClientApplication.builder(TestConstants.ADFS_APP_ID)
+                PublicClientApplication.builder(TestConfiguration.AAD_CLIENT_ID)
                         .authority(authority)
+                        .instanceDiscovery(false));
+
+        Capture<MsalRequest> capturedMsalRequest = Capture.newInstance();
+
+        PowerMock.expectPrivate(app, "acquireTokenCommon",
+                EasyMock.capture(capturedMsalRequest), EasyMock.isA(AADAuthority.class)).andReturn(
+                AuthenticationResult.builder().
+                        accessToken("accessToken").
+                        expiresOn(new Date().getTime() + 100).
+                        refreshToken("refreshToken").
+                        idToken("idToken").environment("environment").build());
+
+        PowerMock.mockStatic(HttpHelper.class);
+
+        HttpResponse instanceDiscoveryResponse = new HttpResponse();
+        instanceDiscoveryResponse.statusCode(200);
+        instanceDiscoveryResponse.body(TestConfiguration.INSTANCE_DISCOVERY_RESPONSE);
+
+        Capture<HttpRequest> capturedHttpRequest = Capture.newInstance();
+
+        EasyMock.expect(
+                        HttpHelper.executeHttpRequest(
+                                EasyMock.capture(capturedHttpRequest),
+                                EasyMock.isA(RequestContext.class),
+                                EasyMock.isA(ServiceBundle.class)))
+                .andReturn(instanceDiscoveryResponse);
+
+        PowerMock.replay(HttpHelper.class, HttpResponse.class);
+
+        CompletableFuture<IAuthenticationResult> completableFuture = app.acquireToken(
+                AuthorizationCodeParameters.builder
+                                ("auth_code",
+                                        new URI(TestConfiguration.AAD_DEFAULT_REDIRECT_URI))
+                        .scopes(Collections.singleton("default-scope"))
+                        .build());
+
+        completableFuture.get();
+        Assert.assertEquals(capturedHttpRequest.getValues().size(),0);
+    }
+
+    /**
+     * when instance_discovery flag is set to true (by default), an instance_discovery is NOT performed for adfs.
+     */
+    @Test
+    public void adfsInstanceDiscoveryTrue() throws Exception{
+        app = PowerMock.createPartialMock(PublicClientApplication.class,
+                new String[]{"acquireTokenCommon"},
+                PublicClientApplication.builder(TestConstants.ADFS_APP_ID)
+                        .authority("https://contoso.com/adfs")
                         .instanceDiscovery(true));
 
         Capture<MsalRequest> capturedMsalRequest = Capture.newInstance();
@@ -140,16 +182,15 @@ public void b2cAdfsInstanceDiscoveryTrue(String authority) throws Exception{
     }
 
     /**
-     * when instance_discovery flag is set to false, instance_discovery is not performed
+     * when instance_discovery flag is set to true (by default), an instance_discovery is NOT performed for b2c.
      */
-    @Test (dataProvider = "aadClouds")
-    public void aadInstanceDiscoveryFalse(String authority) throws Exception {
-
+    @Test
+    public void b2cInstanceDiscoveryTrue() throws Exception{
         app = PowerMock.createPartialMock(PublicClientApplication.class,
                 new String[]{"acquireTokenCommon"},
-                PublicClientApplication.builder(TestConfiguration.AAD_CLIENT_ID)
-                        .authority(authority)
-                        .instanceDiscovery(false));
+                PublicClientApplication.builder(TestConstants.ADFS_APP_ID)
+                        .b2cAuthority(TestConstants.B2C_MICROSOFTLOGIN_ROPC)
+                        .instanceDiscovery(true));
 
         Capture<MsalRequest> capturedMsalRequest = Capture.newInstance();
 
@@ -187,5 +228,8 @@ public void aadInstanceDiscoveryFalse(String authority) throws Exception {
 
         completableFuture.get();
         Assert.assertEquals(capturedHttpRequest.getValues().size(),0);
+
     }
+
+
 }

msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/AadInstanceDiscoveryTest.java

@@ -4,7 +4,6 @@
 package com.microsoft.aad.msal4j;
 
 import org.powermock.api.easymock.PowerMock;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.Assert;
@@ -14,7 +13,6 @@
 import java.net.URI;
 import java.net.URL;
 
-@PowerMockIgnore({"javax.net.ssl.*"})
 @PrepareForTest({AadInstanceDiscoveryProvider.class})
 public class AadInstanceDiscoveryTest extends PowerMockTestCase {
 
@@ -188,5 +186,4 @@ public void aadInstanceDiscoveryTest_AutoDetectRegion_NoRegionDetected() throws
         Assert.assertTrue(entry.aliases().contains("login.microsoft.com"));
         Assert.assertTrue(entry.aliases().contains("sts.windows.net"));
     }
-
 }