Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Commit 4d4f4f1

Browse files
apegam-pvapegam-pv
committed
[jgitflow-maven-plugin] merging 'release/2.0.0' into 'master'
2 parents 2ddbc84 + 2a5caf3 commit 4d4f4f1

File tree

90 files changed

+1243
-1520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1243
-1520
lines changed

‎.travis.maven-settings.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<repository>
3333
<id>central</id>
34-
<url>http://repo1.maven.org/maven2/</url>
34+
<url>https://repo1.maven.org/maven2/</url>
3535
<layout>default</layout>
3636
<releases>
3737
<enabled>true</enabled>
@@ -57,7 +57,7 @@
5757

5858
<repository>
5959
<id>wcm-io-apache-intermediate-release</id>
60-
<url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
60+
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
6161
<layout>default</layout>
6262
<releases>
6363
<enabled>true</enabled>
@@ -83,7 +83,7 @@
8383

8484
<repository>
8585
<id>apache-snapshots</id>
86-
<url>http://repository.apache.org/snapshots</url>
86+
<url>https://repository.apache.org/snapshots</url>
8787
<layout>default</layout>
8888
<releases>
8989
<enabled>false</enabled>
@@ -100,7 +100,7 @@
100100

101101
<pluginRepository>
102102
<id>central</id>
103-
<url>http://repo1.maven.org/maven2/</url>
103+
<url>https://repo1.maven.org/maven2/</url>
104104
<layout>default</layout>
105105
<releases>
106106
<enabled>true</enabled>
@@ -126,7 +126,7 @@
126126

127127
<pluginRepository>
128128
<id>wcm-io-apache-intermediate-release</id>
129-
<url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
129+
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
130130
<layout>default</layout>
131131
<releases>
132132
<enabled>true</enabled>
@@ -152,7 +152,7 @@
152152

153153
<pluginRepository>
154154
<id>apache-snapshots</id>
155-
<url>http://repository.apache.org/snapshots</url>
155+
<url>https://repository.apache.org/snapshots</url>
156156
<layout>default</layout>
157157
<releases>
158158
<enabled>false</enabled>

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
language: java
2121

2222
jdk:
23-
- oraclejdk8
23+
- openjdk8
2424
- openjdk11
2525

2626
# Make sure travis can use container-based infrastructure

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<img src="http://wcm.io/images/[email protected]"/> Selenium Galen Integration
1+
<img src="https://wcm.io/images/[email protected]"/> Selenium Galen Integration
22
==========================
33
[![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)
44

@@ -7,5 +7,5 @@ This project is an attempt to integrate Galen with Selenium and the other way ar
77
To get an idea how it works, take a look at the [documentation].
88

99

10-
[documentation]: http://qa.wcm.io/galenium/
10+
[documentation]: https://qa.wcm.io/galenium/
1111

‎examples/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This project contains some examples for how to integrate Galenium into your proj
66
Run Example Project
77
-------------------
88

9-
[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.
9+
[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.
1010

1111
If you have that, you just run the Maven command:
1212

‎examples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<parent>
2424
<groupId>io.wcm.maven</groupId>
2525
<artifactId>io.wcm.maven.global-parent</artifactId>
26-
<version>25</version>
26+
<version>26</version>
2727
<relativePath />
2828
</parent>
2929

3030
<name>Galenium Examples</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.examples</artifactId>
3333
<packaging>pom</packaging>
34-
<version>1.0.0</version>
34+
<version>2.0.0</version>
3535
<description>Test automation examples.</description>
3636

3737
<properties>

‎examples/specs/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.integration.specs</artifactId>
26-
<version>1.0.0</version>
26+
<version>2.0.0</version>
2727
<relativePath>../../integration/specs</relativePath>
2828
</parent>
2929

3030
<name>Galenium Example Specs</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.examples.specs</artifactId>
3333
<packaging>jar</packaging>
34-
<version>1.0.0</version>
34+
<version>2.0.0</version>
3535
<description>Test automation example Galen specs.</description>
3636

3737
<properties>

‎examples/tests/pom.xml

+3-8
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.integration.ui-tests</artifactId>
26-
<version>1.0.0</version>
26+
<version>2.0.0</version>
2727
<relativePath>../../integration/ui-tests</relativePath>
2828
</parent>
2929

3030
<name>Galenium Example Tests</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.examples.tests</artifactId>
3333
<packaging>jar</packaging>
34-
<version>1.0.0</version>
34+
<version>2.0.0</version>
3535
<description>Test automation example tests.</description>
3636

3737
<properties>
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.wcm.qa</groupId>
4646
<artifactId>io.wcm.qa.galenium.examples.specs</artifactId>
47-
<version>1.0.0</version>
47+
<version>2.0.0</version>
4848
</dependency>
4949

5050
</dependencies>
@@ -97,11 +97,6 @@
9797
</configuration>
9898
</plugin>
9999

100-
<!-- Webdriver download -->
101-
<plugin>
102-
<groupId>com.lazerycode.selenium</groupId>
103-
<artifactId>driver-binary-downloader-maven-plugin</artifactId>
104-
</plugin>
105100

106101
</plugins>
107102
</build>

‎examples/tests/src/test/java/io/wcm/qa/galenium/example/ImageComparisonIT.java

+14-28
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,18 @@
2222
import org.testng.annotations.Factory;
2323
import org.testng.annotations.Test;
2424

25-
import com.galenframework.reports.model.LayoutReport;
26-
2725
import io.wcm.qa.galenium.device.TestDevice;
28-
import io.wcm.qa.galenium.differences.difference.BrowserDifference;
29-
import io.wcm.qa.galenium.differences.difference.ScreenWidthDifference;
26+
import io.wcm.qa.galenium.differences.difference.driver.BrowserDifference;
27+
import io.wcm.qa.galenium.differences.difference.driver.ScreenWidthDifference;
3028
import io.wcm.qa.galenium.example.selectors.common.Page;
3129
import io.wcm.qa.galenium.example.selectors.homepage.Stage;
32-
import io.wcm.qa.galenium.galen.GalenHelperUtil;
33-
import io.wcm.qa.galenium.galen.GalenLayoutChecker;
34-
import io.wcm.qa.galenium.imagecomparison.ImageComparisonSpecFactory;
35-
import io.wcm.qa.galenium.imagecomparison.ImageComparisonValidationListener;
3630
import io.wcm.qa.galenium.providers.TestDeviceProvider;
3731
import io.wcm.qa.galenium.selectors.base.Selector;
32+
import io.wcm.qa.galenium.verification.element.VisualVerification;
33+
import io.wcm.qa.galenium.verification.util.Check;
3834

3935
/**
40-
* Example of how to use the {@link ImageComparisonSpecFactory} to compare individual elements on a page.
36+
* Example of how to use the {@link VisualVerification} to compare individual elements on a page.
4137
*/
4238
public class ImageComparisonIT extends AbstractExampleBase {
4339

@@ -55,33 +51,23 @@ public void compareSomeImages() {
5551

5652
private void checkVisually(Selector selector) {
5753
// get factory for comparing element
58-
ImageComparisonSpecFactory factory = new ImageComparisonSpecFactory(selector);
54+
VisualVerification verification = new VisualVerification(selector);
5955

6056
// add a no tolerance check at warning level
61-
factory.setZeroToleranceWarning(true);
57+
verification.setZeroToleranceWarning(true);
58+
59+
// allow error percent
60+
verification.setAllowedErrorPercent(2.0);
6261

6362
// allow offset
64-
factory.setAllowedOffset(2);
63+
verification.setAllowedOffset(2);
6564

6665
// browser and viewport width will make a difference
67-
factory.addDifference(new BrowserDifference());
68-
factory.addDifference(new ScreenWidthDifference());
66+
verification.addDifference(new BrowserDifference());
67+
verification.addDifference(new ScreenWidthDifference());
6968

7069
// compare image using spec
71-
LayoutReport layoutReport = GalenLayoutChecker.checkLayout(
72-
"Image comparison stage",
73-
factory.getPageSpecInstance(),
74-
getDevice(),
75-
GalenHelperUtil.getSectionFilter(getDevice()),
76-
getValidationListener());
77-
String specName = "image_comparison_" + selector.elementName() + ".gspec";
78-
String errorMessage = "FAILED: Layoutcheck " + specName + " with device " + getDevice();
79-
String successMessage = "successfully ran spec: " + specName;
80-
GalenLayoutChecker.handleLayoutReport(layoutReport, errorMessage, successMessage);
81-
}
82-
83-
private ImageComparisonValidationListener getValidationListener() {
84-
return new ImageComparisonValidationListener();
70+
Check.verify(verification);
8571
}
8672

8773
@Override

‎examples/tests/src/test/java/io/wcm/qa/galenium/example/VerificationIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.testng.annotations.Test;
2626

2727
import io.wcm.qa.galenium.device.TestDevice;
28-
import io.wcm.qa.galenium.differences.difference.BrowserDifference;
29-
import io.wcm.qa.galenium.differences.difference.ScreenWidthDifference;
28+
import io.wcm.qa.galenium.differences.difference.driver.BrowserDifference;
29+
import io.wcm.qa.galenium.differences.difference.driver.ScreenWidthDifference;
3030
import io.wcm.qa.galenium.example.pageobjects.Homepage;
3131
import io.wcm.qa.galenium.example.selectors.common.Page;
3232
import io.wcm.qa.galenium.example.selectors.common.Page.Navigation;

‎examples/tests/src/test/resources/images/chrome/0400/stage.png

-913 Bytes
Loading

‎integration/pom.xml

+6-19
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<parent>
2323
<groupId>io.wcm.qa</groupId>
2424
<artifactId>io.wcm.qa.parent_toplevel</artifactId>
25-
<version>4</version>
25+
<version>5</version>
2626
<relativePath />
2727
</parent>
2828

2929
<name>Galenium Integration Parent</name>
3030
<groupId>io.wcm.qa</groupId>
3131
<artifactId>io.wcm.qa.galenium.integration</artifactId>
3232
<packaging>pom</packaging>
33-
<version>1.0.0</version>
33+
<version>2.0.0</version>
3434
<description>Test automation integration parent.</description>
3535

3636
<modules>
@@ -44,10 +44,6 @@
4444
<!-- activated with command line switch in local and CI scripts -->
4545
<integrationtests.skip>true</integrationtests.skip>
4646

47-
<!-- compiler settings (override for properties from io.wcm.maven.global-parent) -->
48-
<build.compiler.source>1.8</build.compiler.source>
49-
<build.compiler.target>1.8</build.compiler.target>
50-
5147
<!-- wcm.io QA -->
5248
<io.wcm.qa.baseUrl>http://localhost:4502/content/wcm-io-samples</io.wcm.qa.baseUrl>
5349

@@ -72,23 +68,14 @@
7268
<galenium.retryMax>0</galenium.retryMax>
7369
<galenium.sampling.image.directory.actual>${project.build.directory}/sampled/images</galenium.sampling.image.directory.actual>
7470
<galenium.sampling.image.directory.expected>${project.build.directory}/test-classes/images</galenium.sampling.image.directory.expected>
75-
<galenium.sampling.image.save>true</galenium.sampling.image.save>
7671
<galenium.sampling.text.directory.actual>${project.build.directory}/sampled/text</galenium.sampling.text.directory.actual>
7772
<galenium.sampling.text.directory.expected>${project.build.directory}/test-classes/text</galenium.sampling.text.directory.expected>
78-
<galenium.sampling.text.save>true</galenium.sampling.text.save>
7973
<galenium.sampling.text.file>expected.properties</galenium.sampling.text.file>
8074
<galenium.sampling.verification.ignoreErrors>false</galenium.sampling.verification.ignoreErrors>
8175
<galenium.screenshotOnSkipped>true</galenium.screenshotOnSkipped>
8276
<galenium.screenshotOnSuccess>true</galenium.screenshotOnSuccess>
8377
<galenium.specPath>${project.build.outputDirectory}/galen/specs</galenium.specPath>
8478
<galenium.webdriver.browser.loglevel>INFO</galenium.webdriver.browser.loglevel>
85-
<galenium.webdriver.download.binaries>${project.build.directory}/driverbinaries</galenium.webdriver.download.binaries>
86-
<galenium.webdriver.download.chrome.version>2.43</galenium.webdriver.download.chrome.version>
87-
<galenium.webdriver.download.firefox.version>0.23.0</galenium.webdriver.download.firefox.version>
88-
<galenium.webdriver.download.repository.folder>${galenium.resources.directory}/driverdownload</galenium.webdriver.download.repository.folder>
89-
<galenium.webdriver.download.repository.file>${galenium.browser}.xml</galenium.webdriver.download.repository.file>
90-
<galenium.webdriver.download.repositoryMap>${galenium.webdriver.download.repository.folder}/${galenium.webdriver.download.repository.file}</galenium.webdriver.download.repositoryMap>
91-
<galenium.webdriver.download.zips>${project.build.directory}/driverdownloadzips</galenium.webdriver.download.zips>
9279
<galenium.webdriver.timeout>5</galenium.webdriver.timeout>
9380

9481
<!-- Selenium -->
@@ -97,8 +84,6 @@
9784
<!-- Galen -->
9885
<galen.browser.screenshots.fullPage>false</galen.browser.screenshots.fullPage>
9986

100-
<!-- Webdriver download -->
101-
<com.lazerycode.selenium.driver-binary-downloader-maven-plugin>1.0.17</com.lazerycode.selenium.driver-binary-downloader-maven-plugin>
10287
</properties>
10388

10489
<dependencies>
@@ -107,7 +92,7 @@
10792
<dependency>
10893
<groupId>io.wcm.qa</groupId>
10994
<artifactId>io.wcm.qa.galenium.logging</artifactId>
110-
<version>1.0.0</version>
95+
<version>2.0.0</version>
11196
</dependency>
11297

11398
</dependencies>
@@ -120,6 +105,7 @@
120105
<plugin>
121106
<groupId>org.apache.maven.plugins</groupId>
122107
<artifactId>maven-dependency-plugin</artifactId>
108+
<version>3.1.1</version>
123109
<executions>
124110
<execution>
125111
<id>unpack-specs</id>
@@ -141,6 +127,7 @@
141127
<plugin>
142128
<groupId>org.apache.maven.plugins</groupId>
143129
<artifactId>maven-resources-plugin</artifactId>
130+
<version>3.1.0</version>
144131
<executions>
145132
<execution>
146133
<id>copy-specs</id>
@@ -187,7 +174,7 @@
187174
<plugin>
188175
<groupId>io.wcm.qa</groupId>
189176
<artifactId>io.wcm.qa.galenium.specs-maven-plugin</artifactId>
190-
<version>1.0.0</version>
177+
<version>2.0.0</version>
191178
<configuration>
192179
<packagePrefixSelectors>${galenium.generated.java.package.selectors}</packagePrefixSelectors>
193180
<packagePrefixSpecs>${galenium.generated.java.package.specs}</packagePrefixSpecs>

‎integration/resources/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<parent>
2424
<groupId>io.wcm.qa</groupId>
2525
<artifactId>io.wcm.qa.galenium.integration</artifactId>
26-
<version>1.0.0</version>
26+
<version>2.0.0</version>
2727
<relativePath>..</relativePath>
2828
</parent>
2929

3030
<name>Galenium Integration Resources</name>
3131
<groupId>io.wcm.qa</groupId>
3232
<artifactId>io.wcm.qa.galenium.integration.resources</artifactId>
3333
<packaging>jar</packaging>
34-
<version>1.0.0</version>
34+
<version>2.0.0</version>
3535
<description>Test automation integration resources.</description>
3636

3737
<build>

0 commit comments

Comments
 (0)