[jgitflow-maven-plugin] merging 'release/2.0.0' into 'master'

wcm-io-qa · Jul 17, 2019 · 4d4f4f1 · 4d4f4f1
2 parents 2ddbc84 + 2a5caf3
commit 4d4f4f1
Show file tree

Hide file tree

Showing 90 changed files with 1,243 additions and 1,520 deletions.
diff --git a/.travis.maven-settings.xml b/.travis.maven-settings.xml
@@ -31,7 +31,7 @@
 
         <repository>
           <id>central</id>
-          <url>http://repo1.maven.org/maven2/</url>
+          <url>https://repo1.maven.org/maven2/</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
@@ -57,7 +57,7 @@
 
         <repository>
           <id>wcm-io-apache-intermediate-release</id>
-          <url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
+          <url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
@@ -83,7 +83,7 @@
 
         <repository>
           <id>apache-snapshots</id>
-          <url>http://repository.apache.org/snapshots</url>
+          <url>https://repository.apache.org/snapshots</url>
           <layout>default</layout>
           <releases>
             <enabled>false</enabled>
@@ -100,7 +100,7 @@
 
         <pluginRepository>
           <id>central</id>
-          <url>http://repo1.maven.org/maven2/</url>
+          <url>https://repo1.maven.org/maven2/</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
@@ -126,7 +126,7 @@
 
         <pluginRepository>
           <id>wcm-io-apache-intermediate-release</id>
-          <url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
+          <url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
@@ -152,7 +152,7 @@
 
         <pluginRepository>
           <id>apache-snapshots</id>
-          <url>http://repository.apache.org/snapshots</url>
+          <url>https://repository.apache.org/snapshots</url>
           <layout>default</layout>
           <releases>
             <enabled>false</enabled>

diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@
 language: java
 
 jdk:
-- oraclejdk8
+- openjdk8
 - openjdk11
 
 # Make sure travis can use container-based infrastructure

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<img src="http://wcm.io/images/favicon-16@2x.png"/> Selenium Galen Integration
+<img src="https://wcm.io/images/favicon-16@2x.png"/> Selenium Galen Integration
 ==========================
 [![Build Status](https://travis-ci.org/wcm-io-qa/wcm-io-qa-galenium.png?branch=develop)](https://travis-ci.org/wcm-io-qa/wcm-io-qa-galenium) 
 
@@ -7,5 +7,5 @@ This project is an attempt to integrate Galen with Selenium and the other way ar
 To get an idea how it works, take a look at the [documentation].
 
 
-[documentation]: http://qa.wcm.io/galenium/
+[documentation]: https://qa.wcm.io/galenium/
 
diff --git a/examples/README.md b/examples/README.md
@@ -6,7 +6,7 @@ This project contains some examples for how to integrate Galenium into your proj
 Run Example Project
 -------------------
 
-[wcm-io-sample](http://wcm.io/samples/) has to be deployed to an AEM instance running on *localhost* on port *4502* and you need to have Chrome installed.
+[wcm-io-sample](https://wcm.io/samples/) has to be deployed to an AEM instance running on *localhost* on port *4502* and you need to have Chrome installed.
 
 If you have that, you just run the Maven command:
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -23,15 +23,15 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>25</version>
+    <version>26</version>
     <relativePath />
   </parent>
 
   <name>Galenium Examples</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.examples</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version>
+  <version>2.0.0</version>
   <description>Test automation examples.</description>
 
   <properties>

diff --git a/examples/specs/pom.xml b/examples/specs/pom.xml
@@ -23,15 +23,15 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration.specs</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
     <relativePath>../../integration/specs</relativePath>
   </parent>
 
   <name>Galenium Example Specs</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.examples.specs</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0</version>
+  <version>2.0.0</version>
   <description>Test automation example Galen specs.</description>
 
   <properties>

diff --git a/examples/tests/pom.xml b/examples/tests/pom.xml
@@ -23,15 +23,15 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration.ui-tests</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
     <relativePath>../../integration/ui-tests</relativePath>
   </parent>
 
   <name>Galenium Example Tests</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.examples.tests</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0</version>
+  <version>2.0.0</version>
   <description>Test automation example tests.</description>
 
   <properties>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.examples.specs</artifactId>
-      <version>1.0.0</version>
+      <version>2.0.0</version>
     </dependency>
 
   </dependencies>
@@ -97,11 +97,6 @@
             </configuration>
           </plugin>
 
-          <!-- Webdriver download -->
-          <plugin>
-            <groupId>com.lazerycode.selenium</groupId>
-            <artifactId>driver-binary-downloader-maven-plugin</artifactId>
-          </plugin>
 
         </plugins>
       </build>

diff --git a/examples/tests/src/test/java/io/wcm/qa/galenium/example/ImageComparisonIT.java b/examples/tests/src/test/java/io/wcm/qa/galenium/example/ImageComparisonIT.java
@@ -22,22 +22,18 @@
 import org.testng.annotations.Factory;
 import org.testng.annotations.Test;
 
-import com.galenframework.reports.model.LayoutReport;
-
 import io.wcm.qa.galenium.device.TestDevice;
-import io.wcm.qa.galenium.differences.difference.BrowserDifference;
-import io.wcm.qa.galenium.differences.difference.ScreenWidthDifference;
+import io.wcm.qa.galenium.differences.difference.driver.BrowserDifference;
+import io.wcm.qa.galenium.differences.difference.driver.ScreenWidthDifference;
 import io.wcm.qa.galenium.example.selectors.common.Page;
 import io.wcm.qa.galenium.example.selectors.homepage.Stage;
-import io.wcm.qa.galenium.galen.GalenHelperUtil;
-import io.wcm.qa.galenium.galen.GalenLayoutChecker;
-import io.wcm.qa.galenium.imagecomparison.ImageComparisonSpecFactory;
-import io.wcm.qa.galenium.imagecomparison.ImageComparisonValidationListener;
 import io.wcm.qa.galenium.providers.TestDeviceProvider;
 import io.wcm.qa.galenium.selectors.base.Selector;
+import io.wcm.qa.galenium.verification.element.VisualVerification;
+import io.wcm.qa.galenium.verification.util.Check;
 
 /**
- * Example of how to use the {@link ImageComparisonSpecFactory} to compare individual elements on a page.
+ * Example of how to use the {@link VisualVerification} to compare individual elements on a page.
  */
 public class ImageComparisonIT extends AbstractExampleBase {
 
@@ -55,33 +51,23 @@ public void compareSomeImages() {
 
   private void checkVisually(Selector selector) {
     // get factory for comparing element
-    ImageComparisonSpecFactory factory = new ImageComparisonSpecFactory(selector);
+    VisualVerification verification = new VisualVerification(selector);
 
     // add a no tolerance check at warning level
-    factory.setZeroToleranceWarning(true);
+    verification.setZeroToleranceWarning(true);
+
+    // allow error percent
+    verification.setAllowedErrorPercent(2.0);
 
     // allow offset
-    factory.setAllowedOffset(2);
+    verification.setAllowedOffset(2);
 
     // browser and viewport width will make a difference
-    factory.addDifference(new BrowserDifference());
-    factory.addDifference(new ScreenWidthDifference());
+    verification.addDifference(new BrowserDifference());
+    verification.addDifference(new ScreenWidthDifference());
 
     // compare image using spec
-    LayoutReport layoutReport = GalenLayoutChecker.checkLayout(
-        "Image comparison stage",
-        factory.getPageSpecInstance(),
-        getDevice(),
-        GalenHelperUtil.getSectionFilter(getDevice()),
-        getValidationListener());
-    String specName = "image_comparison_" + selector.elementName() + ".gspec";
-    String errorMessage = "FAILED: Layoutcheck " + specName + " with device " + getDevice();
-    String successMessage = "successfully ran spec: " + specName;
-    GalenLayoutChecker.handleLayoutReport(layoutReport, errorMessage, successMessage);
-  }
-
-  private ImageComparisonValidationListener getValidationListener() {
-    return new ImageComparisonValidationListener();
+    Check.verify(verification);
   }
 
   @Override

diff --git a/examples/tests/src/test/java/io/wcm/qa/galenium/example/VerificationIT.java b/examples/tests/src/test/java/io/wcm/qa/galenium/example/VerificationIT.java
@@ -25,8 +25,8 @@
 import org.testng.annotations.Test;
 
 import io.wcm.qa.galenium.device.TestDevice;
-import io.wcm.qa.galenium.differences.difference.BrowserDifference;
-import io.wcm.qa.galenium.differences.difference.ScreenWidthDifference;
+import io.wcm.qa.galenium.differences.difference.driver.BrowserDifference;
+import io.wcm.qa.galenium.differences.difference.driver.ScreenWidthDifference;
 import io.wcm.qa.galenium.example.pageobjects.Homepage;
 import io.wcm.qa.galenium.example.selectors.common.Page;
 import io.wcm.qa.galenium.example.selectors.common.Page.Navigation;

diff --git a/examples/tests/src/test/resources/images/chrome/0400/stage.png b/examples/tests/src/test/resources/images/chrome/0400/stage.png
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -22,15 +22,15 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.parent_toplevel</artifactId>
-    <version>4</version>
+    <version>5</version>
     <relativePath />
   </parent>
 
   <name>Galenium Integration Parent</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.integration</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version>
+  <version>2.0.0</version>
   <description>Test automation integration parent.</description>
 
   <modules>
@@ -44,10 +44,6 @@
     <!-- activated with command line switch in local and CI scripts -->
     <integrationtests.skip>true</integrationtests.skip>
 
-    <!-- compiler settings (override for properties from io.wcm.maven.global-parent) -->
-    <build.compiler.source>1.8</build.compiler.source>
-    <build.compiler.target>1.8</build.compiler.target>
-
     <!-- wcm.io QA -->
     <io.wcm.qa.baseUrl>http://localhost:4502/content/wcm-io-samples</io.wcm.qa.baseUrl>
 
@@ -72,23 +68,14 @@
     <galenium.retryMax>0</galenium.retryMax>
     <galenium.sampling.image.directory.actual>${project.build.directory}/sampled/images</galenium.sampling.image.directory.actual>
     <galenium.sampling.image.directory.expected>${project.build.directory}/test-classes/images</galenium.sampling.image.directory.expected>
-    <galenium.sampling.image.save>true</galenium.sampling.image.save>
     <galenium.sampling.text.directory.actual>${project.build.directory}/sampled/text</galenium.sampling.text.directory.actual>
     <galenium.sampling.text.directory.expected>${project.build.directory}/test-classes/text</galenium.sampling.text.directory.expected>
-    <galenium.sampling.text.save>true</galenium.sampling.text.save>
     <galenium.sampling.text.file>expected.properties</galenium.sampling.text.file>
     <galenium.sampling.verification.ignoreErrors>false</galenium.sampling.verification.ignoreErrors>
     <galenium.screenshotOnSkipped>true</galenium.screenshotOnSkipped>
     <galenium.screenshotOnSuccess>true</galenium.screenshotOnSuccess>
     <galenium.specPath>${project.build.outputDirectory}/galen/specs</galenium.specPath>
     <galenium.webdriver.browser.loglevel>INFO</galenium.webdriver.browser.loglevel>
-    <galenium.webdriver.download.binaries>${project.build.directory}/driverbinaries</galenium.webdriver.download.binaries>
-    <galenium.webdriver.download.chrome.version>2.43</galenium.webdriver.download.chrome.version>
-    <galenium.webdriver.download.firefox.version>0.23.0</galenium.webdriver.download.firefox.version>
-    <galenium.webdriver.download.repository.folder>${galenium.resources.directory}/driverdownload</galenium.webdriver.download.repository.folder>
-    <galenium.webdriver.download.repository.file>${galenium.browser}.xml</galenium.webdriver.download.repository.file>
-    <galenium.webdriver.download.repositoryMap>${galenium.webdriver.download.repository.folder}/${galenium.webdriver.download.repository.file}</galenium.webdriver.download.repositoryMap>
-    <galenium.webdriver.download.zips>${project.build.directory}/driverdownloadzips</galenium.webdriver.download.zips>
     <galenium.webdriver.timeout>5</galenium.webdriver.timeout>
 
     <!-- Selenium -->
@@ -97,8 +84,6 @@
     <!-- Galen -->
     <galen.browser.screenshots.fullPage>false</galen.browser.screenshots.fullPage>
 
-    <!-- Webdriver download -->
-    <com.lazerycode.selenium.driver-binary-downloader-maven-plugin>1.0.17</com.lazerycode.selenium.driver-binary-downloader-maven-plugin>
   </properties>
 
   <dependencies>
@@ -107,7 +92,7 @@
     <dependency>
       <groupId>io.wcm.qa</groupId>
       <artifactId>io.wcm.qa.galenium.logging</artifactId>
-      <version>1.0.0</version>
+      <version>2.0.0</version>
     </dependency>
 
   </dependencies>
@@ -120,6 +105,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
+          <version>3.1.1</version>
           <executions>
             <execution>
               <id>unpack-specs</id>
@@ -141,6 +127,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
+          <version>3.1.0</version>
           <executions>
             <execution>
               <id>copy-specs</id>
@@ -187,7 +174,7 @@
         <plugin>
           <groupId>io.wcm.qa</groupId>
           <artifactId>io.wcm.qa.galenium.specs-maven-plugin</artifactId>
-          <version>1.0.0</version>
+          <version>2.0.0</version>
           <configuration>
             <packagePrefixSelectors>${galenium.generated.java.package.selectors}</packagePrefixSelectors>
             <packagePrefixSpecs>${galenium.generated.java.package.specs}</packagePrefixSpecs>

diff --git a/integration/resources/pom.xml b/integration/resources/pom.xml
@@ -23,15 +23,15 @@
   <parent>
     <groupId>io.wcm.qa</groupId>
     <artifactId>io.wcm.qa.galenium.integration</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
     <relativePath>..</relativePath>
   </parent>
 
   <name>Galenium Integration Resources</name>
   <groupId>io.wcm.qa</groupId>
   <artifactId>io.wcm.qa.galenium.integration.resources</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0</version>
+  <version>2.0.0</version>
   <description>Test automation integration resources.</description>
 
   <build>