broke down each web component into class. Successfully validated user info at Account Settings page

src/test/java/Pages/AccountSettingsPagePF.java

+package Pages;
+
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.How;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+
+public class AccountSettingsPagePF {
+    WebDriver driver;
+    WebDriverWait wdw;
+
+    @FindBy(how = How.ID, using = "input-firstName")
+    WebElement firstNameField;
+
+    @FindBy(how = How.ID, using = "input-lastName")
+    WebElement lastNameField;
+
+    @FindBy(how = How.ID, using = "emailIdaccount")
+    WebElement emailField;
+
+    public AccountSettingsPagePF(WebDriver driver) {
+        this.driver = driver;
+        this.wdw = new WebDriverWait(this.driver, 1);
+        PageFactory.initElements(driver, this);
+    }
+
+    public String getFirstName() {
+        wdw.until(ExpectedConditions.elementToBeClickable(firstNameField));
+        return firstNameField.getAttribute("value");
+    }
+
+    public String getLastName() {
+        wdw.until(ExpectedConditions.elementToBeClickable(lastNameField));
+        return lastNameField.getAttribute("value");
+    }
+
+    public String getEmail() {
+        wdw.until(ExpectedConditions.elementToBeClickable(emailField));
+        return emailField.getAttribute("value");
+    }
+}

src/test/java/PageComponents/HomePagePF.java → src/test/java/Pages/HomePagePF.java

-package PageComponents;
+package Pages;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;

src/test/java/AccountSettingsPOM.java → src/test/java/Pages/LoggedInHomePagePF.java

+package Pages;
+
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.How;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-public class AccountSettingsPOM {
+public class LoggedInHomePagePF {
 
     WebDriver driver;
     WebDriverWait wdw;
 
+    @FindBy(how = How.PARTIAL_LINK_TEXT, using = "Account")
     WebElement expandAccountOptionsButton;
-    WebElement accountSettingsButton;
-    WebElement userNameInputBox;
-    WebElement userPasswordInputBox;
-    WebElement signInButton;
-
 
+    public LoggedInHomePagePF(WebDriver driver) {
+        this.driver = driver;
+        this.wdw = new WebDriverWait(this.driver, 1);
+        PageFactory.initElements(driver, this);
+    }
 
+    public void revealRightSidebarLoggedIn() {
+        wdw.until(ExpectedConditions.elementToBeClickable(expandAccountOptionsButton));
+        expandAccountOptionsButton.click();
+    }
 }

src/test/java/Pages/LoggedInRightSideBarPF.java

+package Pages;
+
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.How;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+
+public class LoggedInRightSideBarPF {
+    WebDriver driver;
+    WebDriverWait wdw;
+
+    @FindBy(how = How.PARTIAL_LINK_TEXT, using = "Account Settings")
+    WebElement revealAccountSettingsButton;
+
+    public LoggedInRightSideBarPF(WebDriver driver) {
+        this.driver = driver;
+        this.wdw = new WebDriverWait(this.driver, 1);
+        PageFactory.initElements(driver, this);
+    }
+
+    public void revealAccountSettings() {
+        wdw.until(ExpectedConditions.elementToBeClickable(revealAccountSettingsButton));
+        revealAccountSettingsButton.click();
+    }
+
+}

src/test/java/PageComponents/LoginModalPF.java → src/test/java/Pages/LoginModalPF.java

-package PageComponents;
+package Pages;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;

src/test/java/PageComponents/RightSideBarPF.java → src/test/java/Pages/RightSideBarPF.java

-package PageComponents;
+package Pages;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;

src/test/java/SafewayLoginTest.java

-import PageComponents.HomePagePF;
-import PageComponents.LoginModalPF;
-import PageComponents.RightSideBarPF;
+import Pages.*;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
+import static org.junit.Assert.*;
 
 public class SafewayLoginTest {
 
@@ -19,26 +17,60 @@ public class SafewayLoginTest {
     @Test
     public void testSafewayLogin() throws InterruptedException {
 
+        // Expected field values to test against
+        String expectedFName = "Nisum";
+        String expectedLName = "TestAcct";
+        String expectedEmail = "vkrijegccvsknuvnpv@miucce.com";
+
+        // Get browser driver for OS as well as user credentials for login
         setup();
 
+        // Initialize test browser session
         WebDriver driver = new ChromeDriver();
 
+        // Initialize browser control objects for Safeway.com
         HomePagePF homePage = new HomePagePF(driver);
         RightSideBarPF rightSideBar = new RightSideBarPF(driver);
         LoginModalPF loginModal = new LoginModalPF(driver);
+        LoggedInHomePagePF loggedInHomePage = new LoggedInHomePagePF(driver);
+        LoggedInRightSideBarPF loggedInRightSideBar = new LoggedInRightSideBarPF(driver);
+        AccountSettingsPagePF accountSettingsPage = new AccountSettingsPagePF(driver);
 
+        // Perform user login and arrive at account settings page
         homePage.visitSafewayHomepage();
         homePage.revealRightSidebar();
         rightSideBar.revealLoginModal();
         loginModal.fillUserInfo(safewayLoginCreds.getProperty("username"), safewayLoginCreds.getProperty("password"));
         loginModal.sendCredentials();
+        Thread.sleep(3000);
+        loggedInHomePage.revealRightSidebarLoggedIn();
+        loggedInRightSideBar.revealAccountSettings();
+
+        // Extract user info from account settings page, compare against expected
 
+        assertEquals(expectedFName, accountSettingsPage.getFirstName());
+        assertEquals(expectedLName, accountSettingsPage.getLastName());
+        assertEquals(expectedEmail, accountSettingsPage.getEmail());
+
+        // Tear down the test session. It passed
+        System.out.println("ALL TEST CASES PASSED!");
         Thread.sleep(10000);
         driver.quit();
-
     }
 
     public void setup() {
+
+        pollSystemInfo();
+        pollCredentials();
+
+        System.out.println("====================================================");
+        System.out.printf("Running login test using %s on %s\n", browser, OS);
+        System.out.println("username:\t" + this.safewayLoginCreds.getProperty("username"));
+        System.out.println("password:\t" + this.safewayLoginCreds.getProperty("password"));
+        System.out.println("====================================================");
+    }
+
+    public void pollSystemInfo() {
         /////////////////////
         // Get environment information
         /////////////////////
@@ -50,23 +82,18 @@ public class SafewayLoginTest {
                 System.setProperty("webdriver.chrome.driver",
                         "/Users/kmuldoon/Dev/practice/testing/Selenium/Selenium-POM-Safeway/src/test/resources/chromedriver");
                 break;
-
             case "Windows":
                 ;
                 break;
-
             case "Linux":
                 ;
                 break;
-
             default:
                 System.out.println("Unsupported OS");
         }
+    }
 
-
-        System.out.printf("Running login test using %s on %s\n", browser, OS);
-
-
+    public void pollCredentials() {
         /////////////////////
         // Get Login Credentials
         /////////////////////
@@ -77,12 +104,10 @@ public class SafewayLoginTest {
             // load a properties file
             this.safewayLoginCreds.load(input);
 
-            // get the property value and print it out
-            System.out.println("username:\t" + this.safewayLoginCreds.getProperty("username"));
-            System.out.println("password:\t" + this.safewayLoginCreds.getProperty("password"));
 
         } catch (IOException ex) {
             ex.printStackTrace();
         }
     }
+
 }
\ No newline at end of file