diff --git a/Framework/.checkstyle b/.checkstyle similarity index 100% rename from Framework/.checkstyle rename to .checkstyle diff --git a/.dependabot/config.yml b/.dependabot/config.yml index f04014796..ef068f0ca 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -2,7 +2,7 @@ version: 1 update_configs: # TODO: Modules will be enabled slowly as baseline stabilizes and framework matures. - package_manager: "java:maven" - directory: "/Framework" + directory: "" update_schedule: "daily" target_branch: "master" default_labels: diff --git a/.github/labeler.yml b/.github/labeler.yml index a630bd0d1..af6078461 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,26 +1,31 @@ framework: - - Framework/* + - ./* base: - - Framework/jmaqs-base/* - - Framework/jmaqs-base/**/* + - jmaqs-base/* + - jmaqs-base/**/* appium: - - Framework/jmaqs-appium/* - - Framework/jmaqs-appium/**/* + - jmaqs-appium/* + - jmaqs-appium/**/* selenium: - - Framework/jmaqs-selenium/* - - Framework/jmaqs-selenium/**/* + - jmaqs-selenium/* + - jmaqs-selenium/**/* webservices: - - Framework/jmaqs-webservices-jdk8/* - - Framework/jmaqs-webservices-jdk8/**/* + - jmaqs-webservices-jdk8/* + - jmaqs-webservices-jdk8/**/* utilities: - - Framework/jmaqs-utilities/* - - Framework/jmaqs-utilities/**/* + - jmaqs-utilities/* + - jmaqs-utilities/**/* database: - - Framework/jmaqs-database/* - - Framework/jmaqs-database/**/* + - jmaqs-database/* + - jmaqs-database/**/* + +devops: + - .dependabot/* + - .github/* + - .github/**/* diff --git a/.gitignore b/.gitignore index aac121ad9..0211e171d 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,4 @@ Logs #Git Time Tracking */.gtm/ /Framework/jmaqs-selenium/src/test/resources +.gtm diff --git a/Archetypes/Appium/JMAQS.properties b/Archetypes/Appium/JMAQS.properties deleted file mode 100644 index 9c86eaf6b..000000000 --- a/Archetypes/Appium/JMAQS.properties +++ /dev/null @@ -1,18 +0,0 @@ -#MagenicMaqs -#Application Settings -BundleID = com.magenic.maqs.appium.tester - -#Device settings - -Orientation = landscape -MobileOSType = Android -AppiumVersion = 1.5.3 -DeviceUDID = 1234567890ACDEF1234687890ABCDEF -OSVersion = 6.0 -DeviceName = Samsung Galaxy S6 Device - -# Mobile Browser Support -MobileBrowser="NO" - -#Appium or grid connection -MobileHubUrl = http://127.0.0.1:4723/wd/hub \ No newline at end of file diff --git a/Archetypes/Appium/config.xml b/Archetypes/Appium/config.xml deleted file mode 100644 index 82661d6c6..000000000 --- a/Archetypes/Appium/config.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - 100 - - - 10000 - - - YES - - - VERBOSE - - - TXT - - - - - - Android - 6.0 - Android GoogleAPI Emulator - - - http://ondemand.saucelabs.com:80/wd/hub - - - 122000 - - - 1000 - - - 10000 - - - NO - - - Png - - - NO - - - com.magenic.maqs.appium.tester - landscape - 1234567890ACDEF1234687890ABCDEF - NO - - - Partner_Magenic - 7e0592a4-16de-4c6b-9b87-ee61aa43ceac - 1.7.1 - org.openintents.shopping - - - - \ No newline at end of file diff --git a/Archetypes/Appium/pom.xml b/Archetypes/Appium/pom.xml deleted file mode 100644 index f7ca597a9..000000000 --- a/Archetypes/Appium/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - com.magenic.jmaqs.archetypes - jmaqs-appium-project - 1.0-SNAPSHOT - - 3.6.1 - UTF-8 - 6.14.3 - 0.0.1-SNAPSHOT - 7.0.0 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.plugin.version} - - 1.8 - 1.8 - 1.8 - UTF-8 - - - - - - - - io.appium - java-client - ${appiumjavaclient.version} - - - com.magenic.jmaqs.appium - jmaqs-appium - ${jmaq.version} - - - com.magenic.jmaqs.utilities - jmaqs-utilities - ${jmaq.version} - - - com.magenic.jmaqs.selenium - jmaqs-selenium - ${jmaq.version} - - - - org.testng - testng - ${testng.version} - - - - diff --git a/Archetypes/Appium/src/main/java/com/company/automation/pagemodels/BasePageModel.java b/Archetypes/Appium/src/main/java/com/company/automation/pagemodels/BasePageModel.java deleted file mode 100644 index 4ca47e176..000000000 --- a/Archetypes/Appium/src/main/java/com/company/automation/pagemodels/BasePageModel.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.company.automation.pagemodels; - -import com.magenic.jmaqs.appium.AppiumTestObject; - -/** - * Base Page Model Class. - */ -public abstract class BasePageModel { - - /** - * The Appium test object. - */ - protected AppiumTestObject appiumTestObject; - - /** - * Instantiates a new Base page model. - * - * @param appiumTestObject the appium test object - */ - public BasePageModel(AppiumTestObject appiumTestObject) { - this.appiumTestObject = appiumTestObject; - } -} diff --git a/Archetypes/Appium/src/main/java/com/company/automation/pagemodels/LoginPageModel.java b/Archetypes/Appium/src/main/java/com/company/automation/pagemodels/LoginPageModel.java deleted file mode 100644 index cdbfa440a..000000000 --- a/Archetypes/Appium/src/main/java/com/company/automation/pagemodels/LoginPageModel.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.company.automation.pagemodels; - -import com.magenic.jmaqs.appium.AppiumTestObject; -import org.openqa.selenium.By; - -/** - * The type Login page model. - */ -public class LoginPageModel extends BasePageModel { - - /** - * Field usernameField - */ - private static By usernameField = By.id("email"); - - /** - * Field passwordField - */ - private static By passwordField = By.id("password"); - - /** - * Field loginButton - */ - private static By loginButton = By.id("email_sign_in_button"); - - /** - * Field errorMessage - */ - private static By errorMessage = By.id("snackbar_text"); - - /** - * Instantiates a new Login page model. - * - * @param appiumTestObject the appium test object - */ - public LoginPageModel(AppiumTestObject appiumTestObject) { - super(appiumTestObject); - } - - /** - * Enter credentials. - * - * @param username the username - * @param password the password - */ - public void enterCredentials(String username, String password) { - this.appiumTestObject.getAppiumWait().waitForVisibleElement(usernameField).sendKeys(username); - this.appiumTestObject.getAppiumWait().waitForVisibleElement(passwordField).sendKeys(password); - } - - /** - * Login with invalid credentials. - * - * @param username the username - * @param password the password - */ - public void loginWithInvalidCredentials(String username, String password) { - - enterCredentials(username, password); - this.appiumTestObject.getAppiumWait().waitForVisibleElement(loginButton).click(); - this.appiumTestObject.getAppiumWait().waitForVisibleElement(errorMessage); - - } - - /** - * Login with valid credentials main page model. - * - * @param username the username - * @param password the password - * @return the main page model - */ - public MainPageModel loginWithValidCredentials(String username, String password) { - - enterCredentials(username, password); - this.appiumTestObject.getAppiumWait().waitForVisibleElement(loginButton).click(); - - return new MainPageModel(this.appiumTestObject); - } - - /** - * Gets error message. - * - * @return the error message - */ - public String getErrorMessage() { - return this.appiumTestObject.getAppiumWait().waitForVisibleElement(errorMessage).getText(); - } -} diff --git a/Archetypes/Appium/src/main/java/com/company/automation/pagemodels/MainPageModel.java b/Archetypes/Appium/src/main/java/com/company/automation/pagemodels/MainPageModel.java deleted file mode 100644 index 2dd613ceb..000000000 --- a/Archetypes/Appium/src/main/java/com/company/automation/pagemodels/MainPageModel.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.company.automation.pagemodels; - -import com.magenic.jmaqs.appium.AppiumTestObject; -import org.openqa.selenium.By; - -/** - * The type Main page model. - */ -public class MainPageModel extends BasePageModel { - - /** - * Username label value - */ - private static By loginUsernameValue = By.id("usernameView"); - - /** - * Password label value - */ - private static By loginPasswordValue = By.id("passView"); - - /** - * Instantiates a new Main page model. - * - * @param appiumTestObject the appium test object - */ - public MainPageModel(AppiumTestObject appiumTestObject) { - super(appiumTestObject); - } - - /** - * Gets username value text. - * - * @return the username value text - */ - public String getUsernameValueText() { - return this.appiumTestObject.getAppiumWait().waitForVisibleElement(loginUsernameValue).getText(); - } - - /** - * Gets password value text. - * - * @return the password value text - */ - public String getPasswordValueText() { - return this.appiumTestObject.getAppiumWait().waitForVisibleElement(loginPasswordValue).getText(); - } -} diff --git a/Archetypes/Appium/src/test/java/com/company/automation/test/AppiumTest.java b/Archetypes/Appium/src/test/java/com/company/automation/test/AppiumTest.java deleted file mode 100644 index dcc865c99..000000000 --- a/Archetypes/Appium/src/test/java/com/company/automation/test/AppiumTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.company.automation.test; - -import com.magenic.jmaqs.appium.AppiumConfig; -import com.magenic.jmaqs.appium.BaseAppiumTest; -import com.company.automation.pagemodels.LoginPageModel; -import com.company.automation.pagemodels.MainPageModel; -import org.testng.Assert; -import org.testng.annotations.Test; - -/** - * Created by jasonedstrom on 6/23/17. - */ -public class AppiumTest extends BaseAppiumTest { - - /** - * Application installed test. - */ - @Test - public void applicationInstalledTest() { - Assert.assertTrue(this.getAppiumDriver().isAppInstalled(AppiumConfig.getBundleId()), - "Expected application to be installed"); - } - - /** - * Invalid login test. - */ - @Test - public void invalidLoginTest() - { - String expectedError = "Wrong username or password"; - LoginPageModel page = new LoginPageModel(this.getAppiumTestObject()); - page.loginWithInvalidCredentials("Not", "Valid"); - String errorMessage = page.getErrorMessage(); - Assert.assertEquals(errorMessage, expectedError, "Expected error message to be equal"); - } - - /** - * Valid login test. - */ - @Test - public void validLoginTest() - { - String username = "Magenic"; - String password = "MAQS"; - LoginPageModel page = new LoginPageModel(this.getAppiumTestObject()); - MainPageModel mainPageModel = page.loginWithValidCredentials(username, password); - String loggedInPassword = mainPageModel.getPasswordValueText(); - String loggedInUsername = mainPageModel.getUsernameValueText(); - - Assert.assertEquals(loggedInUsername, username, "Expected username value to be equal"); - Assert.assertEquals(loggedInPassword, password, "Expected password value to be equal"); - } -} diff --git a/Archetypes/Resources/appium-pom.xml b/Archetypes/Resources/appium-pom.xml deleted file mode 100644 index 0b4d20ca5..000000000 --- a/Archetypes/Resources/appium-pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - 4.0.0 - - com.magenic.jmaqs.archetypes - jmaqs-appium-project-archetype - 1.0-SNAPSHOT - maven-archetype - - jmaqs-appium-project-archetype - - - - jmaqs-internal - JMAQS Internal Snapshots - http://10.155.45.36:8081/repository/jmaqs-internal-snapshots/ - false - - - jmaqs-internal - JMAQS Internal Releases - http://10.155.45.36:8081/repository/jmaqs-internal-releases/ - true - - - - - - - org.apache.maven.archetype - archetype-packaging - 3.0.1 - - - - - - - maven-archetype-plugin - 3.0.1 - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - - - default-deploy - deploy - - deploy - - - - - nexus - http://10.155.45.36:8081/nexus/ - true - - - - - \ No newline at end of file diff --git a/Archetypes/Resources/selenium-pom.xml b/Archetypes/Resources/selenium-pom.xml deleted file mode 100644 index 1714befef..000000000 --- a/Archetypes/Resources/selenium-pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - 4.0.0 - - com.magenic.jmaqs.archetypes - jmaqs-selenium-project-archetype - 1.0-SNAPSHOT - maven-archetype - - jmaqs-selenium-project-archetype - - - - jmaqs-internal - JMAQS Internal Snapshots - http://10.155.45.36:8081/repository/jmaqs-internal-snapshots/ - false - - - jmaqs-internal - JMAQS Internal Releases - http://10.155.45.36:8081/repository/jmaqs-internal-releases/ - true - - - - - - - org.apache.maven.archetype - archetype-packaging - 3.0.1 - - - - - - - maven-archetype-plugin - 3.0.1 - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - - - default-deploy - deploy - - deploy - - - - - nexus - http://10.155.45.36:8081/nexus/ - true - - - - - diff --git a/Archetypes/Resources/webservices-pom.xml b/Archetypes/Resources/webservices-pom.xml deleted file mode 100644 index bbda590b1..000000000 --- a/Archetypes/Resources/webservices-pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - 4.0.0 - - com.magenic.jmaqs.archetypes - jmaqs-webservices-project-archetype - 1.0-SNAPSHOT - maven-archetype - - jmaqs-webservices-project-archetype - - - - jmaqs-internal - JMAQS Internal Snapshots - http://10.155.45.36:8081/repository/jmaqs-internal-snapshots/ - false - - - jmaqs-internal - JMAQS Internal Releases - http://10.155.45.36:8081/repository/jmaqs-internal-releases/ - true - - - - - - - org.apache.maven.archetype - archetype-packaging - 3.0.1 - - - - - - - maven-archetype-plugin - 3.0.1 - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - - - default-deploy - deploy - - deploy - - - - - nexus - http://10.155.45.36:8081/nexus/ - true - - - - - diff --git a/Archetypes/Selenium/config.xml b/Archetypes/Selenium/config.xml deleted file mode 100644 index 7f27191ac..000000000 --- a/Archetypes/Selenium/config.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - 100 - - - 10000 - - - YES - - - WARNING - - - TXT - - - - - - - Chrome - - - - Chrome - http://ondemand.saucelabs.com:80/wd/hub - http://magenicautomation.azurewebsites.net/ - 1000 - 20000 - 61000 - - - 1024x768 - - Yes - Yes - Jpeg - - - - Sauce_Labs_Username - Sauce_Labs_Accesskey - - - \ No newline at end of file diff --git a/Archetypes/Selenium/pom.xml b/Archetypes/Selenium/pom.xml deleted file mode 100644 index f50f35bb9..000000000 --- a/Archetypes/Selenium/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - 4.0.0 - com.magenic.jmaqs.archetypes - jmaqs-selenium-project - 1.0-SNAPSHOT - - - 3.6.1 - 3.1.3 - UTF-8 - 6.14.3 - 0.0.1-SNAPSHOT - 3.141.59 - 3.1.3 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.plugin.version} - - 1.8 - 1.8 - 1.8 - UTF-8 - - - - com.github.webdriverextensions - webdriverextensions-maven-plugin - ${webdriverextensions.version} - - ${basedir}/src/test/resources - true - - - - - install-drivers - - - - - - - - - - com.magenic.jmaqs.selenium - jmaqs-selenium - ${jmaq.version} - - - org.seleniumhq.selenium - selenium-java - ${selenium.version} - - - org.testng - testng - ${testng.version} - compile - - - diff --git a/Archetypes/Selenium/src/main/java/com/company/automation/pagemodels/BasePageModel.java b/Archetypes/Selenium/src/main/java/com/company/automation/pagemodels/BasePageModel.java deleted file mode 100644 index 4435fc839..000000000 --- a/Archetypes/Selenium/src/main/java/com/company/automation/pagemodels/BasePageModel.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.company.automation.pagemodels; - -import com.magenic.jmaqs.selenium.SeleniumTestObject; - -/** - * The type Base page model. - */ -public abstract class BasePageModel { - - /** - * The Test object. - */ - protected SeleniumTestObject testObject; - - /** - * Instantiates a new Base page model. - * - * @param testObject the test object - */ - public BasePageModel(SeleniumTestObject testObject) { - this.testObject = testObject; - } - - /** - * Is page loaded boolean. - * - * @return the boolean - */ - public abstract boolean isPageLoaded(); -} diff --git a/Archetypes/Selenium/src/main/java/com/company/automation/pagemodels/HomePageModel.java b/Archetypes/Selenium/src/main/java/com/company/automation/pagemodels/HomePageModel.java deleted file mode 100644 index 1f17a17cd..000000000 --- a/Archetypes/Selenium/src/main/java/com/company/automation/pagemodels/HomePageModel.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.company.automation.pagemodels; - -import com.magenic.jmaqs.selenium.SeleniumConfig; -import com.magenic.jmaqs.selenium.SeleniumTestObject; -import org.openqa.selenium.By; - -/** - * The type Home page model. - */ -public class HomePageModel extends BasePageModel { - - /** - * The URL for the page. - */ - private static final String PAGE_URL = SeleniumConfig.getWebSiteBase() - + "Static/Training3/HomePage.html"; - - /** - * Welcome Message Selector. - */ - private static final By WELCOME_MESSAGE = By.cssSelector("#WelcomeMessage"); - - /** - * Instantiates a new Home page model. - * - * @param testObject - * the test object - */ - public HomePageModel(SeleniumTestObject testObject) { - super(testObject); - } - - /** - * Check if home page has been loaded - * - * @return True if the page was loaded - */ - public boolean isPageLoaded() { - return this.testObject.getSeleniumWait().waitForVisibleElement(WELCOME_MESSAGE).isDisplayed(); - } -} diff --git a/Archetypes/Selenium/src/main/java/com/company/automation/pagemodels/LoginPageModel.java b/Archetypes/Selenium/src/main/java/com/company/automation/pagemodels/LoginPageModel.java deleted file mode 100644 index 9573c6d82..000000000 --- a/Archetypes/Selenium/src/main/java/com/company/automation/pagemodels/LoginPageModel.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.company.automation.pagemodels; - -import com.magenic.jmaqs.selenium.SeleniumConfig; -import com.magenic.jmaqs.selenium.SeleniumTestObject; -import org.openqa.selenium.By; -import org.testng.Assert; - -/** - * The type Login page model. - */ -public class LoginPageModel extends BasePageModel { - - /** - * The URL for the page. - */ - private static final String PAGE_URL = SeleniumConfig.getWebSiteBase() + "/Static/Training1/loginpage.html"; - - /** - * Username Field Selector. - */ - private static final By USERNAME_INPUT = By.cssSelector("#UserName"); - - /** - * Password Field Selector. - */ - private static final By PASSWORD_INPUT = By.cssSelector("#Password"); - - /** - * Login Error Message Selector. - */ - private static final By LOGIN_ERROR = By.cssSelector("#LoginError"); - - /** - * Login Button Selector. - */ - private static final By LOGIN_BUTTON = By.cssSelector("#Login"); - - /** - * Login Page Model Constructor. - * - * @param testObject - * The WebDriver object to use - */ - public LoginPageModel(SeleniumTestObject testObject) { - super(testObject); - } - - /** - * Open the login page. - */ - public void openLoginPage() { - this.testObject.getWebDriver().navigate().to(PAGE_URL); - Assert.assertTrue(this.isPageLoaded(), - String.format("The web page {0} is not loaded", PAGE_URL)); - } - - /** - * Login with valid credentials. - * - * @param userName - * the user name - * @param password - * the password - * @return the home page model - */ - public HomePageModel loginWithValidCredentials(String userName, String password) { - this.enterCredentials(userName, password); - this.testObject.getSeleniumWait().waitForVisibleElement(LOGIN_BUTTON).click(); - - return new HomePageModel(this.testObject); - } - - /** - * Login with invalid credentials. - * - * @param userName - * the user name - * @param password - * the password - * @return the boolean - */ - public boolean loginWithInvalidCredentials(String userName, String password) { - this.enterCredentials(userName, password); - this.testObject.getSeleniumWait().waitForVisibleElement(LOGIN_BUTTON).click(); - return this.testObject.getSeleniumWait().waitForVisibleElement(LOGIN_ERROR).isDisplayed(); - } - - /** - * Enter credentials. - * - * @param userName - * the user name - * @param password - * the password - */ - public void enterCredentials(String userName, String password) { - this.testObject.getSeleniumWait().waitForVisibleElement(USERNAME_INPUT).sendKeys(userName); - this.testObject.getSeleniumWait().waitForVisibleElement(PASSWORD_INPUT).sendKeys(password); - } - - public boolean isPageLoaded() { - return this.testObject.getWebDriver().findElement(USERNAME_INPUT).isDisplayed() - && this.testObject.getWebDriver().findElement(PASSWORD_INPUT).isDisplayed(); - } -} diff --git a/Archetypes/Selenium/src/test/java/com/company/automation/test/LoginTest.java b/Archetypes/Selenium/src/test/java/com/company/automation/test/LoginTest.java deleted file mode 100644 index 06ce9aa95..000000000 --- a/Archetypes/Selenium/src/test/java/com/company/automation/test/LoginTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.company.automation.test; - -import com.magenic.jmaqs.selenium.BaseSeleniumTest; -import com.company.automation.pagemodels.HomePageModel; -import com.company.automation.pagemodels.LoginPageModel; -import org.testng.Assert; -import org.testng.annotations.Test; - -public class LoginTest extends BaseSeleniumTest { - - @Test - public void OpenPageTest() { - LoginPageModel page = new LoginPageModel(this.getSeleniumTestObject()); - page.openLoginPage(); - } - - @Test - public void enterValidCredentialsTest() { - String username = "Ted"; - String password = "123"; - LoginPageModel page = new LoginPageModel(this.getSeleniumTestObject()); - page.openLoginPage(); - HomePageModel homepage = page.loginWithValidCredentials(username, password); - Assert.assertTrue(homepage.isPageLoaded()); - } - - @Test - public void EnterInvalidCredentials() { - String username = "NOT"; - String password = "Valid"; - LoginPageModel page = new LoginPageModel(this.getSeleniumTestObject()); - page.openLoginPage(); - Assert.assertTrue(page.loginWithInvalidCredentials(username, password)); - } -} \ No newline at end of file diff --git a/Archetypes/WebService/config.xml b/Archetypes/WebService/config.xml deleted file mode 100644 index 8afb3de25..000000000 --- a/Archetypes/WebService/config.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - 100 - - - 10000 - - - YES - - - VERBOSE - - - TXT - - - - - - - HeadlessChrome - - - - Chrome - http://ondemand.saucelabs.com:80/wd/hub - http://magenicautomation.azurewebsites.net/ - 1000 - 20000 - 61000 - - - 1024x768 - - Yes - Yes - Jpeg - - - - - http://magenicautomation.azurewebsites.net - - - 10000 - - - \ No newline at end of file diff --git a/Archetypes/WebService/pom.xml b/Archetypes/WebService/pom.xml deleted file mode 100644 index 52d715d6f..000000000 --- a/Archetypes/WebService/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - com.magenic.jmaqs.archetypes - jmaqs-webservices-project - 1.0-SNAPSHOT - - - 3.6.1 - UTF-8 - 6.14.3 - 0.0.1-SNAPSHOT - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.plugin.version} - - 1.8 - 1.8 - 1.8 - UTF-8 - - - - - - - - com.magenic.jmaqs.webservices - jmaqs-webservices - ${jmaq.version} - - - org.testng - testng - ${testng.version} - compile - - - diff --git a/Archetypes/WebService/src/main/java/com/company/automation/models/ProductJson.java b/Archetypes/WebService/src/main/java/com/company/automation/models/ProductJson.java deleted file mode 100644 index 9c0200edf..000000000 --- a/Archetypes/WebService/src/main/java/com/company/automation/models/ProductJson.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.company.automation.models; - -import com.google.gson.annotations.Expose; -import com.google.gson.annotations.SerializedName; - -/** - * The type Product json. - */ -public class ProductJson { - - /** - * int ID - */ - @SerializedName("Id") @Expose private int id; - - /** - * String name - */ - @SerializedName("Name") @Expose private String name; - - /** - * String category - */ - @SerializedName("Category") @Expose private String category; - - /** - * Integer price - */ - @SerializedName("Price") @Expose private Integer price; - - /** - * Gets id. - * - * @return the id - */ - public int getId() { - return id; - } - - /** - * Sets id. - * - * @param id the id - */ - public void setId(int id) { - this.id = id; - } - - /** - * Gets name. - * - * @return the name - */ - public String getName() { - return name; - } - - /** - * Sets name. - * - * @param name the name - */ - public void setName(String name) { - this.name = name; - } - - /** - * Gets category. - * - * @return the category - */ - public String getCategory() { - return category; - } - - /** - * Sets category. - * - * @param category the category - */ - public void setCategory(String category) { - this.category = category; - } - - /** - * Gets price. - * - * @return the price - */ - public Integer getPrice() { - return price; - } - - /** - * Sets price. - * - * @param price the price - */ - public void setPrice(Integer price) { - this.price = price; - } -} diff --git a/Archetypes/WebService/src/test/java/com/company/automation/test/WebServiceTest.java b/Archetypes/WebService/src/test/java/com/company/automation/test/WebServiceTest.java deleted file mode 100644 index adfe77e3f..000000000 --- a/Archetypes/WebService/src/test/java/com/company/automation/test/WebServiceTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.company.automation.test; - -import com.google.gson.Gson; -import com.magenic.jmaqs.webservices.BaseWebServiceTest; -import com.magenic.jmaqs.webservices.WebServiceUtils; -import com.company.automation.models.ProductJson; -import org.apache.http.entity.ContentType; -import org.testng.Assert; -import org.testng.annotations.Test; - -/** - * The type Web service test. - */ -public class WebServiceTest extends BaseWebServiceTest { - - /** - * Gets json deserialized Test. - */ - @Test public void getJsonDeserialized() { - String result = ""; - try { - result = WebServiceUtils.getResponseBody(this.getWebServiceTestObject().getWebServiceWrapper() - .getContent("/api/XML_JSON/GetProduct/1", ContentType.APPLICATION_JSON, false)); - } catch (Exception e) { - e.printStackTrace(); - } - - ProductJson productJson = new Gson().fromJson(result, ProductJson.class); - Assert.assertEquals(productJson.getId(), 1, "Expected to get product 1"); - } -} diff --git a/Framework/copyright.txt b/copyright.txt similarity index 100% rename from Framework/copyright.txt rename to copyright.txt diff --git a/Framework/jmaqs-appium/.checkstyle b/jmaqs-appium/.checkstyle similarity index 100% rename from Framework/jmaqs-appium/.checkstyle rename to jmaqs-appium/.checkstyle diff --git a/Framework/jmaqs-appium/config.xml b/jmaqs-appium/config.xml similarity index 100% rename from Framework/jmaqs-appium/config.xml rename to jmaqs-appium/config.xml diff --git a/Framework/jmaqs-appium/pom.xml b/jmaqs-appium/pom.xml similarity index 100% rename from Framework/jmaqs-appium/pom.xml rename to jmaqs-appium/pom.xml diff --git a/Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumConfig.java b/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumConfig.java similarity index 100% rename from Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumConfig.java rename to jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumConfig.java diff --git a/Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumDriverFactory.java b/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumDriverFactory.java similarity index 100% rename from Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumDriverFactory.java rename to jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumDriverFactory.java diff --git a/Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumTestObject.java b/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumTestObject.java similarity index 100% rename from Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumTestObject.java rename to jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumTestObject.java diff --git a/Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumUtilities.java b/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumUtilities.java similarity index 100% rename from Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumUtilities.java rename to jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/AppiumUtilities.java diff --git a/Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/BaseAppiumTest.java b/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/BaseAppiumTest.java similarity index 100% rename from Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/BaseAppiumTest.java rename to jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/BaseAppiumTest.java diff --git a/Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/MobileDriverManager.java b/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/MobileDriverManager.java similarity index 100% rename from Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/MobileDriverManager.java rename to jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/MobileDriverManager.java diff --git a/Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/constants/PlatformType.java b/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/constants/PlatformType.java similarity index 100% rename from Framework/jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/constants/PlatformType.java rename to jmaqs-appium/src/main/java/com/magenic/jmaqs/appium/constants/PlatformType.java diff --git a/Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumConfigUnitTest.java b/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumConfigUnitTest.java similarity index 100% rename from Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumConfigUnitTest.java rename to jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumConfigUnitTest.java diff --git a/Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumDriverFactoryUnitTest.java b/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumDriverFactoryUnitTest.java similarity index 100% rename from Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumDriverFactoryUnitTest.java rename to jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumDriverFactoryUnitTest.java diff --git a/Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumTestObjectUnitTest.java b/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumTestObjectUnitTest.java similarity index 100% rename from Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumTestObjectUnitTest.java rename to jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumTestObjectUnitTest.java diff --git a/Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumUtilitiesUnitTest.java b/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumUtilitiesUnitTest.java similarity index 100% rename from Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumUtilitiesUnitTest.java rename to jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/AppiumUtilitiesUnitTest.java diff --git a/Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/BaseAppiumTestUnitTest.java b/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/BaseAppiumTestUnitTest.java similarity index 100% rename from Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/BaseAppiumTestUnitTest.java rename to jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/BaseAppiumTestUnitTest.java diff --git a/Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/MobileDriverManagerUnitTest.java b/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/MobileDriverManagerUnitTest.java similarity index 100% rename from Framework/jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/MobileDriverManagerUnitTest.java rename to jmaqs-appium/src/test/java/com/magenic/jmaqs/appium/MobileDriverManagerUnitTest.java diff --git a/Framework/jmaqs-base/.checkstyle b/jmaqs-base/.checkstyle similarity index 100% rename from Framework/jmaqs-base/.checkstyle rename to jmaqs-base/.checkstyle diff --git a/Framework/jmaqs-base/config.xml b/jmaqs-base/config.xml similarity index 100% rename from Framework/jmaqs-base/config.xml rename to jmaqs-base/config.xml diff --git a/Framework/jmaqs-base/pom.xml b/jmaqs-base/pom.xml similarity index 100% rename from Framework/jmaqs-base/pom.xml rename to jmaqs-base/pom.xml diff --git a/Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseExtendableTest.java b/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseExtendableTest.java similarity index 100% rename from Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseExtendableTest.java rename to jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseExtendableTest.java diff --git a/Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseGenericTest.java b/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseGenericTest.java similarity index 100% rename from Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseGenericTest.java rename to jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseGenericTest.java diff --git a/Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseTest.java b/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseTest.java similarity index 100% rename from Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseTest.java rename to jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseTest.java diff --git a/Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseTestObject.java b/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseTestObject.java similarity index 100% rename from Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseTestObject.java rename to jmaqs-base/src/main/java/com/magenic/jmaqs/base/BaseTestObject.java diff --git a/Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/ConcurrentManagerHashMap.java b/jmaqs-base/src/main/java/com/magenic/jmaqs/base/ConcurrentManagerHashMap.java similarity index 100% rename from Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/ConcurrentManagerHashMap.java rename to jmaqs-base/src/main/java/com/magenic/jmaqs/base/ConcurrentManagerHashMap.java diff --git a/Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/DriverManager.java b/jmaqs-base/src/main/java/com/magenic/jmaqs/base/DriverManager.java similarity index 100% rename from Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/DriverManager.java rename to jmaqs-base/src/main/java/com/magenic/jmaqs/base/DriverManager.java diff --git a/Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/ManagerDictionary.java b/jmaqs-base/src/main/java/com/magenic/jmaqs/base/ManagerDictionary.java similarity index 100% rename from Framework/jmaqs-base/src/main/java/com/magenic/jmaqs/base/ManagerDictionary.java rename to jmaqs-base/src/main/java/com/magenic/jmaqs/base/ManagerDictionary.java diff --git a/Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseGenericTestUnitTest.java b/jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseGenericTestUnitTest.java similarity index 100% rename from Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseGenericTestUnitTest.java rename to jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseGenericTestUnitTest.java diff --git a/Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseTestObjectUnitTest.java b/jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseTestObjectUnitTest.java similarity index 100% rename from Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseTestObjectUnitTest.java rename to jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseTestObjectUnitTest.java diff --git a/Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseTestUnitTest.java b/jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseTestUnitTest.java similarity index 100% rename from Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseTestUnitTest.java rename to jmaqs-base/src/test/java/com/magenic/jmaqs/base/BaseTestUnitTest.java diff --git a/Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/ConcurrentManagerHashMapUnitTest.java b/jmaqs-base/src/test/java/com/magenic/jmaqs/base/ConcurrentManagerHashMapUnitTest.java similarity index 100% rename from Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/ConcurrentManagerHashMapUnitTest.java rename to jmaqs-base/src/test/java/com/magenic/jmaqs/base/ConcurrentManagerHashMapUnitTest.java diff --git a/Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/DriverManagerUnitTest.java b/jmaqs-base/src/test/java/com/magenic/jmaqs/base/DriverManagerUnitTest.java similarity index 100% rename from Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/DriverManagerUnitTest.java rename to jmaqs-base/src/test/java/com/magenic/jmaqs/base/DriverManagerUnitTest.java diff --git a/Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/ManagerDictionaryUnitTest.java b/jmaqs-base/src/test/java/com/magenic/jmaqs/base/ManagerDictionaryUnitTest.java similarity index 100% rename from Framework/jmaqs-base/src/test/java/com/magenic/jmaqs/base/ManagerDictionaryUnitTest.java rename to jmaqs-base/src/test/java/com/magenic/jmaqs/base/ManagerDictionaryUnitTest.java diff --git a/Framework/jmaqs-database/config.xml b/jmaqs-database/config.xml similarity index 100% rename from Framework/jmaqs-database/config.xml rename to jmaqs-database/config.xml diff --git a/Framework/jmaqs-database/pom.xml b/jmaqs-database/pom.xml similarity index 100% rename from Framework/jmaqs-database/pom.xml rename to jmaqs-database/pom.xml diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/BaseDatabaseTest.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/BaseDatabaseTest.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/BaseDatabaseTest.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/BaseDatabaseTest.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/ConnectionFactory.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/ConnectionFactory.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/ConnectionFactory.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/ConnectionFactory.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseConfig.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseConfig.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseConfig.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseConfig.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseDriver.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseDriver.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseDriver.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseDriver.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseDriverManager.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseDriverManager.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseDriverManager.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseDriverManager.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabasePersistenceUnitInfo.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabasePersistenceUnitInfo.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabasePersistenceUnitInfo.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabasePersistenceUnitInfo.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseTestObject.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseTestObject.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseTestObject.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/DatabaseTestObject.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/constants/DataProviderType.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/constants/DataProviderType.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/constants/DataProviderType.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/constants/DataProviderType.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/H2Provider.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/H2Provider.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/H2Provider.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/H2Provider.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/IDataSourceProvider.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/IDataSourceProvider.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/IDataSourceProvider.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/IDataSourceProvider.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/MySQLProvider.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/MySQLProvider.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/MySQLProvider.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/MySQLProvider.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/SQLProvider.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/SQLProvider.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/SQLProvider.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/SQLProvider.java diff --git a/Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/SQLiteProvider.java b/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/SQLiteProvider.java similarity index 100% rename from Framework/jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/SQLiteProvider.java rename to jmaqs-database/src/main/java/com/magenic/jmaqs/database/providers/SQLiteProvider.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/BaseDatabaseTestUnitTest.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/BaseDatabaseTestUnitTest.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/BaseDatabaseTestUnitTest.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/BaseDatabaseTestUnitTest.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/ConnectionFactoryUnitTest.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/ConnectionFactoryUnitTest.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/ConnectionFactoryUnitTest.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/ConnectionFactoryUnitTest.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseConfigUnitTest.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseConfigUnitTest.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseConfigUnitTest.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseConfigUnitTest.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseDriverUnitTest.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseDriverUnitTest.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseDriverUnitTest.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseDriverUnitTest.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseTestObjectUnitTest.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseTestObjectUnitTest.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseTestObjectUnitTest.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseTestObjectUnitTest.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/constants/DataProviderTypeUnitTest.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/constants/DataProviderTypeUnitTest.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/constants/DataProviderTypeUnitTest.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/constants/DataProviderTypeUnitTest.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/OrdersEntity.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/OrdersEntity.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/OrdersEntity.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/OrdersEntity.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/ProductsEntity.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/ProductsEntity.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/ProductsEntity.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/ProductsEntity.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/SqliteMasterEntity.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/SqliteMasterEntity.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/SqliteMasterEntity.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/SqliteMasterEntity.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/StatesEntity.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/StatesEntity.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/StatesEntity.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/StatesEntity.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/UsersEntity.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/UsersEntity.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/UsersEntity.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/entities/UsersEntity.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/IDataSourceProviderUnitTest.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/IDataSourceProviderUnitTest.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/IDataSourceProviderUnitTest.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/IDataSourceProviderUnitTest.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/SQLProviderTest.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/SQLProviderTest.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/SQLProviderTest.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/SQLProviderTest.java diff --git a/Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/SQLiteProviderUnitTest.java b/jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/SQLiteProviderUnitTest.java similarity index 100% rename from Framework/jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/SQLiteProviderUnitTest.java rename to jmaqs-database/src/test/java/com/magenic/jmaqs/database/providers/SQLiteProviderUnitTest.java diff --git a/Framework/jmaqs-database/src/test/resources/MyDatabase.sqlite b/jmaqs-database/src/test/resources/MyDatabase.sqlite similarity index 100% rename from Framework/jmaqs-database/src/test/resources/MyDatabase.sqlite rename to jmaqs-database/src/test/resources/MyDatabase.sqlite diff --git a/Framework/jmaqs-jacoco-reporting/pom.xml b/jmaqs-jacoco-reporting/pom.xml similarity index 100% rename from Framework/jmaqs-jacoco-reporting/pom.xml rename to jmaqs-jacoco-reporting/pom.xml diff --git a/Framework/jmaqs-selenium/.checkstyle b/jmaqs-selenium/.checkstyle similarity index 100% rename from Framework/jmaqs-selenium/.checkstyle rename to jmaqs-selenium/.checkstyle diff --git a/Framework/jmaqs-selenium/config.xml b/jmaqs-selenium/config.xml similarity index 100% rename from Framework/jmaqs-selenium/config.xml rename to jmaqs-selenium/config.xml diff --git a/Framework/jmaqs-selenium/pom.xml b/jmaqs-selenium/pom.xml similarity index 97% rename from Framework/jmaqs-selenium/pom.xml rename to jmaqs-selenium/pom.xml index dad5ae609..4b3e88e7a 100644 --- a/Framework/jmaqs-selenium/pom.xml +++ b/jmaqs-selenium/pom.xml @@ -103,7 +103,7 @@ chromedriver chromedriver - 79.0.3945.36 + 80.0.3987.16 internetexplorerdriver @@ -113,7 +113,7 @@ geckodriver geckodriver - 0.24.0 + 0.26.0 edgedriver diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/ActionBuilder.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/ActionBuilder.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/ActionBuilder.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/ActionBuilder.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/BaseSeleniumTest.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/BaseSeleniumTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/BaseSeleniumTest.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/BaseSeleniumTest.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/ElementHandler.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/ElementHandler.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/ElementHandler.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/ElementHandler.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/EventHandler.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/EventHandler.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/EventHandler.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/EventHandler.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumConfig.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumConfig.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumConfig.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumConfig.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumDriverManager.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumDriverManager.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumDriverManager.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumDriverManager.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumTestObject.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumTestObject.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumTestObject.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumTestObject.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumUtilities.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumUtilities.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumUtilities.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/SeleniumUtilities.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/UIFind.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/UIFind.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/UIFind.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/UIFind.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/UIWait.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/UIWait.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/UIWait.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/UIWait.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/WebDriverFactory.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/WebDriverFactory.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/WebDriverFactory.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/WebDriverFactory.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/BrowserType.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/BrowserType.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/BrowserType.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/BrowserType.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/OperatingSystem.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/OperatingSystem.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/OperatingSystem.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/OperatingSystem.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/RemoteBrowserType.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/RemoteBrowserType.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/RemoteBrowserType.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/RemoteBrowserType.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/WebDriverFile.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/WebDriverFile.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/WebDriverFile.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/constants/WebDriverFile.java diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/FluentWaitFactory.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/FluentWaitFactory.java similarity index 96% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/FluentWaitFactory.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/FluentWaitFactory.java index 43be766cf..48d8e7483 100644 --- a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/FluentWaitFactory.java +++ b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/FluentWaitFactory.java @@ -1,35 +1,35 @@ -/* - * Copyright 2020 (C) Magenic, All rights Reserved - */ - -package com.magenic.jmaqs.selenium.factories; - -import java.time.Duration; -import org.openqa.selenium.NotFoundException; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.ui.FluentWait; - -/** - * Handles the creation of {@link org.openqa.selenium.support.ui.FluentWait FluentWait} objects. - */ -public class FluentWaitFactory { - - // private constructor so class can't - // be instantiated - private FluentWaitFactory() { - } - - /** - * Returns a new {@link org.openqa.selenium.support.ui.FluentWait FluentWait} object. - * - * @param element the element - * @param timeOutInMillis the default milliseconds timeout - * @param sleepInMillis the polling milliseconds before retry - * @return new fluent wait - */ - public static FluentWait getNewElementFluentWait(WebElement element, - int timeOutInMillis, int sleepInMillis) { - return new FluentWait(element).withTimeout(Duration.ofMillis(timeOutInMillis)) - .pollingEvery(Duration.ofMillis(sleepInMillis)).ignoring(NotFoundException.class); - } -} +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.selenium.factories; + +import java.time.Duration; +import org.openqa.selenium.NotFoundException; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.FluentWait; + +/** + * Handles the creation of {@link org.openqa.selenium.support.ui.FluentWait FluentWait} objects. + */ +public class FluentWaitFactory { + + // private constructor so class can't + // be instantiated + private FluentWaitFactory() { + } + + /** + * Returns a new {@link org.openqa.selenium.support.ui.FluentWait FluentWait} object. + * + * @param element the element + * @param timeOutInMillis the default milliseconds timeout + * @param sleepInMillis the polling milliseconds before retry + * @return new fluent wait + */ + public static FluentWait getNewElementFluentWait(WebElement element, + int timeOutInMillis, int sleepInMillis) { + return new FluentWait(element).withTimeout(Duration.ofMillis(timeOutInMillis)) + .pollingEvery(Duration.ofMillis(sleepInMillis)).ignoring(NotFoundException.class); + } +} diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/UIFindFactory.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/UIFindFactory.java similarity index 95% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/UIFindFactory.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/UIFindFactory.java index 838f1887f..cccc91a39 100644 --- a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/UIFindFactory.java +++ b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/UIFindFactory.java @@ -1,30 +1,30 @@ -/* - * Copyright 2020 (C) Magenic, All rights Reserved - */ - -package com.magenic.jmaqs.selenium.factories; - -import com.magenic.jmaqs.selenium.UIFind; -import org.openqa.selenium.SearchContext; - -/** - * Factory class for creating UIFind objects - * for the test. - */ -public class UIFindFactory { - - // private constructor so class can't be instantiated - private UIFindFactory() { - } - - /** - * Initializes a new instance of {@link UIFind}. - * - * @param searchItem The search item that is used for - * finding elements - * @return The UIFind instance - */ - public static UIFind getFind(SearchContext searchItem) { - return new UIFind(searchItem); - } -} +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.selenium.factories; + +import com.magenic.jmaqs.selenium.UIFind; +import org.openqa.selenium.SearchContext; + +/** + * Factory class for creating UIFind objects + * for the test. + */ +public class UIFindFactory { + + // private constructor so class can't be instantiated + private UIFindFactory() { + } + + /** + * Initializes a new instance of {@link UIFind}. + * + * @param searchItem The search item that is used for + * finding elements + * @return The UIFind instance + */ + public static UIFind getFind(SearchContext searchItem) { + return new UIFind(searchItem); + } +} diff --git a/Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/UIWaitFactory.java b/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/UIWaitFactory.java similarity index 100% rename from Framework/jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/UIWaitFactory.java rename to jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/factories/UIWaitFactory.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/ActionBuilderUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/ActionBuilderUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/ActionBuilderUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/ActionBuilderUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/BaseSeleniumTestUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/BaseSeleniumTestUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/BaseSeleniumTestUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/BaseSeleniumTestUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/ElementHandlerUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/ElementHandlerUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/ElementHandlerUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/ElementHandlerUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/EventHandlerUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/EventHandlerUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/EventHandlerUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/EventHandlerUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/FluentWaitFactoryUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/FluentWaitFactoryUnitTest.java similarity index 96% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/FluentWaitFactoryUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/FluentWaitFactoryUnitTest.java index eabfde6a5..1ee1e3d2a 100644 --- a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/FluentWaitFactoryUnitTest.java +++ b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/FluentWaitFactoryUnitTest.java @@ -1,55 +1,55 @@ -/* - * Copyright 2020 (C) Magenic, All rights Reserved - */ - -package com.magenic.jmaqs.selenium; - -import com.magenic.jmaqs.selenium.factories.FluentWaitFactory; -import com.magenic.jmaqs.selenium.factories.UIWaitFactory; -import com.magenic.jmaqs.selenium.unittestpagemodel.PageElementsPageModel; -import com.magenic.jmaqs.utilities.helper.TestCategories; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.ui.FluentWait; -import org.testng.Assert; -import org.testng.annotations.Test; - -/** - * The type Fluent wait factory unit test. - */ -public class FluentWaitFactoryUnitTest extends BaseSeleniumTest { - - /** - * Url for the site. - */ - private static String siteUrl = SeleniumConfig.getWebSiteBase(); - - /** - * Automation site url. - */ - private static String siteAutomationUrl = siteUrl + "Automation/"; - - /** - * Error string templates for assertion failures. - */ - private static String assertNotNullErrorTemplate = "The %s was null when it was expected to not be."; - - /** - * Test get fluent wait object. - */ - @Test(groups = TestCategories.SELENIUM) - public void testGetFluentWaitObject() { - int timeout = 1000; - int polling = 500; - - PageElementsPageModel pageModel = new PageElementsPageModel(this.getTestObject()); - pageModel.open(siteAutomationUrl); - WebElement elementDriver = UIWaitFactory.getWaitDriver(pageModel.getSeleniumTestObject().getWebDriver()) - .waitForClickableElement(pageModel.showDialog1ButtonLocator); - - FluentWait fluentWait = FluentWaitFactory - .getNewElementFluentWait(elementDriver, timeout, polling); - - Assert.assertNotNull(fluentWait, String.format(assertNotNullErrorTemplate, "fluentWait")); - } - -} +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.selenium; + +import com.magenic.jmaqs.selenium.factories.FluentWaitFactory; +import com.magenic.jmaqs.selenium.factories.UIWaitFactory; +import com.magenic.jmaqs.selenium.unittestpagemodel.PageElementsPageModel; +import com.magenic.jmaqs.utilities.helper.TestCategories; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.FluentWait; +import org.testng.Assert; +import org.testng.annotations.Test; + +/** + * The type Fluent wait factory unit test. + */ +public class FluentWaitFactoryUnitTest extends BaseSeleniumTest { + + /** + * Url for the site. + */ + private static String siteUrl = SeleniumConfig.getWebSiteBase(); + + /** + * Automation site url. + */ + private static String siteAutomationUrl = siteUrl + "Automation/"; + + /** + * Error string templates for assertion failures. + */ + private static String assertNotNullErrorTemplate = "The %s was null when it was expected to not be."; + + /** + * Test get fluent wait object. + */ + @Test(groups = TestCategories.SELENIUM) + public void testGetFluentWaitObject() { + int timeout = 1000; + int polling = 500; + + PageElementsPageModel pageModel = new PageElementsPageModel(this.getTestObject()); + pageModel.open(siteAutomationUrl); + WebElement elementDriver = UIWaitFactory.getWaitDriver(pageModel.getSeleniumTestObject().getWebDriver()) + .waitForClickableElement(pageModel.showDialog1ButtonLocator); + + FluentWait fluentWait = FluentWaitFactory + .getNewElementFluentWait(elementDriver, timeout, polling); + + Assert.assertNotNull(fluentWait, String.format(assertNotNullErrorTemplate, "fluentWait")); + } + +} diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumConfigUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumConfigUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumConfigUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumConfigUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumDriverManagerUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumDriverManagerUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumDriverManagerUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumDriverManagerUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumTestObjectUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumTestObjectUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumTestObjectUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumTestObjectUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumUtilitiesUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumUtilitiesUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumUtilitiesUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/SeleniumUtilitiesUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIFindFactoryUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIFindFactoryUnitTest.java similarity index 96% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIFindFactoryUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIFindFactoryUnitTest.java index 0af70caf3..94600e0f8 100644 --- a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIFindFactoryUnitTest.java +++ b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIFindFactoryUnitTest.java @@ -1,63 +1,63 @@ -/* - * Copyright 2020 (C) Magenic, All rights Reserved - */ - -package com.magenic.jmaqs.selenium; - -import com.magenic.jmaqs.selenium.factories.UIFindFactory; -import com.magenic.jmaqs.selenium.factories.UIWaitFactory; -import com.magenic.jmaqs.selenium.unittestpagemodel.PageElementsPageModel; -import com.magenic.jmaqs.utilities.helper.TestCategories; -import org.openqa.selenium.WebElement; -import org.testng.Assert; -import org.testng.annotations.Test; - -/** - * The type Ui find factory unit test. - */ -public class UIFindFactoryUnitTest extends BaseSeleniumTest { - - /** - * Url for the site. - */ - private static String siteUrl = SeleniumConfig.getWebSiteBase(); - - /** - * Automation site url. - */ - private static String siteAutomationUrl = siteUrl + "Automation/"; - - /** - * Error string templates for assertion failures. - */ - private static String assertNotNullErrorTemplate = "The %s was null when it was expected to not be."; - - /** - * Test get ui find with element. - */ - @Test(groups = TestCategories.SELENIUM) - public void testGetUIFindWithElement() { - PageElementsPageModel pageModel = new PageElementsPageModel(this.getTestObject()); - pageModel.open(siteAutomationUrl); - WebElement elementDriver = UIWaitFactory - .getWaitDriver(pageModel.getSeleniumTestObject().getWebDriver()) - .waitForClickableElement(pageModel.showDialog1ButtonLocator); - - UIFind findWithElement = UIFindFactory.getFind(elementDriver); - - Assert.assertNotNull(findWithElement, - String.format(assertNotNullErrorTemplate, "findWithElement")); - } - - /** - * Test get ui find with driver. - */ - @Test(groups = TestCategories.SELENIUM) - public void testGetUIFindWithDriver() { - UIFind findWithWebDriver = UIFindFactory.getFind(this.getWebDriver()); - - Assert.assertNotNull(findWithWebDriver, - String.format(assertNotNullErrorTemplate, "findWithWebDriver")); - } - -} +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.selenium; + +import com.magenic.jmaqs.selenium.factories.UIFindFactory; +import com.magenic.jmaqs.selenium.factories.UIWaitFactory; +import com.magenic.jmaqs.selenium.unittestpagemodel.PageElementsPageModel; +import com.magenic.jmaqs.utilities.helper.TestCategories; +import org.openqa.selenium.WebElement; +import org.testng.Assert; +import org.testng.annotations.Test; + +/** + * The type Ui find factory unit test. + */ +public class UIFindFactoryUnitTest extends BaseSeleniumTest { + + /** + * Url for the site. + */ + private static String siteUrl = SeleniumConfig.getWebSiteBase(); + + /** + * Automation site url. + */ + private static String siteAutomationUrl = siteUrl + "Automation/"; + + /** + * Error string templates for assertion failures. + */ + private static String assertNotNullErrorTemplate = "The %s was null when it was expected to not be."; + + /** + * Test get ui find with element. + */ + @Test(groups = TestCategories.SELENIUM) + public void testGetUIFindWithElement() { + PageElementsPageModel pageModel = new PageElementsPageModel(this.getTestObject()); + pageModel.open(siteAutomationUrl); + WebElement elementDriver = UIWaitFactory + .getWaitDriver(pageModel.getSeleniumTestObject().getWebDriver()) + .waitForClickableElement(pageModel.showDialog1ButtonLocator); + + UIFind findWithElement = UIFindFactory.getFind(elementDriver); + + Assert.assertNotNull(findWithElement, + String.format(assertNotNullErrorTemplate, "findWithElement")); + } + + /** + * Test get ui find with driver. + */ + @Test(groups = TestCategories.SELENIUM) + public void testGetUIFindWithDriver() { + UIFind findWithWebDriver = UIFindFactory.getFind(this.getWebDriver()); + + Assert.assertNotNull(findWithWebDriver, + String.format(assertNotNullErrorTemplate, "findWithWebDriver")); + } + +} diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIFindUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIFindUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIFindUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIFindUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIWaitFactoryUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIWaitFactoryUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIWaitFactoryUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIWaitFactoryUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIWaitUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIWaitUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIWaitUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/UIWaitUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/WebDriverFactoryUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/WebDriverFactoryUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/WebDriverFactoryUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/WebDriverFactoryUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/constants/OperatingSystemUnitTest.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/constants/OperatingSystemUnitTest.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/constants/OperatingSystemUnitTest.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/constants/OperatingSystemUnitTest.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/unittestpagemodel/IFramePageModel.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/unittestpagemodel/IFramePageModel.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/unittestpagemodel/IFramePageModel.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/unittestpagemodel/IFramePageModel.java diff --git a/Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/unittestpagemodel/PageElementsPageModel.java b/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/unittestpagemodel/PageElementsPageModel.java similarity index 100% rename from Framework/jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/unittestpagemodel/PageElementsPageModel.java rename to jmaqs-selenium/src/test/java/com/magenic/jmaqs/selenium/unittestpagemodel/PageElementsPageModel.java diff --git a/Framework/jmaqs-utilities/.checkstyle b/jmaqs-utilities/.checkstyle similarity index 100% rename from Framework/jmaqs-utilities/.checkstyle rename to jmaqs-utilities/.checkstyle diff --git a/Framework/jmaqs-utilities/config.xml b/jmaqs-utilities/config.xml similarity index 100% rename from Framework/jmaqs-utilities/config.xml rename to jmaqs-utilities/config.xml diff --git a/Framework/jmaqs-utilities/pom.xml b/jmaqs-utilities/pom.xml similarity index 100% rename from Framework/jmaqs-utilities/pom.xml rename to jmaqs-utilities/pom.xml diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/Config.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/Config.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/Config.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/Config.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ConfigSection.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ConfigSection.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ConfigSection.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ConfigSection.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/FunctionException.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/FunctionException.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/FunctionException.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/FunctionException.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/GenericWait.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/GenericWait.java similarity index 97% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/GenericWait.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/GenericWait.java index c6a1a6a3f..5bcba5aeb 100644 --- a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/GenericWait.java +++ b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/GenericWait.java @@ -1,438 +1,438 @@ -/* - * Copyright 2020 (C) Magenic, All rights Reserved - */ - -package com.magenic.jmaqs.utilities.helper; - -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; -import java.util.function.BooleanSupplier; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.function.Supplier; - -/** - * The type Generic wait. - */ -public final class GenericWait { - - private GenericWait() { - throw new IllegalStateException("Utility class"); - } - - private static long retryTimeFromConfig = Long.parseLong(Config.getGeneralValue("WaitTime", "0")); - - private static long timeoutFromConfig = Long.parseLong(Config.getGeneralValue("Timeout", "0")); - - /** - * Wait until boolean. - * - * @param the type parameter - * @param waitForTrue the wait for true - * @param arg the arg - * @return the boolean - * @throws InterruptedException the interrupted exception - * @throws FunctionException the function exception - */ - public static boolean waitUntil(Predicate waitForTrue, T arg) - throws InterruptedException, FunctionException { - return wait(waitForTrue, retryTimeFromConfig, timeoutFromConfig, false, arg); - } - - /** - * Wait until boolean. - * - * @param waitForTrue the wait for true - * @return the boolean - * @throws InterruptedException the interrupted exception - * @throws FunctionException the function exception - */ - public static boolean waitUntil(BooleanSupplier waitForTrue) - throws InterruptedException, FunctionException { - return wait(waitForTrue, retryTimeFromConfig, timeoutFromConfig, false); - } - - /** - * Wait for true. - * - * @param waitForTrue the wait for true - * @throws InterruptedException the interrupted exception - * @throws FunctionException the function exception - * @throws TimeoutException the timeout exception - */ - public static void waitForTrue(BooleanSupplier waitForTrue) - throws InterruptedException, FunctionException, TimeoutException { - if (!wait(waitForTrue, retryTimeFromConfig, timeoutFromConfig, true)) { - throw new TimeoutException("Timed out waiting for the function to return true"); - } - } - - /** - * Wait for true. - * - * @param the type parameter - * @param waitForTrue the wait for true - * @param arg the arg - * @throws InterruptedException the interrupted exception - * @throws FunctionException the function exception - * @throws TimeoutException the timeout exception - */ - public static void waitForTrue(Predicate waitForTrue, T arg) - throws InterruptedException, FunctionException, TimeoutException { - if (!wait(waitForTrue, retryTimeFromConfig, timeoutFromConfig, true, arg)) { - throw new TimeoutException("Timed out waiting for the function to return true"); - } - } - - /** - * Wait until match t. - * - * @param the type parameter - * @param waitForTrue the wait for true - * @param comparativeValue the comparative value - * @return the t - * @throws InterruptedException the interrupted exception - */ - public static T waitUntilMatch(Supplier waitForTrue, T comparativeValue) - throws InterruptedException { - // Set start time and exception holder - LocalDateTime start = LocalDateTime.now(); - - T value = waitForTrue.get(); - - // Checks if the two values are equal - boolean paramsAreEqual = paramsEqual(value, comparativeValue); - - // While the params are not equal & the timeout hasn't met, keep checking - while (!paramsAreEqual - && (ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeoutFromConfig) { - // If they aren't, wait - Thread.sleep(retryTimeFromConfig); - - value = waitForTrue.get(); - - // Check if they are equal - // (running them through another function because we can't use an operator with T) - if (paramsEqual(value, comparativeValue)) { - return value; - } - } - - // return the value regardless - return value; - } - - /** - * Wait until match t. - * - * @param the type parameter - * @param waitForTrue the wait for true - * @param retryTime the retry time - * @param timeout the timeout - * @param comparativeValue the comparative value - * @return the t - * @throws InterruptedException the interrupted exception - */ - public static T waitUntilMatch(Supplier waitForTrue, long retryTime, long timeout, - T comparativeValue) throws InterruptedException { - // Set start time and exception holder - LocalDateTime start = LocalDateTime.now(); - - T value = waitForTrue.get(); - - // Checks if the two values are equal - boolean paramsAreEqual = paramsEqual(value, comparativeValue); - - // While the params are not equal & the timeout hasn't met, keep checking - while (!paramsAreEqual && (ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeout) { - // If they aren't, wait - Thread.sleep(retryTime); - - value = waitForTrue.get(); - - // Check if they are equal - // (running them through another function because we can't use an operator with T - paramsAreEqual = paramsEqual(value, comparativeValue); - } - - // return the value regardless - return value; - } - - /** - * Wait for match. - * - * @param the type parameter - * @param waitForTrue the wait for true - * @param comparativeValue the comparative value - * @throws InterruptedException the interrupted exception - * @throws TimeoutException the timeout exception - */ - public static void waitForMatch(Supplier waitForTrue, T comparativeValue) - throws InterruptedException, TimeoutException { - // Set start time and exception holder - LocalDateTime start = LocalDateTime.now(); - - // Checks if the two values are equal - boolean paramsAreEqual = paramsEqual(waitForTrue.get(), comparativeValue); - - // While the params are not equal & the timeout hasn't met, keep checking - while (!paramsAreEqual - && (ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeoutFromConfig) { - // If they aren't, wait - Thread.sleep(retryTimeFromConfig); - - // Check if they are equal - // (running them through another function because we can't use an operator with T - paramsAreEqual = paramsEqual(waitForTrue.get(), comparativeValue); - } - - if (!paramsAreEqual) { - throw new TimeoutException( - "Timed out waiting for the supplier to return expected value of " + comparativeValue); - } - } - - /** - * Wait for match. - * - * @param the type parameter - * @param waitForTrue the wait for true - * @param retryTime the retry time - * @param timeout the timeout - * @param comparativeValue the comparative value - * @throws InterruptedException the interrupted exception - * @throws TimeoutException the timeout exception - */ - public static void waitForMatch(Supplier waitForTrue, long retryTime, long timeout, - T comparativeValue) throws InterruptedException, TimeoutException { - // Set start time and exception holder - LocalDateTime start = LocalDateTime.now(); - - // Checks if the two values are equal - boolean paramsAreEqual = paramsEqual(waitForTrue.get(), comparativeValue); - - // While the params are not equal & the timeout hasn't met, keep checking - while (!paramsAreEqual && (ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeout) { - // Check if they are equal (running them through another function because we can't use an operator with T - paramsAreEqual = paramsEqual(waitForTrue.get(), comparativeValue); - - // If they aren't, wait - Thread.sleep(retryTime); - } - - if (!paramsAreEqual) { - throw new TimeoutException( - "Timed out waiting for the supplier to return the expected value of " + comparativeValue); - } - } - - /** - * Wait for t. - * - * @param the type parameter - * @param waitFor the wait for - * @return the t - * @throws InterruptedException the interrupted exception - * @throws TimeoutException the timeout exception - */ - public static T waitFor(Supplier waitFor) throws InterruptedException, TimeoutException { - return wait(waitFor, retryTimeFromConfig, timeoutFromConfig); - } - - /** - * Wait for t. - * - * @param the type parameter - * @param the type parameter - * @param waitFor the wait for - * @param arg the arg - * @return the t - * @throws InterruptedException the interrupted exception - * @throws TimeoutException the timeout exception - */ - public static T waitFor(Function waitFor, U arg) - throws InterruptedException, TimeoutException { - return wait(waitFor, retryTimeFromConfig, timeoutFromConfig, arg); - } - - /** - * Wait boolean. - * - * @param the type parameter - * @param waitForTrue the wait for true - * @param retryTime the retry time - * @param timeout the timeout - * @param throwException the throw exception - * @param arg the arg - * @return the boolean - * @throws InterruptedException the interrupted exception - * @throws FunctionException the function exception - */ - public static boolean wait(Predicate waitForTrue, long retryTime, long timeout, - boolean throwException, T arg) throws InterruptedException, FunctionException { - // Set start time and exception holder - LocalDateTime start = LocalDateTime.now(); - FunctionException exception = null; - - do { - try { - // Clear out old exception - exception = null; - - // Check if the function returns true - if (waitForTrue.test(arg)) { - return true; - } - } catch (Exception e) { - // Save of the exception if we want to throw exceptions - if (throwException) { - exception = new FunctionException("Predicate exception caught.", e); - } - } - - // Give the system a second before checking if the page is updating - Thread.sleep(retryTime); - } while ((ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeout); - - // Check if we had an exceptions - if (throwException && exception != null) { - throw exception; - } - - // We timed out waiting for the function to return true - return false; - } - - /** - * Wait boolean. - * - * @param waitForTrue the wait for true - * @param retryTime the retry time - * @param timeout the timeout - * @param throwException the throw exception - * @return the boolean - * @throws InterruptedException the interrupted exception - * @throws FunctionException the function exception - */ - public static boolean wait(BooleanSupplier waitForTrue, long retryTime, long timeout, - boolean throwException) throws InterruptedException, FunctionException { - // Set start time and exception holder - LocalDateTime start = LocalDateTime.now(); - FunctionException exception = null; - - do { - try { - // Clear out old exception - exception = null; - - // Check if the function returns true - if (waitForTrue.getAsBoolean()) { - return true; - } - } catch (Exception e) { - // Save of the exception if we want to throw exceptions - if (throwException) { - exception = new FunctionException("BooleanSupplier exception caught.", e); - } - } - - // Give the system a second before checking if the page is updating - Thread.sleep(retryTime); - } while (ChronoUnit.MILLIS.between(start, LocalDateTime.now()) < timeout); - - // Check if we had an exceptions - if (throwException && exception != null) { - throw exception; - } - - // We timed out waiting for the function to return true - return false; - } - - /** - * Wait t. - * - * @param the type parameter - * @param waitFor the wait for - * @param retryTime the retry time - * @param timeout the timeout - * @return the t - * @throws InterruptedException the interrupted exception - * @throws TimeoutException the timeout exception - */ - public static T wait(Supplier waitFor, long retryTime, long timeout) - throws InterruptedException, TimeoutException { - // Set start time and exception holder - LocalDateTime start = LocalDateTime.now(); - Exception exception = new Exception(); - - do { - try { - T value = waitFor.get(); - - if (value != null) { - return value; - } - - } catch (Exception e) { - exception = e; - } - - // Give the system a second before checking if the page is updating - Thread.sleep(retryTime); - } while ((ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeout); - - throw new TimeoutException("Timed out waiting for the supplier to return", exception); - } - - /** - * Wait t. - * - * @param the type parameter - * @param the type parameter - * @param waitFor the wait for - * @param retryTime the retry time - * @param timeout the timeout - * @param arg the arg - * @return the t - * @throws InterruptedException the interrupted exception - * @throws TimeoutException the timeout exception - */ - public static T wait(Function waitFor, long retryTime, long timeout, U arg) - throws InterruptedException, TimeoutException { - // Set start time and exception holder - LocalDateTime start = LocalDateTime.now(); - Exception exception; - - do { - try { - return waitFor.apply(arg); - } catch (Exception e) { - exception = e; - } - - // Give the system a second before checking if the page is updating - Thread.sleep(retryTime); - } while ((ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeout); - - throw new TimeoutException("Timed out waiting for the function to return", exception); - } - - private static boolean paramsEqual(Object... param) { - // For each item - for (Object item : param) { - // and each item - for (Object item2 : param) { - // Compare each item - if (!item.equals(item2)) { - // If any do not match, then they are not equal - return false; - } - } - } - - // If we get here, then we had no mismatches - return true; - } -} +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.utilities.helper; + +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; +import java.util.function.BooleanSupplier; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.function.Supplier; + +/** + * The type Generic wait. + */ +public final class GenericWait { + + private GenericWait() { + throw new IllegalStateException("Utility class"); + } + + private static long retryTimeFromConfig = Long.parseLong(Config.getGeneralValue("WaitTime", "0")); + + private static long timeoutFromConfig = Long.parseLong(Config.getGeneralValue("Timeout", "0")); + + /** + * Wait until boolean. + * + * @param the type parameter + * @param waitForTrue the wait for true + * @param arg the arg + * @return the boolean + * @throws InterruptedException the interrupted exception + * @throws FunctionException the function exception + */ + public static boolean waitUntil(Predicate waitForTrue, T arg) + throws InterruptedException, FunctionException { + return wait(waitForTrue, retryTimeFromConfig, timeoutFromConfig, false, arg); + } + + /** + * Wait until boolean. + * + * @param waitForTrue the wait for true + * @return the boolean + * @throws InterruptedException the interrupted exception + * @throws FunctionException the function exception + */ + public static boolean waitUntil(BooleanSupplier waitForTrue) + throws InterruptedException, FunctionException { + return wait(waitForTrue, retryTimeFromConfig, timeoutFromConfig, false); + } + + /** + * Wait for true. + * + * @param waitForTrue the wait for true + * @throws InterruptedException the interrupted exception + * @throws FunctionException the function exception + * @throws TimeoutException the timeout exception + */ + public static void waitForTrue(BooleanSupplier waitForTrue) + throws InterruptedException, FunctionException, TimeoutException { + if (!wait(waitForTrue, retryTimeFromConfig, timeoutFromConfig, true)) { + throw new TimeoutException("Timed out waiting for the function to return true"); + } + } + + /** + * Wait for true. + * + * @param the type parameter + * @param waitForTrue the wait for true + * @param arg the arg + * @throws InterruptedException the interrupted exception + * @throws FunctionException the function exception + * @throws TimeoutException the timeout exception + */ + public static void waitForTrue(Predicate waitForTrue, T arg) + throws InterruptedException, FunctionException, TimeoutException { + if (!wait(waitForTrue, retryTimeFromConfig, timeoutFromConfig, true, arg)) { + throw new TimeoutException("Timed out waiting for the function to return true"); + } + } + + /** + * Wait until match t. + * + * @param the type parameter + * @param waitForTrue the wait for true + * @param comparativeValue the comparative value + * @return the t + * @throws InterruptedException the interrupted exception + */ + public static T waitUntilMatch(Supplier waitForTrue, T comparativeValue) + throws InterruptedException { + // Set start time and exception holder + LocalDateTime start = LocalDateTime.now(); + + T value = waitForTrue.get(); + + // Checks if the two values are equal + boolean paramsAreEqual = paramsEqual(value, comparativeValue); + + // While the params are not equal & the timeout hasn't met, keep checking + while (!paramsAreEqual + && (ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeoutFromConfig) { + // If they aren't, wait + Thread.sleep(retryTimeFromConfig); + + value = waitForTrue.get(); + + // Check if they are equal + // (running them through another function because we can't use an operator with T) + if (paramsEqual(value, comparativeValue)) { + return value; + } + } + + // return the value regardless + return value; + } + + /** + * Wait until match t. + * + * @param the type parameter + * @param waitForTrue the wait for true + * @param retryTime the retry time + * @param timeout the timeout + * @param comparativeValue the comparative value + * @return the t + * @throws InterruptedException the interrupted exception + */ + public static T waitUntilMatch(Supplier waitForTrue, long retryTime, long timeout, + T comparativeValue) throws InterruptedException { + // Set start time and exception holder + LocalDateTime start = LocalDateTime.now(); + + T value = waitForTrue.get(); + + // Checks if the two values are equal + boolean paramsAreEqual = paramsEqual(value, comparativeValue); + + // While the params are not equal & the timeout hasn't met, keep checking + while (!paramsAreEqual && (ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeout) { + // If they aren't, wait + Thread.sleep(retryTime); + + value = waitForTrue.get(); + + // Check if they are equal + // (running them through another function because we can't use an operator with T + paramsAreEqual = paramsEqual(value, comparativeValue); + } + + // return the value regardless + return value; + } + + /** + * Wait for match. + * + * @param the type parameter + * @param waitForTrue the wait for true + * @param comparativeValue the comparative value + * @throws InterruptedException the interrupted exception + * @throws TimeoutException the timeout exception + */ + public static void waitForMatch(Supplier waitForTrue, T comparativeValue) + throws InterruptedException, TimeoutException { + // Set start time and exception holder + LocalDateTime start = LocalDateTime.now(); + + // Checks if the two values are equal + boolean paramsAreEqual = paramsEqual(waitForTrue.get(), comparativeValue); + + // While the params are not equal & the timeout hasn't met, keep checking + while (!paramsAreEqual + && (ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeoutFromConfig) { + // If they aren't, wait + Thread.sleep(retryTimeFromConfig); + + // Check if they are equal + // (running them through another function because we can't use an operator with T + paramsAreEqual = paramsEqual(waitForTrue.get(), comparativeValue); + } + + if (!paramsAreEqual) { + throw new TimeoutException( + "Timed out waiting for the supplier to return expected value of " + comparativeValue); + } + } + + /** + * Wait for match. + * + * @param the type parameter + * @param waitForTrue the wait for true + * @param retryTime the retry time + * @param timeout the timeout + * @param comparativeValue the comparative value + * @throws InterruptedException the interrupted exception + * @throws TimeoutException the timeout exception + */ + public static void waitForMatch(Supplier waitForTrue, long retryTime, long timeout, + T comparativeValue) throws InterruptedException, TimeoutException { + // Set start time and exception holder + LocalDateTime start = LocalDateTime.now(); + + // Checks if the two values are equal + boolean paramsAreEqual = paramsEqual(waitForTrue.get(), comparativeValue); + + // While the params are not equal & the timeout hasn't met, keep checking + while (!paramsAreEqual && (ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeout) { + // Check if they are equal (running them through another function because we can't use an operator with T + paramsAreEqual = paramsEqual(waitForTrue.get(), comparativeValue); + + // If they aren't, wait + Thread.sleep(retryTime); + } + + if (!paramsAreEqual) { + throw new TimeoutException( + "Timed out waiting for the supplier to return the expected value of " + comparativeValue); + } + } + + /** + * Wait for t. + * + * @param the type parameter + * @param waitFor the wait for + * @return the t + * @throws InterruptedException the interrupted exception + * @throws TimeoutException the timeout exception + */ + public static T waitFor(Supplier waitFor) throws InterruptedException, TimeoutException { + return wait(waitFor, retryTimeFromConfig, timeoutFromConfig); + } + + /** + * Wait for t. + * + * @param the type parameter + * @param the type parameter + * @param waitFor the wait for + * @param arg the arg + * @return the t + * @throws InterruptedException the interrupted exception + * @throws TimeoutException the timeout exception + */ + public static T waitFor(Function waitFor, U arg) + throws InterruptedException, TimeoutException { + return wait(waitFor, retryTimeFromConfig, timeoutFromConfig, arg); + } + + /** + * Wait boolean. + * + * @param the type parameter + * @param waitForTrue the wait for true + * @param retryTime the retry time + * @param timeout the timeout + * @param throwException the throw exception + * @param arg the arg + * @return the boolean + * @throws InterruptedException the interrupted exception + * @throws FunctionException the function exception + */ + public static boolean wait(Predicate waitForTrue, long retryTime, long timeout, + boolean throwException, T arg) throws InterruptedException, FunctionException { + // Set start time and exception holder + LocalDateTime start = LocalDateTime.now(); + FunctionException exception = null; + + do { + try { + // Clear out old exception + exception = null; + + // Check if the function returns true + if (waitForTrue.test(arg)) { + return true; + } + } catch (Exception e) { + // Save of the exception if we want to throw exceptions + if (throwException) { + exception = new FunctionException("Predicate exception caught.", e); + } + } + + // Give the system a second before checking if the page is updating + Thread.sleep(retryTime); + } while ((ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeout); + + // Check if we had an exceptions + if (throwException && exception != null) { + throw exception; + } + + // We timed out waiting for the function to return true + return false; + } + + /** + * Wait boolean. + * + * @param waitForTrue the wait for true + * @param retryTime the retry time + * @param timeout the timeout + * @param throwException the throw exception + * @return the boolean + * @throws InterruptedException the interrupted exception + * @throws FunctionException the function exception + */ + public static boolean wait(BooleanSupplier waitForTrue, long retryTime, long timeout, + boolean throwException) throws InterruptedException, FunctionException { + // Set start time and exception holder + LocalDateTime start = LocalDateTime.now(); + FunctionException exception = null; + + do { + try { + // Clear out old exception + exception = null; + + // Check if the function returns true + if (waitForTrue.getAsBoolean()) { + return true; + } + } catch (Exception e) { + // Save of the exception if we want to throw exceptions + if (throwException) { + exception = new FunctionException("BooleanSupplier exception caught.", e); + } + } + + // Give the system a second before checking if the page is updating + Thread.sleep(retryTime); + } while (ChronoUnit.MILLIS.between(start, LocalDateTime.now()) < timeout); + + // Check if we had an exceptions + if (throwException && exception != null) { + throw exception; + } + + // We timed out waiting for the function to return true + return false; + } + + /** + * Wait t. + * + * @param the type parameter + * @param waitFor the wait for + * @param retryTime the retry time + * @param timeout the timeout + * @return the t + * @throws InterruptedException the interrupted exception + * @throws TimeoutException the timeout exception + */ + public static T wait(Supplier waitFor, long retryTime, long timeout) + throws InterruptedException, TimeoutException { + // Set start time and exception holder + LocalDateTime start = LocalDateTime.now(); + Exception exception = new Exception(); + + do { + try { + T value = waitFor.get(); + + if (value != null) { + return value; + } + + } catch (Exception e) { + exception = e; + } + + // Give the system a second before checking if the page is updating + Thread.sleep(retryTime); + } while ((ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeout); + + throw new TimeoutException("Timed out waiting for the supplier to return", exception); + } + + /** + * Wait t. + * + * @param the type parameter + * @param the type parameter + * @param waitFor the wait for + * @param retryTime the retry time + * @param timeout the timeout + * @param arg the arg + * @return the t + * @throws InterruptedException the interrupted exception + * @throws TimeoutException the timeout exception + */ + public static T wait(Function waitFor, long retryTime, long timeout, U arg) + throws InterruptedException, TimeoutException { + // Set start time and exception holder + LocalDateTime start = LocalDateTime.now(); + Exception exception; + + do { + try { + return waitFor.apply(arg); + } catch (Exception e) { + exception = e; + } + + // Give the system a second before checking if the page is updating + Thread.sleep(retryTime); + } while ((ChronoUnit.MILLIS.between(start, LocalDateTime.now())) < timeout); + + throw new TimeoutException("Timed out waiting for the function to return", exception); + } + + private static boolean paramsEqual(Object... param) { + // For each item + for (Object item : param) { + // and each item + for (Object item2 : param) { + // Compare each item + if (!item.equals(item2)) { + // If any do not match, then they are not equal + return false; + } + } + } + + // If we get here, then we had no mismatches + return true; + } +} diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ListProcessor.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ListProcessor.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ListProcessor.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ListProcessor.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/StringProcessor.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/StringProcessor.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/StringProcessor.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/StringProcessor.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TimeoutException.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TimeoutException.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TimeoutException.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TimeoutException.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/functionalinterfaces/Action.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/functionalinterfaces/Action.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/functionalinterfaces/Action.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/functionalinterfaces/Action.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/ConsoleLogger.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/ConsoleLogger.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/ConsoleLogger.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/ConsoleLogger.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/FileLogger.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/FileLogger.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/FileLogger.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/FileLogger.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/HtmlFileLogger.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/HtmlFileLogger.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/HtmlFileLogger.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/HtmlFileLogger.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/Logger.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/Logger.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/Logger.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/Logger.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/LoggingConfig.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/LoggingConfig.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/LoggingConfig.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/LoggingConfig.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/LoggingEnabled.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/LoggingEnabled.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/LoggingEnabled.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/LoggingEnabled.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/MessageType.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/MessageType.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/MessageType.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/MessageType.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/TestResultType.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/TestResultType.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/TestResultType.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/logging/TestResultType.java diff --git a/Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/performance/PerfTimerCollection.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/performance/PerfTimerCollection.java similarity index 100% rename from Framework/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/performance/PerfTimerCollection.java rename to jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/performance/PerfTimerCollection.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConfigUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConfigUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConfigUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConfigUnitTest.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConsoleCopy.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConsoleCopy.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConsoleCopy.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConsoleCopy.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConsoleLoggerUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConsoleLoggerUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConsoleLoggerUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ConsoleLoggerUnitTest.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/FileLoggerUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/FileLoggerUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/FileLoggerUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/FileLoggerUnitTest.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/GenericWaitNotParallelUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/GenericWaitNotParallelUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/GenericWaitNotParallelUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/GenericWaitNotParallelUnitTest.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/GenericWaitUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/GenericWaitUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/GenericWaitUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/GenericWaitUnitTest.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/HtmlFileLoggerUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/HtmlFileLoggerUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/HtmlFileLoggerUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/HtmlFileLoggerUnitTest.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ListProcessorUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ListProcessorUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ListProcessorUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/ListProcessorUnitTest.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/LoggingConfigUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/LoggingConfigUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/LoggingConfigUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/LoggingConfigUnitTest.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/StringProcessorUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/StringProcessorUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/StringProcessorUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/StringProcessorUnitTest.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/helper/StringProcessorUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/helper/StringProcessorUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/helper/StringProcessorUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/helper/StringProcessorUnitTest.java diff --git a/Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/performance/PerfTimerCollectionUnitTest.java b/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/performance/PerfTimerCollectionUnitTest.java similarity index 100% rename from Framework/jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/performance/PerfTimerCollectionUnitTest.java rename to jmaqs-utilities/src/test/java/com/magenic/jmaqs/utilities/performance/PerfTimerCollectionUnitTest.java diff --git a/Framework/jmaqs-webservices-jdk8/.checkstyle b/jmaqs-webservices-jdk8/.checkstyle similarity index 100% rename from Framework/jmaqs-webservices-jdk8/.checkstyle rename to jmaqs-webservices-jdk8/.checkstyle diff --git a/Framework/jmaqs-webservices-jdk8/config.xml b/jmaqs-webservices-jdk8/config.xml similarity index 100% rename from Framework/jmaqs-webservices-jdk8/config.xml rename to jmaqs-webservices-jdk8/config.xml diff --git a/Framework/jmaqs-webservices-jdk8/pom.xml b/jmaqs-webservices-jdk8/pom.xml similarity index 100% rename from Framework/jmaqs-webservices-jdk8/pom.xml rename to jmaqs-webservices-jdk8/pom.xml diff --git a/Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/BaseWebServiceTest.java b/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/BaseWebServiceTest.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/BaseWebServiceTest.java rename to jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/BaseWebServiceTest.java diff --git a/Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/MediaType.java b/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/MediaType.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/MediaType.java rename to jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/MediaType.java diff --git a/Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceConfig.java b/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceConfig.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceConfig.java rename to jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceConfig.java diff --git a/Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriver.java b/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriver.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriver.java rename to jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriver.java diff --git a/Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverManager.java b/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverManager.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverManager.java rename to jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverManager.java diff --git a/Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceTestObject.java b/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceTestObject.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceTestObject.java rename to jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceTestObject.java diff --git a/Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUtilities.java b/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUtilities.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUtilities.java rename to jmaqs-webservices-jdk8/src/main/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUtilities.java diff --git a/Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/BaseWebServiceTestUnitTest.java b/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/BaseWebServiceTestUnitTest.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/BaseWebServiceTestUnitTest.java rename to jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/BaseWebServiceTestUnitTest.java diff --git a/Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/MediaTypeUnitTest.java b/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/MediaTypeUnitTest.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/MediaTypeUnitTest.java rename to jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/MediaTypeUnitTest.java diff --git a/Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceConfigUnitTest.java b/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceConfigUnitTest.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceConfigUnitTest.java rename to jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceConfigUnitTest.java diff --git a/Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverManagerUnitTest.java b/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverManagerUnitTest.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverManagerUnitTest.java rename to jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverManagerUnitTest.java diff --git a/Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverUnitTest.java b/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverUnitTest.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverUnitTest.java rename to jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceDriverUnitTest.java diff --git a/Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceTestObjectUnitTest.java b/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceTestObjectUnitTest.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceTestObjectUnitTest.java rename to jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceTestObjectUnitTest.java diff --git a/Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUnitTest.java b/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUnitTest.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUnitTest.java rename to jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUnitTest.java diff --git a/Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUtilitiesUnitTest.java b/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUtilitiesUnitTest.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUtilitiesUnitTest.java rename to jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/WebServiceUtilitiesUnitTest.java diff --git a/Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/models/Product.java b/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/models/Product.java similarity index 100% rename from Framework/jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/models/Product.java rename to jmaqs-webservices-jdk8/src/test/java/com/magenic/jmaqs/webservices/jdk8/models/Product.java diff --git a/Framework/maqs_checks.xml b/maqs_checks.xml similarity index 100% rename from Framework/maqs_checks.xml rename to maqs_checks.xml diff --git a/Framework/maqs_formatter.xml b/maqs_formatter.xml similarity index 100% rename from Framework/maqs_formatter.xml rename to maqs_formatter.xml diff --git a/Framework/pom.xml b/pom.xml similarity index 100% rename from Framework/pom.xml rename to pom.xml