misc refactor

Author: Tahanima

src/main/java/io/github/tahanima/page/login/LoginPage.java

@@ -19,15 +19,15 @@ public LoginPage navigateToUrl() {
         return this;
     }
 
-    @Step("Fill <username> in 'Username' textbox")
-    public LoginPage fillUsernameInTextBox(String username) {
+    @Step("Type <username> into 'Username' textbox")
+    public LoginPage typeUsernameIntoTextBox(String username) {
         page.fill("id=user-name", username);
 
         return this;
     }
 
-    @Step("Fill <password> in 'Password' textbox")
-    public LoginPage fillPasswordInTextBox(String password) {
+    @Step("Type <password> into 'Password' textbox")
+    public LoginPage typePasswordIntoTextBox(String password) {
         page.fill("id=password", password);
 
         return this;

src/test/java/io/github/tahanima/e2e/login/LoginE2ETest.java

@@ -18,6 +18,7 @@
  */
 class LoginE2ETest extends BaseE2ETest {
 
+    private final static String PATH = "login/login.csv";
     private LoginPage loginPage;
 
     @BeforeEach
@@ -45,12 +46,12 @@ public void closeBrowserContextSession() {
     @Owner("Tahanima Chowdhury")
     @Description(
             "Test that verifies user gets redirected to 'Products' page after submitting correct login credentials")
-    @DataSource(testCaseId = "TC-1", filePath = "login/login.csv", clazz = LoginTestData.class)
+    @DataSource(testCaseId = "TC-1", filePath = PATH, clazz = LoginTestData.class)
     void testCorrectLoginCredentials(LoginTestData loginDto) {
         loginPage
                 .navigateToUrl()
-                .fillUsernameInTextBox(loginDto.getUserName())
-                .fillPasswordInTextBox(loginDto.getPassword())
+                .typeUsernameIntoTextBox(loginDto.getUserName())
+                .typePasswordIntoTextBox(loginDto.getPassword())
                 .clickOnLoginButton();
 
         ProductsPage productsPage = createInstance(ProductsPage.class);
@@ -64,12 +65,12 @@ void testCorrectLoginCredentials(LoginTestData loginDto) {
     @Owner("Tahanima Chowdhury")
     @Description(
             "Test that verifies user gets error message after submitting incorrect login credentials")
-    @DataSource(testCaseId = "TC-2", filePath = "login/login.csv", clazz = LoginTestData.class)
+    @DataSource(testCaseId = "TC-2", filePath = PATH, clazz = LoginTestData.class)
     void testIncorrectLoginCredentials(LoginTestData loginDto) {
         loginPage
                 .navigateToUrl()
-                .fillUsernameInTextBox(loginDto.getUserName())
-                .fillPasswordInTextBox(loginDto.getPassword())
+                .typeUsernameIntoTextBox(loginDto.getUserName())
+                .typePasswordIntoTextBox(loginDto.getPassword())
                 .clickOnLoginButton();
 
         assertThat(loginPage.getErrorMessage()).hasText(loginDto.getErrorMessage());
@@ -81,11 +82,11 @@ void testIncorrectLoginCredentials(LoginTestData loginDto) {
     @Owner("Tahanima Chowdhury")
     @Description(
             "Test that verifies user gets error message after submitting login credentials where the username is blank")
-    @DataSource(testCaseId = "TC-3", filePath = "login/login.csv", clazz = LoginTestData.class)
+    @DataSource(testCaseId = "TC-3", filePath = PATH, clazz = LoginTestData.class)
     void testBlankUserName(LoginTestData loginDto) {
         loginPage
                 .navigateToUrl()
-                .fillPasswordInTextBox(loginDto.getPassword())
+                .typePasswordIntoTextBox(loginDto.getPassword())
                 .clickOnLoginButton();
 
         assertThat(loginPage.getErrorMessage()).hasText(loginDto.getErrorMessage());
@@ -97,11 +98,11 @@ void testBlankUserName(LoginTestData loginDto) {
     @Owner("Tahanima Chowdhury")
     @Description(
             "Test that verifies user gets error message after submitting login credentials where the password is blank")
-    @DataSource(testCaseId = "TC-4", filePath = "login/login.csv", clazz = LoginTestData.class)
+    @DataSource(testCaseId = "TC-4", filePath = PATH, clazz = LoginTestData.class)
     void testBlankPassword(LoginTestData loginDto) {
         loginPage
                 .navigateToUrl()
-                .fillUsernameInTextBox(loginDto.getUserName())
+                .typeUsernameIntoTextBox(loginDto.getUserName())
                 .clickOnLoginButton();
 
         assertThat(loginPage.getErrorMessage()).hasText(loginDto.getErrorMessage());
@@ -113,12 +114,12 @@ void testBlankPassword(LoginTestData loginDto) {
     @Owner("Tahanima Chowdhury")
     @Description(
             "Test that verifies user gets error message after submitting login credentials for locked out user")
-    @DataSource(testCaseId = "TC-5", filePath = "login/login.csv", clazz = LoginTestData.class)
+    @DataSource(testCaseId = "TC-5", filePath = PATH, clazz = LoginTestData.class)
     void testLockedOutUser(LoginTestData loginDto) {
         loginPage
                 .navigateToUrl()
-                .fillUsernameInTextBox(loginDto.getUserName())
-                .fillPasswordInTextBox(loginDto.getPassword())
+                .typeUsernameIntoTextBox(loginDto.getUserName())
+                .typePasswordIntoTextBox(loginDto.getPassword())
                 .clickOnLoginButton();
 
         assertThat(loginPage.getErrorMessage()).hasText(loginDto.getErrorMessage());

src/test/java/io/github/tahanima/util/CsvToPOJOMapper.java

@@ -19,18 +19,7 @@ public final class CsvToPOJOMapper {
 
     private CsvToPOJOMapper() {}
 
-    private static Object[][] convertToArray(ArrayList<ArrayList<? extends BaseTestData>> data) {
-        int noOfRows = data.size();
-        Object[][] dataArray = new Object[noOfRows][1];
-
-        for (int i = 0; i < noOfRows; i++) {
-            dataArray[i][0] = data.get(i).get(0);
-        }
-
-        return dataArray;
-    }
-
-    public static Object[][] map(
+    public static Object[] map(
             Class<? extends BaseTestData> clazz, String csvFilePath, String testCaseId) {
         CsvParserSettings parserSettings = new CsvParserSettings();
 
@@ -41,24 +30,19 @@ public static Object[][] map(
 
         try (Reader inputReader =
                 new InputStreamReader(new FileInputStream(csvFilePath), StandardCharsets.UTF_8)) {
-            ArrayList<ArrayList<? extends BaseTestData>> testData = new ArrayList<>();
+            ArrayList<BaseTestData> testData = new ArrayList<>();
 
-            for (BaseTestData data : routines.iterate(clazz, inputReader)) {
-                if (data.getTestCaseId().equals(testCaseId)) {
-                    testData.add(
-                            new ArrayList<>() {
-                                {
-                                    add(data);
-                                }
+            routines.iterate(clazz, inputReader)
+                    .forEach(
+                            e -> {
+                                if (e.getTestCaseId().equals(testCaseId)) testData.add(e);
                             });
-                }
-            }
 
-            return convertToArray(testData);
+            return testData.toArray();
         } catch (IOException e) {
             e.printStackTrace();
         }
 
-        return new Object[0][0];
+        throw new NullPointerException("Couldn't provide test data");
     }
 }