Skip to content

Commit 02b4c5b

Browse files
committed
Update internet tests
1 parent 8efa40e commit 02b4c5b

File tree

6 files changed

+21
-10
lines changed

6 files changed

+21
-10
lines changed

src/main/java/org/sayem/webdriver/TestBase.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.openqa.selenium.WebDriver;
55
import org.openqa.selenium.support.PageFactory;
66
import org.sayem.webdriver.browsers.config.BrowserThreads;
7+
import org.sayem.webdriver.listeners.BrowserListener;
78
import org.sayem.webdriver.listeners.RetryListener;
89
import org.sayem.webdriver.listeners.ScreenshotListener;
910
import org.sayem.webdriver.listeners.TestNGListener;
@@ -20,7 +21,8 @@
2021
/**
2122
* Created by sayem on 10/05/15.
2223
*/
23-
@Listeners({TestNGListener.class, ScreenshotListener.class, RetryListener.class})
24+
@Listeners({BrowserListener.class, TestNGListener.class,
25+
ScreenshotListener.class, RetryListener.class})
2426
public abstract class TestBase {
2527

2628
private static List<BrowserThreads> webDriverThreadPool = Collections.synchronizedList(new ArrayList<>());

src/test/java/org/sayem/webdriver/pages/internet/BrokenImagePage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.sayem.webdriver.selenium.Browser;
77

88
import static com.jayway.restassured.RestAssured.given;
9+
import static org.sayem.webdriver.selectors.CssSelector.*;
910

1011
/**
1112
* Created by sayem on 1/31/16.
@@ -20,7 +21,7 @@ public BrokenImagePage(WebDriver driver) {
2021
}
2122

2223
public BrokenImagePage brokenImage() {
23-
browser.findElements(CssSelector.BROKEN_IMAGE)
24+
browser.findElements(BROKEN_IMAGE)
2425
.map(s -> s.getAttribute("src"))
2526
.forEach(s -> {
2627
response = given().get(s).then().extract().response();

src/test/java/org/sayem/webdriver/pages/internet/CheckboxPage.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import org.sayem.webdriver.selenium.Browser;
66
import org.testng.Assert;
77

8+
import static org.sayem.webdriver.selectors.CssSelector.*;
9+
810
/**
911
* Created by sayem on 1/30/16.
1012
*/
@@ -17,8 +19,8 @@ public CheckboxPage(WebDriver driver) {
1719
}
1820

1921
public CheckboxPage selectCheckbox() {
20-
browser.setCheckboxValue(CssSelector.CHECKBOX, true);
21-
Assert.assertTrue(browser.isChecked(CssSelector.CHECKBOX));
22+
browser.setCheckboxValue(CHECKBOX, true);
23+
Assert.assertTrue(browser.isChecked(CHECKBOX));
2224
return this;
2325
}
2426
}

src/test/java/org/sayem/webdriver/pages/internet/DragAndDropPage.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import org.sayem.webdriver.selectors.Id;
55
import org.sayem.webdriver.selenium.Browser;
66

7+
import static org.sayem.webdriver.selectors.Id.*;
8+
79
/**
810
* Created by sayem on 1/31/16.
911
*/
@@ -17,8 +19,8 @@ public DragAndDropPage(WebDriver driver) {
1719

1820
// TODO - doesn't work!
1921
public DragAndDropPage swapBoxes() {
20-
browser.untilFound(Id.DRAG);
21-
browser.getAction().dragDrop(Id.DRAG, Id.DROP);
22+
browser.untilFound(DRAG);
23+
browser.getAction().dragDrop(DRAG, DROP);
2224
return this;
2325
}
2426
}

src/test/java/org/sayem/webdriver/pages/internet/DropdownPage.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import org.sayem.webdriver.selenium.Browser;
66
import org.testng.Assert;
77

8+
import static org.sayem.webdriver.selectors.Id.*;
9+
810
/**
911
* Created by sayem on 1/30/16.
1012
*/
@@ -17,10 +19,10 @@ public DropdownPage(WebDriver driver) {
1719
}
1820

1921
public DropdownPage selectDropDown() {
20-
browser.untilFound(Id.DROPDOWN_LIST);
21-
browser.getSelect().selectByText(Id.DROPDOWN_LIST, "Option 1");
22+
browser.untilFound(DROPDOWN_LIST);
23+
browser.getSelect().selectByText(DROPDOWN_LIST, "Option 1");
2224
Assert.assertEquals(browser.getSelect()
23-
.getFirstSelectedText(Id.DROPDOWN_LIST), "Option 1");
25+
.getFirstSelectedText(DROPDOWN_LIST), "Option 1");
2426
return this;
2527
}
2628
}

src/test/java/org/sayem/webdriver/pages/internet/HomePage.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import org.sayem.webdriver.selectors.CssSelector;
66
import org.sayem.webdriver.selenium.Browser;
77

8+
import static org.sayem.webdriver.selectors.CssSelector.*;
9+
810
/**
911
* Created by sayem on 1/30/16.
1012
*/
@@ -18,7 +20,7 @@ public HomePage(WebDriver driver) {
1820
}
1921

2022
private void availableExamples(String example) {
21-
browser.findElements(CssSelector.AVAILABLE_EXAMPLES)
23+
browser.findElements(AVAILABLE_EXAMPLES)
2224
.filter((s) -> s.getText().equals(example))
2325
.findAny().get().click();
2426
}

0 commit comments

Comments
 (0)