Organized project with packages, cleaned up unnecessary imports

Author: Matécsa Dániel

…sts/src/test/java/CourseCreatorPage.java …c/test/java/pages/CourseCreatorPage.javatests/mytests/src/test/java/CourseCreatorPage.java renamed to tests/mytests/src/test/java/pages/CourseCreatorPage.java tests/mytests/src/test/java/CourseCreatorPage.java renamed to tests/mytests/src/test/java/pages/CourseCreatorPage.java

@@ -1,20 +1,9 @@
-package test.java;
+package pages;
 
 import org.openqa.selenium.*;
-import org.openqa.selenium.chrome.*;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.List;
-import java.io.File;
-import java.net.MalformedURLException;
 import org.openqa.selenium.support.ui.*;
 
-import org.testng.annotations.*;
-import org.testng.*;
-
-
 public class CourseCreatorPage extends PageBase {
     private By courseNameInput = By.cssSelector("#id_fullname");
     private By courseShortNameInput = By.cssSelector("#id_shortname");

…ts/mytests/src/test/java/CoursePage.java …ests/src/test/java/pages/CoursePage.javatests/mytests/src/test/java/CoursePage.java renamed to tests/mytests/src/test/java/pages/CoursePage.java tests/mytests/src/test/java/CoursePage.java renamed to tests/mytests/src/test/java/pages/CoursePage.java

@@ -1,17 +1,6 @@
-package test.java;
+package pages;
 
 import org.openqa.selenium.*;
-import org.openqa.selenium.chrome.*;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.net.MalformedURLException;
-import org.openqa.selenium.support.ui.*;
-
-import org.testng.annotations.*;
-import org.testng.*;
-
 
 public class CoursePage extends PageBase {
 

…s/mytests/src/test/java/CoursesPage.java …sts/src/test/java/pages/CoursesPage.javatests/mytests/src/test/java/CoursesPage.java renamed to tests/mytests/src/test/java/pages/CoursesPage.java tests/mytests/src/test/java/CoursesPage.java renamed to tests/mytests/src/test/java/pages/CoursesPage.java

@@ -1,17 +1,6 @@
-package test.java;
+package pages;
 
 import org.openqa.selenium.*;
-import org.openqa.selenium.chrome.*;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.net.MalformedURLException;
-import org.openqa.selenium.support.ui.*;
-
-import org.testng.annotations.*;
-import org.testng.*;
-
 
 public class CoursesPage extends PageBase {
 

…sts/mytests/src/test/java/LoginPage.java …tests/src/test/java/pages/LoginPage.javatests/mytests/src/test/java/LoginPage.java renamed to tests/mytests/src/test/java/pages/LoginPage.java tests/mytests/src/test/java/LoginPage.java renamed to tests/mytests/src/test/java/pages/LoginPage.java

@@ -1,17 +1,6 @@
-package test.java;
+package pages;
 
 import org.openqa.selenium.*;
-import org.openqa.selenium.chrome.*;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.net.MalformedURLException;
-import org.openqa.selenium.support.ui.*;
-
-import org.testng.annotations.*;
-import org.testng.*;
-
 
 public class LoginPage extends PageBase {
     private By userInput = By.name("username");

tests/mytests/src/test/java/MainPage.java …ytests/src/test/java/pages/MainPage.javatests/mytests/src/test/java/MainPage.java renamed to tests/mytests/src/test/java/pages/MainPage.java tests/mytests/src/test/java/MainPage.java renamed to tests/mytests/src/test/java/pages/MainPage.java

@@ -1,17 +1,6 @@
-package test.java;
+package pages;
 
 import org.openqa.selenium.*;
-import org.openqa.selenium.chrome.*;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.net.MalformedURLException;
-import org.openqa.selenium.support.ui.*;
-
-import org.testng.annotations.*;
-import org.testng.*;
-
 
 public class MainPage extends PageBase {
     private By userMenuToggle = By.id("user-menu-toggle");

tests/mytests/src/test/java/PageBase.java …ytests/src/test/java/pages/PageBase.javatests/mytests/src/test/java/PageBase.java renamed to tests/mytests/src/test/java/pages/PageBase.java tests/mytests/src/test/java/PageBase.java renamed to tests/mytests/src/test/java/pages/PageBase.java

@@ -1,17 +1,8 @@
-package test.java;
+package pages;
 
 import org.openqa.selenium.*;
-import org.openqa.selenium.chrome.*;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.net.MalformedURLException;
 import org.openqa.selenium.support.ui.*;
 
-import org.testng.annotations.*;
-import org.testng.*;
-
 
 public class PageBase {
 
@@ -31,7 +22,7 @@ protected WebElement waitAndReturnElement(By locator) {
         return this.driver.findElement(locator);
     }
 
-    protected String getBodyText() {
+    public String getBodyText() {
         WebElement bodyElement = waitAndReturnElement(bodyLocator);
         return bodyElement.getText();
     }

…ytests/src/test/java/DependencyTest.java …/src/test/java/tests/DependencyTest.javatests/mytests/src/test/java/DependencyTest.java renamed to tests/mytests/src/test/java/tests/DependencyTest.java tests/mytests/src/test/java/DependencyTest.java renamed to tests/mytests/src/test/java/tests/DependencyTest.java

@@ -1,44 +1,22 @@
-package test.java;
+package tests;
 
-
-
-
-import org.openqa.selenium.*;
 import org.openqa.selenium.chrome.*;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Scanner;
-import java.util.List;
-import java.util.Random;
-import java.beans.Transient;
 import java.net.MalformedURLException;
-import org.openqa.selenium.support.ui.*;
 
 import org.testng.annotations.*;
 import org.testng.*;
 
-public class DependencyTest {
+import pages.LoginPage;
+import pages.MainPage;
+import utils.ConfigReader;
 
-    private WebDriver driver;
-    private MainPage sharedMainPage;
+public class DependencyTest extends TestBase {
 
-    private LoginPage login(LoginPage loginPage) {
-        loginPage = new LoginPage(this.driver, ConfigReader.get("moodle_url"));
-        
-        try {
-            loginPage.acceptCookies();
-        }
-        catch (Exception e){
-            System.out.println("Accept cookies button not found, proceeding without accepting cookies.");
-        }
-
-        loginPage.typeIntoUsername(ConfigReader.get("login_username"));
-        loginPage.typeIntoPassword(ConfigReader.get("login_password"));
-
-        return loginPage;
-    }
+    private MainPage sharedMainPage;
 
     @BeforeClass
     public void Setup() throws MalformedURLException
@@ -63,8 +41,6 @@ public void loginTest() {
         Assert.assertTrue(sharedMainPage.getBodyText().contains("Hi, Elte!"));
         Assert.assertFalse(sharedMainPage.getBodyText().contains("Log in"));
         Assert.assertEquals("Dashboard | ELTESelTest", sharedMainPage.getTitle());
-
-        
     }
 
     @Test (dependsOnMethods = { "loginTest" })

…ytests/src/test/java/MySeleniumTest.java …/src/test/java/tests/MySeleniumTest.javatests/mytests/src/test/java/MySeleniumTest.java renamed to tests/mytests/src/test/java/tests/MySeleniumTest.java tests/mytests/src/test/java/MySeleniumTest.java renamed to tests/mytests/src/test/java/tests/MySeleniumTest.java

@@ -1,41 +1,23 @@
-package test.java;
+package tests;
 
 import org.openqa.selenium.*;
 import org.openqa.selenium.chrome.*;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Scanner;
 import java.util.List;
 import java.util.Random;
-import java.beans.Transient;
 import java.net.MalformedURLException;
-import org.openqa.selenium.support.ui.*;
 
 import org.testng.annotations.*;
 import org.testng.*;
 
-public class MySeleniumTest {
+import pages.*;
+import utils.ConfigReader;
 
-    private WebDriver driver;
+public class MySeleniumTest extends TestBase {
 
-    private LoginPage login(LoginPage loginPage) {
-        loginPage = new LoginPage(this.driver, ConfigReader.get("moodle_url"));
-        
-        try {
-            loginPage.acceptCookies();
-        }
-        catch (Exception e){
-            System.out.println("Accept cookies button not found, proceeding without accepting cookies.");
-        }
-
-        loginPage.typeIntoUsername(ConfigReader.get("login_username"));
-        loginPage.typeIntoPassword(ConfigReader.get("login_password"));
-
-        return loginPage;
-    }
-    
     @BeforeMethod
     public void Setup() throws MalformedURLException
     {
@@ -49,26 +31,6 @@ public void Setup() throws MalformedURLException
         this.driver.manage().window().maximize();
     }
 
-    // @Test
-    // public void loginTest() {
-    //     LoginPage loginPage = null;
-        
-    //     loginPage = login(loginPage);
-
-    //     sharedMainPage =loginPage.clickLogin();
-    //     Assert.assertTrue(sharedMainPage.getBodyText().contains("Hi, Elte!"));
-    //     Assert.assertFalse(sharedMainPage.getBodyText().contains("Log in"));
-    //     Assert.assertEquals("Dashboard | ELTESelTest", sharedMainPage.getTitle());
-
-        
-    // }
-
-    // @Test (dependsOnMethods = { "loginTest" })
-    // public void logoutTest() {
-    //     sharedMainPage.toggleUserMenu();
-    //     sharedMainPage.clickLogout();
-    //     Assert.assertTrue(sharedMainPage.getBodyText().contains("Log in"));
-    // }
 
     @Test
     public void courseCreation() {

tests/mytests/src/test/java/tests/TestBase.java

@@ -0,0 +1,28 @@
+package tests;
+
+import org.openqa.selenium.*;
+
+import pages.LoginPage;
+import utils.ConfigReader;
+
+public class TestBase {
+
+    protected WebDriver driver;
+
+    protected LoginPage login(LoginPage loginPage) {
+        loginPage = new LoginPage(this.driver, ConfigReader.get("moodle_url"));
+        
+        try {
+            loginPage.acceptCookies();
+        }
+        catch (Exception e){
+            System.out.println("Accept cookies button not found, proceeding without accepting cookies.");
+        }
+
+        loginPage.typeIntoUsername(ConfigReader.get("login_username"));
+        loginPage.typeIntoPassword(ConfigReader.get("login_password"));
+
+        return loginPage;
+    }
+
+}

…/mytests/src/test/java/ConfigReader.java …ts/src/test/java/utils/ConfigReader.javatests/mytests/src/test/java/ConfigReader.java renamed to tests/mytests/src/test/java/utils/ConfigReader.java tests/mytests/src/test/java/ConfigReader.java renamed to tests/mytests/src/test/java/utils/ConfigReader.java

@@ -1,4 +1,4 @@
-package test.java;
+package utils;
 
 import org.yaml.snakeyaml.Yaml;
 import java.io.File;