Skip to content

Commit 4bcffc0

Browse files
leftstickleftstick
committed
update impls
1 parent 4f5bf5e commit 4bcffc0

File tree

7 files changed

+55
-59
lines changed

7 files changed

+55
-59
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.movoto.tests</groupId> <artifactId>selenium-example</artifactId> <version>1.0-SNAPSHOT</version> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> <version>2.53.0</version> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-chrome-driver</artifactId> <version>2.53.0</version> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>htmlunit-driver</artifactId> <version>2.20</version> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-firefox-driver</artifactId> <version>2.53.0</version> </dependency> </dependencies></project>
1+
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.movoto.tests</groupId> <artifactId>selenium-example</artifactId> <version>1.0-SNAPSHOT</version> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> <version>3.0.1</version> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-chrome-driver</artifactId> <version>3.0.1</version> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>htmlunit-driver</artifactId> <version>2.23.2</version> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-firefox-driver</artifactId> <version>3.0.1</version> </dependency> </dependencies></project>

‎selenium-example.iml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,45 @@
1111
<orderEntry type="sourceFolder" forTests="false" />
1212
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
1313
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
14-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.53.0" level="project" />
15-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.53.0" level="project" />
16-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:2.53.0" level="project" />
17-
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
18-
<orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
19-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:2.53.0" level="project" />
14+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:3.0.1" level="project" />
15+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:3.0.1" level="project" />
16+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:3.0.1" level="project" />
17+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-opera-driver:3.0.1" level="project" />
18+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:3.0.1" level="project" />
2019
<orderEntry type="library" name="Maven: io.netty:netty:3.5.7.Final" level="project" />
21-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.53.0" level="project" />
22-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.53.0" level="project" />
23-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:2.53.0" level="project" />
24-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:2.53.0" level="project" />
25-
<orderEntry type="library" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
26-
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
27-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.53.0" level="project" />
28-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
29-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
30-
<orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" />
31-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:htmlunit-driver:2.20" level="project" />
32-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.20" level="project" />
20+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:3.0.1" level="project" />
21+
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.23" level="project" />
3322
<orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
3423
<orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" />
3524
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
25+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
26+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
3627
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
3728
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
38-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.17" level="project" />
29+
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.23" level="project" />
30+
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:neko-htmlunit:2.23" level="project" />
3931
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
4032
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
41-
<orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
42-
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.18" level="project" />
33+
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.20" level="project" />
4334
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
35+
<orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
4436
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
37+
<orderEntry type="library" name="Maven: com.codeborne:phantomjsdriver:1.3.0" level="project" />
4538
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.2.15.v20160210" level="project" />
4639
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.2.15.v20160210" level="project" />
4740
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.2.15.v20160210" level="project" />
4841
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.2.15.v20160210" level="project" />
4942
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.2.15.v20160210" level="project" />
50-
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
51-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.53.0" level="project" />
52-
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
43+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:3.0.1" level="project" />
44+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:3.0.1" level="project" />
45+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:3.0.1" level="project" />
46+
<orderEntry type="library" name="Maven: cglib:cglib-nodep:3.2.4" level="project" />
5347
<orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" />
48+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
49+
<orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" />
50+
<orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
51+
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
52+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:htmlunit-driver:2.23.2" level="project" />
53+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:3.0.1" level="project" />
5454
</component>
5555
</module>

‎src/test/java/org/movoto/selenium/example/ChromeDriverUsage.java‎ renamed to ‎src/test/java/org/movoto/selenium/example/ChromeDriverTest.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,28 @@
22

33
import org.junit.After;
44
import org.junit.Before;
5+
import org.junit.Ignore;
56
import org.junit.Test;
67
import org.openqa.selenium.By;
78
import org.openqa.selenium.Dimension;
89
import org.openqa.selenium.WebDriver;
910
import org.openqa.selenium.WebElement;
1011
import org.openqa.selenium.chrome.ChromeDriver;
1112
import org.openqa.selenium.firefox.MarionetteDriver;
13+
import org.openqa.selenium.interactions.Actions;
1214
import org.openqa.selenium.support.ui.ExpectedCondition;
1315
import org.openqa.selenium.support.ui.WebDriverWait;
1416

1517
import java.io.IOException;
1618
import java.util.List;
19+
import java.util.concurrent.TimeUnit;
1720

1821
import static org.junit.Assert.assertTrue;
1922

2023
/**
2124
* Created by haozuo on 3/22/16.
2225
*/
23-
public class ChromeDriverUsage {
26+
public class ChromeDriverTest {
2427

2528
private String testUrl;
2629
private WebDriver driver;
@@ -32,15 +35,15 @@ public void prepare() {
3235
"webdriver.chrome.driver",
3336
"webdriver/chromedriver");
3437

35-
testUrl = "http://leftstick.github.io/";
38+
testUrl = "https://leftstick.github.io/";
3639

3740
// Create a new instance of the Chrome driver
3841
// Notice that the remainder of the code relies on the interface,
3942
// not the implementation.
4043
driver = new ChromeDriver();
4144

42-
//set window size
43-
driver.manage().window().setSize(new Dimension(1300, 1000));
45+
//maximize window
46+
driver.manage().window().maximize();
4447

4548
// And now use this to visit myBlog
4649
// Alternatively the same thing can be done like this
@@ -60,13 +63,14 @@ public void testTitle() throws IOException {
6063

6164

6265
assertTrue("The page title should be chagned as expected",
63-
(new WebDriverWait(driver, 3))
66+
(new WebDriverWait(driver, 5))
6467
.until(new ExpectedCondition<Boolean>() {
6568
public Boolean apply(WebDriver d) {
66-
return d.getTitle().equals("以BDD手写依赖注入");
69+
return d.getTitle().equals("我眼中软件工程人员该有的常识");
6770
}
6871
})
6972
);
73+
7074
}
7175

7276
@After

‎src/test/java/org/movoto/selenium/example/FirefoxTest.java‎

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

33
import org.junit.After;
44
import org.junit.Before;
5+
import org.junit.Ignore;
56
import org.junit.Test;
67
import org.openqa.selenium.By;
78
import org.openqa.selenium.Dimension;
@@ -14,6 +15,7 @@
1415

1516
import java.io.IOException;
1617
import java.util.List;
18+
import java.util.concurrent.TimeUnit;
1719

1820
import static org.junit.Assert.assertTrue;
1921

@@ -28,16 +30,15 @@ public class FirefoxTest {
2830
@Before
2931
public void prepare() {
3032

31-
testUrl = "http://leftstick.github.io/";
33+
testUrl = "https://leftstick.github.io/";
34+
35+
System.setProperty("webdriver.gecko.driver","webdriver/geckodriver");
3236

3337
// Create a new instance of the Chrome driver
3438
// Notice that the remainder of the code relies on the interface,
3539
// not the implementation.
3640
driver = new FirefoxDriver();
3741

38-
//set window size
39-
driver.manage().window().setSize(new Dimension(1300, 1000));
40-
4142
// And now use this to visit myBlog
4243
// Alternatively the same thing can be done like this
4344
// driver.navigate().to(testUrl);
@@ -59,7 +60,7 @@ public void testTitle() throws IOException {
5960
(new WebDriverWait(driver, 3))
6061
.until(new ExpectedCondition<Boolean>() {
6162
public Boolean apply(WebDriver d) {
62-
return d.getTitle().equals("以BDD手写依赖注入");
63+
return d.getTitle().equals("我眼中软件工程人员该有的常识");
6364
}
6465
})
6566
);

‎src/test/java/org/movoto/selenium/example/HtmlUnitTest.java‎ renamed to ‎src/test/java/org/movoto/selenium/example/SafariTest.java‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,36 @@
22

33
import org.junit.After;
44
import org.junit.Before;
5+
import org.junit.Ignore;
56
import org.junit.Test;
6-
import org.openqa.selenium.By;
7-
import org.openqa.selenium.Dimension;
8-
import org.openqa.selenium.WebDriver;
9-
import org.openqa.selenium.WebElement;
10-
import org.openqa.selenium.chrome.ChromeDriver;
11-
import org.openqa.selenium.firefox.MarionetteDriver;
12-
import org.openqa.selenium.htmlunit.HtmlUnitDriver;
7+
import org.openqa.selenium.*;
8+
import org.openqa.selenium.interactions.Actions;
9+
import org.openqa.selenium.interactions.Mouse;
10+
import org.openqa.selenium.safari.SafariDriver;
1311
import org.openqa.selenium.support.ui.ExpectedCondition;
1412
import org.openqa.selenium.support.ui.WebDriverWait;
1513

1614
import java.io.IOException;
1715
import java.util.List;
16+
import java.util.concurrent.TimeUnit;
1817

1918
import static org.junit.Assert.assertTrue;
2019

2120
/**
22-
* Created by haozuo on 3/23/16.
21+
* Created by haozuo on 3/22/16.
2322
*/
24-
public class HtmlUnitTest{
23+
public class SafariTest {
2524

2625
private String testUrl;
2726
private WebDriver driver;
2827

2928
@Before
3029
public void prepare() {
3130

32-
testUrl = "http://leftstick.github.io/";
31+
testUrl = "https://leftstick.github.io/";
3332

34-
// Create a new instance of the Chrome driver
35-
// Notice that the remainder of the code relies on the interface,
36-
// not the implementation.
37-
driver = new HtmlUnitDriver();
38-
39-
//set window size
40-
driver.manage().window().setSize(new Dimension(1300, 1000));
41-
42-
// And now use this to visit myBlog
43-
// Alternatively the same thing can be done like this
44-
// driver.navigate().to(testUrl);
33+
driver = new SafariDriver();
34+
driver.manage().window().maximize();
4535
driver.get(testUrl);
4636
}
4737

@@ -57,13 +47,14 @@ public void testTitle() throws IOException {
5747

5848

5949
assertTrue("The page title should be chagned as expected",
60-
(new WebDriverWait(driver, 3))
50+
(new WebDriverWait(driver, 5))
6151
.until(new ExpectedCondition<Boolean>() {
6252
public Boolean apply(WebDriver d) {
63-
return d.getTitle().equals("以BDD手写依赖注入");
53+
return d.getTitle().equals("我眼中软件工程人员该有的常识");
6454
}
6555
})
6656
);
57+
6758
}
6859

6960
@After

‎webdriver/chromedriver‎

-1.31 MB
Binary file not shown.

‎webdriver/geckodriver‎

3.18 MB
Binary file not shown.

0 commit comments

Comments
 (0)