Skip to content

Commit 42427eb

Browse files
committed
Upgraded versions.
1 parent dd0af2c commit 42427eb

File tree

8 files changed

+23
-76
lines changed

8 files changed

+23
-76
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# selenium-java-pom-example
22

3-
This example currently supports Linux and Windows, both with Java 8 and above. Maven and Chrome browser are also required.
3+
This example currently supports Linux and Windows, both with Java 12 and above. Maven and Chrome browser are also required.
44

55
To run on Windows or Linux, simply clone the repository and from root project diectory run:
66
```

pom.xml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.github.automatedowl</groupId>
77
<artifactId>selenium-java-pom-example</artifactId>
8-
<version>1.0.3</version>
8+
<version>1.0.4</version>
99
<properties>
1010
<aspectj.version>1.9.1</aspectj.version>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -21,23 +21,23 @@
2121
<version>3.0.0-M3</version>
2222
<configuration>
2323
<suiteXmlFiles>
24-
<suiteXmlFile>default_tests.xml</suiteXmlFile>
24+
<suiteXmlFile>suites/e2e_tests.xml</suiteXmlFile>
2525
</suiteXmlFiles>
2626
<argLine>
2727
-javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
2828
</argLine>
29-
<forkCount>3</forkCount>
29+
<forkCount>1</forkCount>
3030
<reuseForks>true</reuseForks>
3131
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
3232
</configuration>
3333
</plugin>
3434
<plugin>
3535
<groupId>org.apache.maven.plugins</groupId>
3636
<artifactId>maven-compiler-plugin</artifactId>
37-
<version>3.8.0</version>
37+
<version>3.8.1</version>
3838
<configuration>
39-
<source>1.8</source>
40-
<target>1.8</target>
39+
<source>12</source>
40+
<target>12</target>
4141
</configuration>
4242
</plugin>
4343
</plugins>
@@ -47,12 +47,12 @@
4747
<dependency>
4848
<groupId>io.qameta.allure</groupId>
4949
<artifactId>allure-testng</artifactId>
50-
<version>2.8.1</version>
50+
<version>2.13.0</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.testng</groupId>
5454
<artifactId>testng</artifactId>
55-
<version>6.14.3</version>
55+
<version>7.0.0</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>javax.xml.bind</groupId>
@@ -75,17 +75,4 @@
7575
<version>3.6.0</version>
7676
</dependency>
7777
</dependencies>
78-
<reporting>
79-
<excludeDefaults>true</excludeDefaults>
80-
<plugins>
81-
<plugin>
82-
<groupId>io.qameta.allure</groupId>
83-
<artifactId>allure-maven</artifactId>
84-
<configuration>
85-
<reportVersion>2.8.1</reportVersion>
86-
</configuration>
87-
<version>2.9</version>
88-
</plugin>
89-
</plugins>
90-
</reporting>
9178
</project>

src/main/java/com/github/automatedowl/examples/drivers/DriverModule.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.google.inject.AbstractModule;
44
import io.github.bonigarcia.wdm.WebDriverManager;
5-
import org.apache.tika.utils.SystemUtils;
65
import org.openqa.selenium.WebDriver;
76
import org.openqa.selenium.chrome.ChromeDriver;
87

src/main/java/com/github/automatedowl/examples/drivers/ThreadLocalDriver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ public class ThreadLocalDriver {
99
private static ThreadLocal<WebDriver> driver = new ThreadLocal<>();
1010

1111
public ThreadLocalDriver() {
12-
Injector i = Guice.createInjector(new DriverModule());
13-
driver.set(i.getInstance(WebDriver.class));
12+
Injector injector = Guice.createInjector(new DriverModule());
13+
driver.set(injector.getInstance(WebDriver.class));
1414
}
1515

1616
public WebDriver getDriver() {

src/main/java/com/github/automatedowl/examples/pages/Site88Page.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.automatedowl.examples;
1+
package com.github.automatedowl.examples.pages;
22

33
import java.util.List;
44
import org.openqa.selenium.By;
@@ -13,7 +13,7 @@ public class Site88Page {
1313
/** Default timeout of waiting for web elements in the page. */
1414
private final int DEFAULT_ELEMENT_TIMEOUT = 30;
1515
private final String XPATH_CHILD_ELEMENTS_LOCATOR = ".//*";
16-
private final String URL = "http://testjs.site88.net";
16+
private final String URL = "https://testjs2.000webhostapp.com/";
1717

1818
/////////////////////////////////////////////////////////////////////////////////
1919
/////////////////////////////// Constructor /////////////////////////////////////
Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
package com.github.automatedowl.examples.drivers;
1+
package com.github.automatedowl.examples.pages;
22

3-
import com.google.inject.Guice;
4-
import com.google.inject.Injector;
53
import org.openqa.selenium.WebDriver;
64

7-
public class ThreadLocalDriver {
5+
public class Site88PageThreadLocal {
86

9-
private static ThreadLocal<WebDriver> driver = new ThreadLocal<>();
7+
private static ThreadLocal<Site88Page> site88Page = new ThreadLocal<>();
108

11-
public ThreadLocalDriver() {
12-
Injector i = Guice.createInjector(new DriverModule());
13-
driver.set(i.getInstance(WebDriver.class));
9+
public Site88PageThreadLocal(WebDriver driver) {
10+
site88Page.set(new Site88Page(driver));
1411
}
1512

16-
public WebDriver getDriver() {
17-
return this.driver.get();
13+
public Site88Page getSite88Page() {
14+
return this.site88Page.get();
1815
}
1916
}

src/test/java/com/github/automatedowl/examples/tests/WebHostTests.java

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ public class WebHostTests extends WebHostTestCase {
88
@Test
99
public void site88Test() throws InterruptedException {
1010

11-
System.out.println("Running site88Test");
12-
13-
System.out.println(getDriver().equals(null));
14-
15-
System.out.println(site88Page.equals(null));
16-
17-
System.out.println(site88Page.getSite88Page().equals(null));
18-
1911
// Navigate to URL.
2012
getDriver().get(site88Page.getSite88Page().getURL());
2113

@@ -25,32 +17,4 @@ public void site88Test() throws InterruptedException {
2517
// Wait before closing browser..
2618
waitBeforeClosingBrowser();
2719
}
28-
/*
29-
@Test
30-
public void failureTest() throws InterruptedException {
31-
for (int i = 0; i < 10; i++) {
32-
try {
33-
Thread.sleep(1000);
34-
} catch (InterruptedException e) {
35-
e.printStackTrace();
36-
}
37-
System.out.println("TEST 2");
38-
}
39-
// Assert failure.
40-
Assert.assertTrue(false);
41-
}*/
42-
43-
@Test(enabled = false)
44-
public void failureTwoTest() throws InterruptedException {
45-
for (int i = 0; i < 10; i++) {
46-
try {
47-
Thread.sleep(1000);
48-
} catch (InterruptedException e) {
49-
e.printStackTrace();
50-
}
51-
System.out.println("TEST 2");
52-
}
53-
// Assert failure.
54-
Assert.assertTrue(false);
55-
}
5620
}

suites/e2e_tests.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
3-
<suite name="Suite">
4-
<test name="Test" time-out="3600000" parallel="methods" thread-count="2">
3+
<suite name="E2E Suite">
4+
<test name="E2E Test" >
55
<classes>
6-
<class name="com.github.automatedowl.examples.WebHostTest"/>
6+
<class name="com.github.automatedowl.examples.tests.WebHostTests"/>
77
</classes>
88
</test>
99
</suite>

0 commit comments

Comments
 (0)