Skip to content

Commit 4988a76

Browse files
committed
reference aquality.selenium.
update appium version. removed copypasted classes, referenced from aquality.selenium
1 parent e662d48 commit 4988a76

31 files changed

+40
-643
lines changed

pom.xml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,14 @@
2121
</build>
2222
<dependencies>
2323
<dependency>
24-
<groupId>com.fasterxml.jackson.core</groupId>
25-
<artifactId>jackson-databind</artifactId>
26-
<version>2.9.9</version>
27-
</dependency>
28-
<dependency>
29-
<groupId>log4j</groupId>
30-
<artifactId>log4j</artifactId>
31-
<version>1.2.17</version>
24+
<groupId>com.github.aquality-automation</groupId>
25+
<artifactId>aquality-selenium</artifactId>
26+
<version>LATEST</version>
3227
</dependency>
3328
<dependency>
3429
<groupId>io.appium</groupId>
3530
<artifactId>java-client</artifactId>
36-
<version>5.0.0-BETA6</version>
31+
<version>7.2.0</version>
3732
</dependency>
3833
<dependency>
3934
<groupId>org.testng</groupId>

src/main/java/aquality/appium/application/Application.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package aquality.appium.application;
22

33
import aquality.appium.configuration.IConfiguration;
4-
import aquality.appium.configuration.ITimeoutConfiguration;
5-
import aquality.appium.logger.Logger;
4+
import aquality.selenium.configuration.ITimeoutConfiguration;
5+
import aquality.selenium.localization.LocalizationManager;
6+
import aquality.selenium.logger.Logger;
67
import io.appium.java_client.AppiumDriver;
78
import org.openqa.selenium.remote.service.DriverService;
89

@@ -62,7 +63,7 @@ public final PlatformName getPlatformName() {
6263
}
6364

6465
public void quit() {
65-
// todo: logger.info(getLocManager().getValue("loc.browser.driver.quit"));
66+
logger.info(LocalizationManager.getInstance().getValue("loc.browser.driver.quit"));
6667
if (getDriver() != null) {
6768
getDriver().quit();
6869
}

src/main/java/aquality/appium/application/ApplicationFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package aquality.appium.application;
22

33
import aquality.appium.configuration.IConfiguration;
4-
import aquality.appium.localization.LocalizationManager;
5-
import aquality.appium.logger.Logger;
4+
import aquality.selenium.localization.LocalizationManager;
5+
import aquality.selenium.logger.Logger;
66
import io.appium.java_client.AppiumDriver;
77
import io.appium.java_client.android.AndroidDriver;
88
import io.appium.java_client.ios.IOSDriver;

src/main/java/aquality/appium/application/RemoteApplicationFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import aquality.appium.configuration.IApplicationProfile;
44
import aquality.appium.configuration.IConfiguration;
5-
import aquality.appium.localization.LocalizationManager;
6-
import aquality.appium.logger.Logger;
5+
import aquality.selenium.localization.LocalizationManager;
6+
import aquality.selenium.logger.Logger;
77
import io.appium.java_client.AppiumDriver;
88
import org.openqa.selenium.remote.LocalFileDetector;
99

src/main/java/aquality/appium/configuration/ApplicationProfile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import aquality.appium.configuration.driversettings.IDriverSettings;
66
import aquality.appium.configuration.driversettings.IOSSettings;
77
import aquality.appium.configuration.driversettings.WindowsSettings;
8-
import aquality.appium.utils.JsonFile;
8+
import aquality.selenium.utils.JsonFile;
99
import org.openqa.selenium.InvalidArgumentException;
1010

1111
import java.net.MalformedURLException;

src/main/java/aquality/appium/configuration/Configuration.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package aquality.appium.configuration;
22

3-
import aquality.appium.utils.JsonFile;
4-
5-
import java.io.IOException;
6-
import java.io.UncheckedIOException;
3+
import aquality.selenium.configuration.*;
4+
import aquality.selenium.utils.JsonFile;
75

86
public class Configuration implements IConfiguration{
97

@@ -47,10 +45,6 @@ public ILoggerConfiguration getLoggerConfiguration() {
4745

4846
private JsonFile getSettings() {
4947
String settingsProfile = System.getProperty("profile") == null ? "settings.json" : "settings." + System.getProperty("profile") + ".json";
50-
try{
51-
return new JsonFile(settingsProfile);
52-
}catch (IOException e){
53-
throw new UncheckedIOException(String.format("Browser profile assigned in file %1$s was not found in the root of resources directory", settingsProfile), e);
54-
}
48+
return new JsonFile(settingsProfile);
5549
}
5650
}

src/main/java/aquality/appium/configuration/IConfiguration.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package aquality.appium.configuration;
22

3+
import aquality.selenium.configuration.ILoggerConfiguration;
4+
import aquality.selenium.configuration.IRetryConfiguration;
5+
import aquality.selenium.configuration.ITimeoutConfiguration;
6+
37
public interface IConfiguration {
48

59
IApplicationProfile getApplicationProfile();

src/main/java/aquality/appium/configuration/ILoggerConfiguration.java

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/main/java/aquality/appium/configuration/IRetryConfiguration.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/main/java/aquality/appium/configuration/ITimeoutConfiguration.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)