Skip to content

Commit 5de88bb

Browse files
cdalesscdaless
authored
Reorganizes project structure (#40)
1 parent cdfb4bb commit 5de88bb

File tree

59 files changed

+386
-223
lines changed

Some content is hidden

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

59 files changed

+386
-223
lines changed

‎mobile-integration-tests-new.iml‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
10+
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
11+
<excludeFolder url="file://$MODULE_DIR$/target" />
12+
</content>
13+
<orderEntry type="inheritedJdk" />
14+
<orderEntry type="sourceFolder" forTests="false" />
15+
<orderEntry type="library" name="Maven: com.github.aquality-automation:aquality-appium-mobile:2.2.0" level="project" />
16+
<orderEntry type="library" name="Maven: com.github.aquality-automation:aquality-selenium-core:1.0.1" level="project" />
17+
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
18+
<orderEntry type="library" name="Maven: com.google.inject:guice:4.2.2" level="project" />
19+
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
20+
<orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
21+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:3.141.59" level="project" />
22+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:3.141.59" level="project" />
23+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:3.141.59" level="project" />
24+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:3.141.59" level="project" />
25+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:3.141.59" level="project" />
26+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-opera-driver:3.141.59" level="project" />
27+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:3.141.59" level="project" />
28+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:3.141.59" level="project" />
29+
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.8.15" level="project" />
30+
<orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" />
31+
<orderEntry type="library" name="Maven: io.appium:java-client:7.3.0" level="project" />
32+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:3.141.59" level="project" />
33+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:3.141.59" level="project" />
34+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.9" level="project" />
35+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
36+
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
37+
<orderEntry type="library" name="Maven: cglib:cglib:3.2.12" level="project" />
38+
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.1" level="project" />
39+
<orderEntry type="library" name="Maven: commons-validator:commons-validator:1.6" level="project" />
40+
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
41+
<orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8.1" level="project" />
42+
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
43+
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.8.RELEASE" level="project" />
44+
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.8.RELEASE" level="project" />
45+
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.8.RELEASE" level="project" />
46+
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.8.RELEASE" level="project" />
47+
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.8.RELEASE" level="project" />
48+
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.8.RELEASE" level="project" />
49+
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.4" level="project" />
50+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
51+
<orderEntry type="library" name="Maven: org.reflections:reflections:0.9.12" level="project" />
52+
<orderEntry type="library" name="Maven: org.javassist:javassist:3.26.0-GA" level="project" />
53+
<orderEntry type="library" name="Maven: ru.yandex.qatools.ashot:ashot:1.5.4" level="project" />
54+
<orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
55+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.6.2" level="project" />
56+
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
57+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
58+
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.19.0" level="project" />
59+
<orderEntry type="library" scope="TEST" name="Maven: io.cucumber:cucumber-junit:5.7.0" level="project" />
60+
<orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
61+
<orderEntry type="library" name="Maven: io.cucumber:cucumber-core:5.7.0" level="project" />
62+
<orderEntry type="library" name="Maven: io.cucumber:cucumber-gherkin:5.7.0" level="project" />
63+
<orderEntry type="library" name="Maven: io.cucumber:cucumber-gherkin-vintage:5.7.0" level="project" />
64+
<orderEntry type="library" name="Maven: io.cucumber:tag-expressions:2.0.4" level="project" />
65+
<orderEntry type="library" name="Maven: io.cucumber:cucumber-expressions:8.3.1" level="project" />
66+
<orderEntry type="library" name="Maven: io.cucumber:datatable:3.3.1" level="project" />
67+
<orderEntry type="library" name="Maven: io.cucumber:cucumber-plugin:5.7.0" level="project" />
68+
<orderEntry type="library" name="Maven: io.cucumber:docstring:5.7.0" level="project" />
69+
<orderEntry type="library" name="Maven: io.cucumber:cucumber-java:5.7.0" level="project" />
70+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.34" level="project" />
71+
<orderEntry type="library" name="Maven: io.cucumber:cucumber-guice:5.7.0" level="project" />
72+
<orderEntry type="library" name="Maven: io.qameta.allure:allure-cucumber5-jvm:2.13.2" level="project" />
73+
<orderEntry type="library" name="Maven: io.qameta.allure:allure-java-commons:2.13.2" level="project" />
74+
<orderEntry type="library" name="Maven: io.qameta.allure:allure-model:2.13.2" level="project" />
75+
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.tika:tika-core:1.20" level="project" />
76+
<orderEntry type="library" scope="RUNTIME" name="Maven: org.jooq:joor-java-8:0.9.10" level="project" />
77+
<orderEntry type="library" scope="RUNTIME" name="Maven: io.cucumber:gherkin:5.1.0" level="project" />
78+
<orderEntry type="library" scope="RUNTIME" name="Maven: io.cucumber:gherkin-jvm-deps:1.0.4" level="project" />
79+
<orderEntry type="library" name="Maven: com.squareup.retrofit2:retrofit:2.9.0" level="project" />
80+
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
81+
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
82+
<orderEntry type="library" name="Maven: com.squareup.retrofit2:converter-jaxb:2.9.0" level="project" />
83+
<orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
84+
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.11" level="project" />
85+
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
86+
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
87+
<orderEntry type="library" scope="TEST" name="Maven: net.masterthought:cucumber-reporting:5.7.6" level="project" />
88+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2.2" level="project" />
89+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
90+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
91+
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
92+
<orderEntry type="library" scope="TEST" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
93+
<orderEntry type="library" scope="TEST" name="Maven: joda-time:joda-time:2.12.2" level="project" />
94+
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
95+
<orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-utils:3.5.1" level="project" />
96+
<orderEntry type="library" scope="TEST" name="Maven: org.jsoup:jsoup:1.16.1" level="project" />
97+
<orderEntry type="library" scope="TEST" name="Maven: com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20220608.1" level="project" />
98+
<orderEntry type="library" name="Maven: com.google.guava:guava:30.1-jre" level="project" />
99+
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
100+
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
101+
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
102+
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
103+
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
104+
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
105+
<orderEntry type="library" scope="TEST" name="Maven: commons-configuration:commons-configuration:1.10" level="project" />
106+
<orderEntry type="library" scope="TEST" name="Maven: commons-lang:commons-lang:2.6" level="project" />
107+
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
108+
<orderEntry type="library" name="Maven: com.github.aquality-automation:aquality-tracking-cucumber5-jvm:1.3.1" level="project" />
109+
<orderEntry type="library" name="Maven: com.github.aquality-automation:aquality-tracking-integrations-core:1.3.0" level="project" />
110+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.12" level="project" />
111+
</component>
112+
</module>

‎pom.xml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<version>1.0-SNAPSHOT</version>
1010

1111
<properties>
12-
<maven.compiler.source>11</maven.compiler.source>
13-
<maven.compiler.target>11</maven.compiler.target>
1412
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1513
<cucumber.version>5.7.0</cucumber.version>
1614
<allure.results.directory>target/allure-results</allure.results.directory>
@@ -21,13 +19,18 @@
2119
<plugin>
2220
<groupId>org.apache.maven.plugins</groupId>
2321
<artifactId>maven-compiler-plugin</artifactId>
24-
<version>3.8.1</version>
22+
<version>3.11.0</version>
2523
<configuration>
26-
<source>8</source>
27-
<target>8</target>
24+
<release>11</release>
25+
<annotationProcessorPaths>
26+
<path>
27+
<groupId>org.projectlombok</groupId>
28+
<artifactId>lombok</artifactId>
29+
<version>1.18.34</version>
30+
</path>
31+
</annotationProcessorPaths>
2832
</configuration>
2933
</plugin>
30-
3134
<plugin>
3235
<groupId>io.qameta.allure</groupId>
3336
<artifactId>allure-maven</artifactId>
@@ -45,6 +48,7 @@
4548
<parallel>methods</parallel>
4649
<threadCount>3</threadCount>
4750
<perCoreThreadCount>false</perCoreThreadCount>
51+
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
4852
</configuration>
4953
</plugin>
5054
</plugins>
@@ -97,9 +101,9 @@
97101
</dependency>
98102

99103
<dependency>
100-
<groupId>org.projectlombok</groupId>
104+
<groupId>org.projectlombok</groupId>
101105
<artifactId>lombok</artifactId>
102-
<version>1.18.16</version>
106+
<version>1.18.34</version>
103107
<scope>provided</scope>
104108
</dependency>
105109

‎src/main/java/enums/BookType.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package enums;
2+
3+
public enum BookType {
4+
EBOOK("ebook"),
5+
AUDIOBOOK("audiobook"),
6+
PDF("pdf");
7+
8+
private final String currentBookType;
9+
10+
BookType(String currentBookType) {
11+
this.currentBookType = currentBookType;
12+
}
13+
14+
public String getCurrentBookType() {
15+
return currentBookType;
16+
}
17+
public String getBookType() {
18+
return currentBookType;
19+
}
20+
}

‎src/main/java/enums/epub/TabsTocAndBookmarksEpub.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package enums.epub;
2+
3+
public enum TabsTocAndBookmarksEpub {
4+
TOC("Table of Contents", "toc"),
5+
BOOKMARKS("Bookmarks", "bookmarks");
6+
7+
private final String label;
8+
private final String id;
9+
10+
TabsTocAndBookmarksEpub(String label, String id) {
11+
this.label = label;
12+
this.id = id;
13+
}
14+
15+
public String getLabel() {
16+
return label;
17+
}
18+
19+
public String getId() {
20+
return id;
21+
}
22+
public String getValue() {
23+
return id;
24+
}
25+
}

‎src/main/java/enums/timeouts/AuthorizationTimeouts.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package enums.timeouts;
2+
3+
public enum AuthorizationTimeouts {
4+
LOGIN(5000, 10000),
5+
LOGOUT(1000, 2000),
6+
USER_LOGGED_OUT(1500, 3000);
7+
8+
private final int timeoutMs;
9+
private final int retryDelayMs;
10+
11+
AuthorizationTimeouts(int timeoutMs, int retryDelayMs) {
12+
this.timeoutMs = timeoutMs;
13+
this.retryDelayMs = retryDelayMs;
14+
}
15+
16+
public int getTimeoutMs() {
17+
return timeoutMs;
18+
}
19+
20+
public int getRetryDelayMs() {
21+
return retryDelayMs;
22+
}
23+
public int getTimeoutMillis() {
24+
return timeoutMs;
25+
}
26+
27+
public int getPollingMillis() {
28+
return retryDelayMs;
29+
}
30+
}

‎src/main/java/enums/timeouts/BooksTimeouts.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package enums.timeouts;
2+
3+
public enum BooksTimeouts {
4+
TIMEOUT_ONE(3000),
5+
TIMEOUT_TWO(5000),
6+
TIMEOUT_THREE(7000),
7+
TIMEOUT_BOOK_CHANGES_STATUS(10000);
8+
private final int timeoutMs;
9+
10+
BooksTimeouts(int timeoutMs) {
11+
this.timeoutMs = timeoutMs;
12+
}
13+
14+
public int getTimeoutMillis() {
15+
return timeoutMs;
16+
}
17+
18+
}

src/test/java/enums/timeouts/RestartAppTimeouts.java renamed to src/main/java/enums/timeouts/RestartAppTimeouts.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package enums.timeouts;
22

3-
import lombok.AllArgsConstructor;
4-
53
import java.time.Duration;
64

7-
@AllArgsConstructor
85
public enum RestartAppTimeouts {
96
TIMEOUT_RESTART_APPLICATION(Duration.ofMillis(2000));
107

118
private final Duration timeoutRestart;
129

13-
public Duration getTimeoutRestart(){
10+
RestartAppTimeouts(Duration timeoutRestart) {
11+
this.timeoutRestart = timeoutRestart;
12+
}
13+
14+
public Duration getTimeoutRestart() {
1415
return timeoutRestart;
1516
}
1617
}

src/test/java/framework/configuration/Credentials.java renamed to src/main/java/framework/configuration/Credentials.java

File renamed without changes.

src/test/java/framework/utilities/ScenarioContext.java renamed to src/main/java/framework/utilities/ScenarioContext.java

File renamed without changes.

‎src/main/java/framework/utilities/swipe/Direction.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package framework.utilities.swipe;
2+
3+
import org.openqa.selenium.Point;
4+
5+
public class Direction {
6+
private Point from;
7+
private Point to;
8+
9+
public Direction setFrom(Point from) {
10+
this.from = from;
11+
return this;
12+
}
13+
14+
public Direction setTo(Point to) {
15+
this.to = to;
16+
return this;
17+
}
18+
19+
public Point getFrom() {
20+
return from;
21+
}
22+
23+
public Point getTo() {
24+
return to;
25+
}
26+
}

0 commit comments

Comments
 (0)