Remove ADFS v2 and v3 tests

Author: Avery-Dunn

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

@@ -80,24 +80,6 @@ void acquireTokenInteractive_ADFSv4_Federated(String environment) {
         assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope());
     }
 
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    void acquireTokenInteractive_ADFSv3_Federated(String environment) {
-        cfg = new Config(environment);
-
-        User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_3);
-        assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope());
-    }
-
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    void acquireTokenInteractive_ADFSv2_Federated(String environment) {
-        cfg = new Config(environment);
-
-        User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_2);
-        assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope());
-    }
-
     @ParameterizedTest
     @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
     void acquireTokenWithAuthorizationCode_B2C_Local(String environment) {

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

@@ -81,24 +81,6 @@ public void acquireTokenWithAuthorizationCode_ADFSv4_Federated(String environmen
         assertAcquireTokenAAD(user, null);
     }
 
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    public void acquireTokenWithAuthorizationCode_ADFSv3_Federated(String environment) {
-        cfg = new Config(environment);
-
-        User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_3);
-        assertAcquireTokenAAD(user, null);
-    }
-
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    public void acquireTokenWithAuthorizationCode_ADFSv2_Federated(String environment) {
-        cfg = new Config(environment);
-
-        User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_2);
-        assertAcquireTokenAAD(user, null);
-    }
-
     @ParameterizedTest
     @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
     public void acquireTokenWithAuthorizationCode_B2C_Local(String environment) {

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

@@ -78,36 +78,6 @@ void acquireTokenWithUsernamePassword_ADFSv4(String environment) throws Exceptio
         assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope(), user.getAppId());
     }
 
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    void acquireTokenWithUsernamePassword_ADFSv3(String environment) throws Exception {
-        cfg = new Config(environment);
-
-        UserQueryParameters query = new UserQueryParameters();
-        query.parameters.put(UserQueryParameters.AZURE_ENVIRONMENT, cfg.azureEnvironment);
-        query.parameters.put(UserQueryParameters.FEDERATION_PROVIDER, FederationProvider.ADFS_3);
-        query.parameters.put(UserQueryParameters.USER_TYPE, UserType.FEDERATED);
-
-        User user = labUserProvider.getLabUser(query);
-
-        assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope(), user.getAppId());
-    }
-
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    void acquireTokenWithUsernamePassword_ADFSv2(String environment) throws Exception {
-        cfg = new Config(environment);
-
-        UserQueryParameters query = new UserQueryParameters();
-        query.parameters.put(UserQueryParameters.AZURE_ENVIRONMENT, cfg.azureEnvironment);
-        query.parameters.put(UserQueryParameters.FEDERATION_PROVIDER, FederationProvider.ADFS_2);
-        query.parameters.put(UserQueryParameters.USER_TYPE, UserType.FEDERATED);
-
-        User user = labUserProvider.getLabUser(query);
-
-        assertAcquireTokenCommonAAD(user);
-    }
-
     @Test
     void acquireTokenWithUsernamePassword_AuthorityWithPort() throws Exception {
         User user = labUserProvider.getDefaultUser();

msal4j-sdk/src/integrationtest/java/infrastructure/SeleniumExtensions.java

@@ -76,14 +76,6 @@ public static void performADOrCiamLogin(WebDriver driver, User user) {
         LOG.info("Loggin in ... Clicking <Next> after username");
         driver.findElement(new By.ById(fields.getAadSignInButtonId())).click();
 
-        if (user.getFederationProvider().equals(FederationProvider.ADFS_2) &&
-                !user.getLabName().equals(LabConstants.ARLINGTON_LAB_NAME)) {
-
-            LOG.info("Loggin in ... ADFS-V2 - Entering the username in ADFSv2 form");
-            driver.findElement(new By.ById(SeleniumConstants.ADFSV2_WEB_USERNAME_INPUT_ID)).
-                    sendKeys(user.getUpn());
-        }
-
         LOG.info("Loggin in ... Entering password");
         By by = new By.ById(fields.getPasswordInputId());
         waitForElementToBeVisibleAndEnable(driver, by).sendKeys(user.getPassword());

msal4j-sdk/src/integrationtest/java/infrastructure/UserInformationFields.java

@@ -44,20 +44,10 @@ String getADFS2019UserNameInputId() {
 
     private void determineFieldIds() {
         switch (user.getFederationProvider()) {
-            case FederationProvider.ADFS_3:
             case FederationProvider.ADFS_2019:
                 passwordInputId = SeleniumConstants.ADFS2019_PASSWORD_ID;
                 passwordSigInButtonId = SeleniumConstants.ADFS2019_SUBMIT_ID;
                 break;
-            case FederationProvider.ADFS_2:
-                if (LabConstants.ARLINGTON_LAB_NAME.equals(user.getLabName())) {
-                    passwordInputId = SeleniumConstants.ADFSV2_ARLINGTON_WEB_PASSWORD_INPUT_ID;
-                    passwordSigInButtonId = SeleniumConstants.ADFSV2_ARLINGTON_WEB_SUBMIT_BUTTON_ID;
-                } else {
-                    passwordInputId = SeleniumConstants.ADFSV2_WEB_PASSWORD_INPUT_ID;
-                    passwordSigInButtonId = SeleniumConstants.ADFSV2_WEB_SUBMIT_BUTTON_ID;
-                }
-                break;
             case FederationProvider.ADFS_4:
                 passwordInputId = SeleniumConstants.ADFSV4_WEB_PASSWORD_ID;
                 passwordSigInButtonId = SeleniumConstants.ADFSV4_WEB_SUBMIT_ID;

msal4j-sdk/src/integrationtest/java/labapi/FederationProvider.java

@@ -6,12 +6,8 @@
 public class FederationProvider {
 
     public static final String NONE = "none";
-    public static final String ADFS_2 = "adfsv2";
-    public static final String ADFS_3 = "adfsv3";
     public static final String ADFS_4 = "adfsv4";
     public static final String ADFS_2019 = "adfsv2019";
-    public static final String PING = "ping";
-    public static final String SHIBBOLETH = "shibboleth";
     public static final String CIAM = "ciam";
 
 }