diff --git a/.gitignore b/.gitignore index 42a5b13..b4e75d1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,5 @@ log/ target/ # Selenium Drivers -drivers/chromedriver* -drivers/firefox* - +selenium-tests/drivers/chromedriver* +selenium-tests/drivers/firefox* diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 0000000..c51edc7 --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,16 @@ + + + + testing-example-java + com.example + 1.0-SNAPSHOT + + 4.0.0 + common + 1.0-SNAPSHOT + + true + + \ No newline at end of file diff --git a/src/main/java/com/example/runner/ExampleRunner.java b/common/src/main/java/com/example/runner/ExampleRunner.java similarity index 100% rename from src/main/java/com/example/runner/ExampleRunner.java rename to common/src/main/java/com/example/runner/ExampleRunner.java diff --git a/src/main/java/com/example/utils/ProjectConfiguration.java b/common/src/main/java/com/example/utils/ProjectConfiguration.java similarity index 100% rename from src/main/java/com/example/utils/ProjectConfiguration.java rename to common/src/main/java/com/example/utils/ProjectConfiguration.java diff --git a/src/main/resources/log4j.properties b/common/src/main/resources/log4j.properties similarity index 100% rename from src/main/resources/log4j.properties rename to common/src/main/resources/log4j.properties diff --git a/common/src/main/resources/project.properties b/common/src/main/resources/project.properties new file mode 100644 index 0000000..40a4842 --- /dev/null +++ b/common/src/main/resources/project.properties @@ -0,0 +1 @@ +# Set of the project's properties diff --git a/pom.xml b/pom.xml index 70dd662..88a6dc4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,24 +3,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - testing-example-java + com.example testing-example-java + pom 1.0-SNAPSHOT - + + unit-tests + wsdl-tests + selenium-tests + common + Test Execution Results testng.xml false - - commons-cli commons-cli 1.2 - org.testng testng @@ -32,31 +35,21 @@ - junit junit 4.11 - org.hamcrest hamcrest-core 1.3 - log4j log4j 1.2.17 - - - org.seleniumhq.selenium - selenium-java - RELEASE - - org.uncommons reportng @@ -69,122 +62,87 @@ - com.google.inject guice 3.0 test - + + ru.yandex.qatools.allure + allure-testng-adaptor + 1.4.0 + + + junit + junit + + + - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - - false - ${reportngTitle} - - ${skipTests} - true - - ${testsuite} - - - - usedefaultlisteners - false - - - listener - org.uncommons.reportng.HTMLReporter, org.uncommons.reportng.JUnitXMLReporter - - - ${project.basedir} - ${project.basedir}/target/reports - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - UTF-8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - true - com.example.runner.ExampleRunner - - - - - - - org.jvnet.jax-ws-commons - jaxws-maven-plugin - 2.3 - - - weather - - wsimport - - - - http://www.webservicex.com/globalweather.asmx?WSDL - - ${basedir}/target/generated-sources/src/ - false - true - UTF-8 - - - - nde-discovery - - wsimport - - - - http://www.neighbourhood.statistics.gov.uk/NDE2/Disco?wsdl - - uk.neighbourhood.statistics.discovery - ${basedir}/target/generated-sources/src/ - - - - nde-delivery - - wsimport - - - - http://www.neighbourhood.statistics.gov.uk/NDE2/Deli?wsdl - - uk.neighbourhood.statistics.delivery - ${basedir}/target/generated-sources/src/ - - - - - - + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + + false + ${reportngTitle} + + ${skipTests} + true + + ${testsuite} + + + + usedefaultlisteners + false + + + listener + org.uncommons.reportng.HTMLReporter, org.uncommons.reportng.JUnitXMLReporter + + + ${project.basedir} + ${project.basedir}/target/reports + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + UTF-8 + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + com.example.runner.ExampleRunner + + + + + + + true + + + ru.yandex.qatools.allure + allure-maven-plugin + 2.0 + + + \ No newline at end of file diff --git a/drivers/README.md b/selenium-tests/drivers/README.md similarity index 100% rename from drivers/README.md rename to selenium-tests/drivers/README.md diff --git a/selenium-tests/pom.xml b/selenium-tests/pom.xml new file mode 100644 index 0000000..20f98f3 --- /dev/null +++ b/selenium-tests/pom.xml @@ -0,0 +1,25 @@ + + + + testing-example-java + com.example + 1.0-SNAPSHOT + + 4.0.0 + selenium-tests + 1.0-SNAPSHOT + + + com.example + common + 1.0-SNAPSHOT + + + org.seleniumhq.selenium + selenium-java + RELEASE + + + \ No newline at end of file diff --git a/src/main/java/com/example/selenium/common/BasicSeleniumTestCase.java b/selenium-tests/src/main/java/com/example/selenium/common/BasicSeleniumTestCase.java similarity index 100% rename from src/main/java/com/example/selenium/common/BasicSeleniumTestCase.java rename to selenium-tests/src/main/java/com/example/selenium/common/BasicSeleniumTestCase.java diff --git a/src/main/java/com/example/selenium/common/Page.java b/selenium-tests/src/main/java/com/example/selenium/common/Page.java similarity index 94% rename from src/main/java/com/example/selenium/common/Page.java rename to selenium-tests/src/main/java/com/example/selenium/common/Page.java index 562f00a..af8f02a 100644 --- a/src/main/java/com/example/selenium/common/Page.java +++ b/selenium-tests/src/main/java/com/example/selenium/common/Page.java @@ -86,6 +86,6 @@ public static void takeScreenshot(WebDriver driver) { } catch (IOException e) { e.printStackTrace(); } - Reporter.log("\"Screenshot\""); + Reporter.log("\"Screenshot\""); } } diff --git a/src/main/java/com/example/selenium/common/TakeScreenshotOnFailureListener.java b/selenium-tests/src/main/java/com/example/selenium/common/TakeScreenshotOnFailureListener.java similarity index 100% rename from src/main/java/com/example/selenium/common/TakeScreenshotOnFailureListener.java rename to selenium-tests/src/main/java/com/example/selenium/common/TakeScreenshotOnFailureListener.java diff --git a/src/main/java/com/example/selenium/jira/CommonPage.java b/selenium-tests/src/main/java/com/example/selenium/jira/CommonPage.java similarity index 100% rename from src/main/java/com/example/selenium/jira/CommonPage.java rename to selenium-tests/src/main/java/com/example/selenium/jira/CommonPage.java diff --git a/src/main/java/com/example/selenium/jira/CreateIssueDialog.java b/selenium-tests/src/main/java/com/example/selenium/jira/CreateIssueDialog.java similarity index 100% rename from src/main/java/com/example/selenium/jira/CreateIssueDialog.java rename to selenium-tests/src/main/java/com/example/selenium/jira/CreateIssueDialog.java diff --git a/src/main/java/com/example/selenium/jira/EditIssueDialog.java b/selenium-tests/src/main/java/com/example/selenium/jira/EditIssueDialog.java similarity index 100% rename from src/main/java/com/example/selenium/jira/EditIssueDialog.java rename to selenium-tests/src/main/java/com/example/selenium/jira/EditIssueDialog.java diff --git a/src/main/java/com/example/selenium/jira/IssuePage.java b/selenium-tests/src/main/java/com/example/selenium/jira/IssuePage.java similarity index 100% rename from src/main/java/com/example/selenium/jira/IssuePage.java rename to selenium-tests/src/main/java/com/example/selenium/jira/IssuePage.java diff --git a/src/main/java/com/example/selenium/jira/LoginPage.java b/selenium-tests/src/main/java/com/example/selenium/jira/LoginPage.java similarity index 100% rename from src/main/java/com/example/selenium/jira/LoginPage.java rename to selenium-tests/src/main/java/com/example/selenium/jira/LoginPage.java diff --git a/src/main/java/com/example/selenium/wikipedia/WikipediaArticlePage.java b/selenium-tests/src/main/java/com/example/selenium/wikipedia/WikipediaArticlePage.java similarity index 100% rename from src/main/java/com/example/selenium/wikipedia/WikipediaArticlePage.java rename to selenium-tests/src/main/java/com/example/selenium/wikipedia/WikipediaArticlePage.java diff --git a/src/main/java/com/example/selenium/wikipedia/WikipediaCommonPage.java b/selenium-tests/src/main/java/com/example/selenium/wikipedia/WikipediaCommonPage.java similarity index 100% rename from src/main/java/com/example/selenium/wikipedia/WikipediaCommonPage.java rename to selenium-tests/src/main/java/com/example/selenium/wikipedia/WikipediaCommonPage.java diff --git a/src/main/java/com/example/selenium/wikipedia/WikipediaMainPage.java b/selenium-tests/src/main/java/com/example/selenium/wikipedia/WikipediaMainPage.java similarity index 100% rename from src/main/java/com/example/selenium/wikipedia/WikipediaMainPage.java rename to selenium-tests/src/main/java/com/example/selenium/wikipedia/WikipediaMainPage.java diff --git a/selenium-tests/src/main/resources/log4j.properties b/selenium-tests/src/main/resources/log4j.properties new file mode 100644 index 0000000..393e087 --- /dev/null +++ b/selenium-tests/src/main/resources/log4j.properties @@ -0,0 +1,8 @@ +# Root logger option +log4j.rootLogger=INFO, stdout + +# Direct log messages to stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n \ No newline at end of file diff --git a/src/main/resources/project.properties b/selenium-tests/src/main/resources/project.properties similarity index 88% rename from src/main/resources/project.properties rename to selenium-tests/src/main/resources/project.properties index b96babd..0829448 100644 --- a/src/main/resources/project.properties +++ b/selenium-tests/src/main/resources/project.properties @@ -10,7 +10,7 @@ saucelabs.key= saucelabs.url=ondemand.saucelabs.com:80/wd/hub # Screenshot location -screenshots.directory.location=target/reports +screenshots.directory.location=target/reports/html # Jira user credentials jira.basic.url=https://jira.atlassian.com diff --git a/src/test/java/com/example/selenium/jira/JiraIssueCRUDTest.java b/selenium-tests/src/test/java/com/example/selenium/jira/JiraIssueCRUDTest.java similarity index 100% rename from src/test/java/com/example/selenium/jira/JiraIssueCRUDTest.java rename to selenium-tests/src/test/java/com/example/selenium/jira/JiraIssueCRUDTest.java diff --git a/src/test/java/com/example/selenium/wikipedia/WikipediaMainPageTest.java b/selenium-tests/src/test/java/com/example/selenium/wikipedia/WikipediaMainPageTest.java similarity index 100% rename from src/test/java/com/example/selenium/wikipedia/WikipediaMainPageTest.java rename to selenium-tests/src/test/java/com/example/selenium/wikipedia/WikipediaMainPageTest.java diff --git a/src/test/java/com/example/selenium/wikipedia/WikipediaSearchTest.java b/selenium-tests/src/test/java/com/example/selenium/wikipedia/WikipediaSearchTest.java similarity index 100% rename from src/test/java/com/example/selenium/wikipedia/WikipediaSearchTest.java rename to selenium-tests/src/test/java/com/example/selenium/wikipedia/WikipediaSearchTest.java diff --git a/testng-selenium-suites.xml b/selenium-tests/testng.xml similarity index 95% rename from testng-selenium-suites.xml rename to selenium-tests/testng.xml index eb28303..a6d835f 100644 --- a/testng-selenium-suites.xml +++ b/selenium-tests/testng.xml @@ -16,7 +16,7 @@ - + diff --git a/testng.xml b/testng.xml deleted file mode 100644 index 76506ad..0000000 --- a/testng.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/unit-tests/pom.xml b/unit-tests/pom.xml new file mode 100644 index 0000000..c6ff488 --- /dev/null +++ b/unit-tests/pom.xml @@ -0,0 +1,13 @@ + + + + testing-example-java + com.example + 1.0-SNAPSHOT + + 4.0.0 + unit-tests + 1.0-SNAPSHOT + \ No newline at end of file diff --git a/src/main/java/com/example/arrays/BasicInteractionWithArrays.java b/unit-tests/src/main/java/com/example/arrays/BasicInteractionWithArrays.java similarity index 100% rename from src/main/java/com/example/arrays/BasicInteractionWithArrays.java rename to unit-tests/src/main/java/com/example/arrays/BasicInteractionWithArrays.java diff --git a/src/test/java/com/example/arrays/BasicInteractionWithArraysTest.java b/unit-tests/src/test/java/com/example/arrays/BasicInteractionWithArraysTest.java similarity index 100% rename from src/test/java/com/example/arrays/BasicInteractionWithArraysTest.java rename to unit-tests/src/test/java/com/example/arrays/BasicInteractionWithArraysTest.java diff --git a/testng-unittests-suites.xml b/unit-tests/testng.xml similarity index 100% rename from testng-unittests-suites.xml rename to unit-tests/testng.xml diff --git a/wsdl-tests/pom.xml b/wsdl-tests/pom.xml new file mode 100644 index 0000000..6d3da3c --- /dev/null +++ b/wsdl-tests/pom.xml @@ -0,0 +1,68 @@ + + + + testing-example-java + com.example + 1.0-SNAPSHOT + + + false + + 4.0.0 + wsdl-tests + 1.0-SNAPSHOT + + + + org.jvnet.jax-ws-commons + jaxws-maven-plugin + 2.3 + + + weather + + wsimport + + + + http://www.webservicex.com/globalweather.asmx?WSDL + + ${basedir}/target/generated-sources/src/ + false + true + UTF-8 + + + + nde-discovery + + wsimport + + + + http://www.neighbourhood.statistics.gov.uk/NDE2/Disco?wsdl + + uk.neighbourhood.statistics.discovery + ${basedir}/target/generated-sources/src/ + + + + nde-delivery + + wsimport + + + + http://www.neighbourhood.statistics.gov.uk/NDE2/Deli?wsdl + + uk.neighbourhood.statistics.delivery + ${basedir}/target/generated-sources/src/ + + + + + + + \ No newline at end of file diff --git a/src/test/java/com/example/wsdl/globalweather/GlobalWeatherServiceTest.java b/wsdl-tests/src/test/java/com/example/wsdl/globalweather/GlobalWeatherServiceTest.java similarity index 100% rename from src/test/java/com/example/wsdl/globalweather/GlobalWeatherServiceTest.java rename to wsdl-tests/src/test/java/com/example/wsdl/globalweather/GlobalWeatherServiceTest.java diff --git a/src/test/java/com/example/wsdl/nde/NeighbourhoodStatisticsDeliveryTest.java b/wsdl-tests/src/test/java/com/example/wsdl/nde/NeighbourhoodStatisticsDeliveryTest.java similarity index 100% rename from src/test/java/com/example/wsdl/nde/NeighbourhoodStatisticsDeliveryTest.java rename to wsdl-tests/src/test/java/com/example/wsdl/nde/NeighbourhoodStatisticsDeliveryTest.java diff --git a/src/test/java/com/example/wsdl/nde/NeighbourhoodStatisticsDiscoveryTest.java b/wsdl-tests/src/test/java/com/example/wsdl/nde/NeighbourhoodStatisticsDiscoveryTest.java similarity index 100% rename from src/test/java/com/example/wsdl/nde/NeighbourhoodStatisticsDiscoveryTest.java rename to wsdl-tests/src/test/java/com/example/wsdl/nde/NeighbourhoodStatisticsDiscoveryTest.java diff --git a/testng-wsdl-suites.xml b/wsdl-tests/testng.xml similarity index 100% rename from testng-wsdl-suites.xml rename to wsdl-tests/testng.xml