Update structure

Author: Pavel Anihimovsky

README.md

@@ -7,23 +7,24 @@ Template for [aquality-selenium-java](https://github.com/aquality-automation/aqu
 
 ### Project structure
 
-- **src/test/java/aquality/selenium/template/**
- - **configuration/**: classes that used to fetch project config from [src/test/resources/environment](./src/test/resources/environment) folder
- - **models/**: classes that represent data models of the application under the test (POJO classes) 
+- *aquality-selenium-template* - project related part with PageObjects, models and utilities
+ - **configuration/**: classes that used to fetch project config from [src/test/resources/environment](./aqulity-selenium-template/src/main/resources/environment) folder
  - **forms/**: Page Objects
- - **glue/**
-  - **hooks/**: Cucumber [hooks](https://cucumber.io/docs/cucumber/api/#hooks)
-  - **stepdefinitions/**: step definition classes
- - **transformations/**: Cucumber [data transformations](https://cucumber.io/docs/cucumber/configuration/)
+ - **models/**: classes that represent data models of the application under the test (POJO classes) 
+ - **utilities/**: util classes
+ - **src/test/resources/**: resource files such as configurations and test data
+- *aquality-selenium-template-cucumber* - Cucumber implementation of tests
  - **features/**: Cucumber feature files with test scenarios
+ - **hooks/**: Cucumber [hooks](https://cucumber.io/docs/cucumber/api/#hooks)
  - **runners/**: Cucumber test runners
-- **src/test/resources/**: resource files such as configurations and test data
+ - **stepdefinitions/**: step definition classes
+ - **transformations/**: Cucumber [data transformations](https://cucumber.io/docs/cucumber/configuration/)
 
 ### Configuration
 
-[settings.json](./src/test/resources/settings.json) file contains settings of Aquality Selenium library. Additional information you can find [here](https://github.com/aquality-automation/aquality-selenium-java/blob/master/Documentation.en.md).
+[settings.json](./aqulity-selenium-template/src/main/resources/settings.json) file contains settings of Aquality Selenium library. Additional information you can find [here](https://github.com/aquality-automation/aquality-selenium-java/blob/master/Documentation.en.md).
 
-[allure.properties](./src/test/resources/allure.properties) is a part of Allure Report configuration. See details [here](https://docs.qameta.io/allure/). 
+[allure.properties](./aqulity-selenium-template/src/main/resources/allure.properties) is a part of Allure Report configuration. See details [here](https://docs.qameta.io/allure/). 
 
 ### Tests execution
 
@@ -32,6 +33,6 @@ or with Maven command ```mvn clean test``` where you can specify all necessary a
 
 ### Reporting 
 
-Allure Framework is used as a reporting tool. Report data will be places in ```target/allure-results/``` folder (you can change it in [allure.properties](./src/test/resources/allure.properties) file).
+Allure Framework is used as a reporting tool. Report data will be places in ```target/allure-results/``` folder (you can change it in [allure.properties](./aqulity-selenium-template/src/main/resources/allure.properties) file).
 
 Run maven command ```mvn allure:serve``` to build and open report in web browser.

aquality-selenium-template-cucumber/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ 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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>aquality-selenium-template-project</artifactId>
+ <groupId>com.github.aquality-automation</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>aquality-selenium-template-cucumber</artifactId>
+
+ <properties>
+ <cucumber.version>4.8.1</cucumber.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.github.aquality-automation</groupId>
+ <artifactId>aquality-selenium-template</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-testng</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-java</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>

src/test/java/aquality/selenium/template/features/Demo.feature renamed to aquality-selenium-template-cucumber/src/test/java/aquality/selenium/template/cucumber/features/Demo.feature

@@ -1,4 +1,4 @@
-package aquality.selenium.template.glue.hooks;
+package aquality.selenium.template.cucumber.hooks;
 
 import aquality.selenium.browser.AqualityServices;
 import io.cucumber.java.After;

src/test/java/aquality/selenium/template/glue/hooks/BrowserHooks.java renamed to aquality-selenium-template-cucumber/src/test/java/aquality/selenium/template/cucumber/hooks/BrowserHooks.java

@@ -0,0 +1,16 @@
+package aquality.selenium.template.cucumber.hooks;
+
+import aquality.selenium.template.utilities.ScreenshotProvider;
+import io.cucumber.core.api.Scenario;
+import io.cucumber.java.After;
+
+public class ScreenshotHooks {
+
+ @After(order = 1)
+ public void takeScreenshot(Scenario scenario) {
+ if (scenario.isFailed()) {
+ ScreenshotProvider screenshotProvider = new ScreenshotProvider();
+ scenario.embed(screenshotProvider.takeScreenshot(), "image/png");
+ }
+ }
+}

aquality-selenium-template-cucumber/src/test/java/aquality/selenium/template/cucumber/hooks/ScreenshotHooks.java

@@ -1,12 +1,16 @@
-package aquality.selenium.template.runners;
+package aquality.selenium.template.cucumber.runners;
 
 import io.cucumber.testng.AbstractTestNGCucumberTests;
 import io.cucumber.testng.CucumberOptions;
 import org.testng.annotations.DataProvider;
 
 @CucumberOptions(
- features = {"src/test/java/aquality/selenium/template/features"},
- glue = {"aquality.selenium.template.glue"},
+ features = {"src/test/java/aquality/selenium/template/cucumber/features"},
+ glue = {
+ "aquality.selenium.template.cucumber.hooks",
+ "aquality.selenium.template.cucumber.transformations",
+ "aquality.selenium.template.cucumber.stepdefinitions"
+ },
  plugin = {"io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm"}
 )
 public class TestRunner extends AbstractTestNGCucumberTests {

src/test/java/aquality/selenium/template/runners/TestRunner.java renamed to aquality-selenium-template-cucumber/src/test/java/aquality/selenium/template/cucumber/runners/TestRunner.java

@@ -1,4 +1,4 @@
-package aquality.selenium.template.glue.stepdefinitions;
+package aquality.selenium.template.cucumber.stepdefinitions;
 
 import aquality.selenium.browser.AqualityServices;
 import aquality.selenium.template.configuration.Configuration;
@@ -21,7 +21,7 @@ public class DemoSteps {
 
  @Given("Main page is opened")
  public void mainPageIsOpened() {
- AqualityServices.getBrowser().goTo(Configuration.getCurrentEnvironment().getStartUrl());
+ AqualityServices.getBrowser().goTo(Configuration.getStartUrl());
  }
 
  @When("I open Contact us page")

src/test/java/aquality/selenium/template/glue/stepdefinitions/DemoSteps.java renamed to aquality-selenium-template-cucumber/src/test/java/aquality/selenium/template/cucumber/stepdefinitions/DemoSteps.java

@@ -1,6 +1,6 @@
-package aquality.selenium.template.glue.transformations;
+package aquality.selenium.template.cucumber.transformations;
 
-import aquality.selenium.template.glue.transformations.datatables.ContactUsTransformer;
+import aquality.selenium.template.cucumber.transformations.datatables.ContactUsTransformer;
 import aquality.selenium.template.models.ContactUsInfo;
 import io.cucumber.core.api.TypeRegistry;
 import io.cucumber.core.api.TypeRegistryConfigurer;

src/test/java/aquality/selenium/template/glue/transformations/TypeRegistryConfiguration.java renamed to aquality-selenium-template-cucumber/src/test/java/aquality/selenium/template/cucumber/transformations/TypeRegistryConfiguration.java

@@ -1,4 +1,4 @@
-package aquality.selenium.template.glue.transformations.datatables;
+package aquality.selenium.template.cucumber.transformations.datatables;
 
 import aquality.selenium.template.models.ContactUsInfo;
 import io.cucumber.datatable.DataTable;

src/test/java/aquality/selenium/template/glue/transformations/datatables/ContactUsTransformer.java renamed to aquality-selenium-template-cucumber/src/test/java/aquality/selenium/template/cucumber/transformations/datatables/ContactUsTransformer.java

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ 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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>aquality-selenium-template-project</artifactId>
+ <groupId>com.github.aquality-automation</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>aquality-selenium-template</artifactId>
+</project>