From c80536d11b7484e485088a01cfe2025b6bbfe0cf Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 16 Aug 2018 18:04:41 -0700 Subject: [PATCH] Polish. --- .../java/sample/pages/HomePage.java | 9 +++++++++ .../java/sample/AttributeTests.java | 11 +++++------ .../java/sample/pages/HomePage.java | 15 ++++++++------- .../java/sample/AttributeTests.java | 12 +++++------- .../java/sample/pages/HomePage.java | 15 ++++++++------- .../java/sample/AttributeTests.java | 12 +++++------- .../java/sample/pages/HomePage.java | 15 ++++++++------- .../java/sample/AttributeTests.java | 12 +++++------- .../java/sample/pages/HomePage.java | 15 ++++++++------- 9 files changed, 61 insertions(+), 55 deletions(-) diff --git a/samples/boot/gemfire/src/integration-test/java/sample/pages/HomePage.java b/samples/boot/gemfire/src/integration-test/java/sample/pages/HomePage.java index 6774366..b346367 100644 --- a/samples/boot/gemfire/src/integration-test/java/sample/pages/HomePage.java +++ b/samples/boot/gemfire/src/integration-test/java/sample/pages/HomePage.java @@ -64,7 +64,9 @@ public class HomePage { } private static void get(WebDriver driver, String get) { + String baseUrl = String.format("http://localhost:%s", System.getProperty("app.port", "8080")); + driver.get(baseUrl + get); } @@ -76,12 +78,16 @@ public class HomePage { } public void containCookie(String cookieName) { + Set cookies = this.driver.manage().getCookies(); + assertThat(cookies).extracting("name").contains(cookieName); } public void doesNotContainCookie(String cookieName) { + Set cookies = this.driver.manage().getCookies(); + assertThat(cookies).extracting("name").doesNotContain(cookieName); } @@ -103,8 +109,11 @@ public class HomePage { } public HomePage logout() { + WebElement logout = this.driver.findElement(By.cssSelector("input[type=\"submit\"]")); + logout.click(); + return PageFactory.initElements(this.driver, HomePage.class); } diff --git a/samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java b/samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java index a65ceaf..1ca120c 100644 --- a/samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java +++ b/samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java @@ -16,14 +16,16 @@ package sample; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import sample.pages.HomePage; -import static org.assertj.core.api.Assertions.assertThat; +import sample.pages.HomePage; /** * @author Eddú Meléndez @@ -51,10 +53,7 @@ public class AttributeTests { @Test public void createAttribute() { HomePage home = HomePage.go(this.driver, HomePage.class); - home = home.form() - .attributeName("a") - .attributeValue("b") - .submit(HomePage.class); + home = home.form().attributeName("a").attributeValue("b").submit(HomePage.class); assertThat(home.attributes()).extracting("attributeName").containsOnly("a"); assertThat(home.attributes()).extracting("attributeValue").containsOnly("b"); } diff --git a/samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java b/samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java index 0f43fda..9ec1a6a 100644 --- a/samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java +++ b/samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java @@ -16,6 +16,8 @@ package sample.pages; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -29,12 +31,11 @@ import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.PageFactory; import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory; -import static org.assertj.core.api.Assertions.assertThat; - /** * @author Eddú Meléndez * @author Rob Winch */ +@SuppressWarnings("unused") public class HomePage { private WebDriver driver; @@ -49,7 +50,7 @@ public class HomePage { public HomePage(WebDriver driver) { this.driver = driver; - this.attributes = new ArrayList(); + this.attributes = new ArrayList<>(); } private static void get(WebDriver driver, String get) { @@ -73,14 +74,13 @@ public class HomePage { } public HomePage logout() { - WebElement logout = this.driver - .findElement(By.cssSelector("input[type=\"submit\"]")); + WebElement logout = this.driver.findElement(By.cssSelector("input[type=\"submit\"]")); logout.click(); return PageFactory.initElements(this.driver, HomePage.class); } public List attributes() { - List rows = new ArrayList(); + List rows = new ArrayList<>(); for (WebElement tr : this.trs) { rows.add(new Attribute(tr)); } @@ -93,6 +93,7 @@ public class HomePage { } public class Form { + @FindBy(name = "attributeName") WebElement attributeName; @@ -123,6 +124,7 @@ public class HomePage { } public static class Attribute { + @FindBy(xpath = ".//td[1]") WebElement attributeName; @@ -147,5 +149,4 @@ public class HomePage { return this.attributeValue.getText(); } } - } diff --git a/samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java b/samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java index 83138ff..1ca120c 100644 --- a/samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java +++ b/samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java @@ -16,14 +16,16 @@ package sample; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import sample.pages.HomePage; -import static org.assertj.core.api.Assertions.assertThat; +import sample.pages.HomePage; /** * @author Eddú Meléndez @@ -51,12 +53,8 @@ public class AttributeTests { @Test public void createAttribute() { HomePage home = HomePage.go(this.driver, HomePage.class); - home = home.form() - .attributeName("a") - .attributeValue("b") - .submit(HomePage.class); + home = home.form().attributeName("a").attributeValue("b").submit(HomePage.class); assertThat(home.attributes()).extracting("attributeName").containsOnly("a"); assertThat(home.attributes()).extracting("attributeValue").containsOnly("b"); } - } diff --git a/samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java b/samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java index 0f43fda..9ec1a6a 100644 --- a/samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java +++ b/samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java @@ -16,6 +16,8 @@ package sample.pages; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -29,12 +31,11 @@ import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.PageFactory; import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory; -import static org.assertj.core.api.Assertions.assertThat; - /** * @author Eddú Meléndez * @author Rob Winch */ +@SuppressWarnings("unused") public class HomePage { private WebDriver driver; @@ -49,7 +50,7 @@ public class HomePage { public HomePage(WebDriver driver) { this.driver = driver; - this.attributes = new ArrayList(); + this.attributes = new ArrayList<>(); } private static void get(WebDriver driver, String get) { @@ -73,14 +74,13 @@ public class HomePage { } public HomePage logout() { - WebElement logout = this.driver - .findElement(By.cssSelector("input[type=\"submit\"]")); + WebElement logout = this.driver.findElement(By.cssSelector("input[type=\"submit\"]")); logout.click(); return PageFactory.initElements(this.driver, HomePage.class); } public List attributes() { - List rows = new ArrayList(); + List rows = new ArrayList<>(); for (WebElement tr : this.trs) { rows.add(new Attribute(tr)); } @@ -93,6 +93,7 @@ public class HomePage { } public class Form { + @FindBy(name = "attributeName") WebElement attributeName; @@ -123,6 +124,7 @@ public class HomePage { } public static class Attribute { + @FindBy(xpath = ".//td[1]") WebElement attributeName; @@ -147,5 +149,4 @@ public class HomePage { return this.attributeValue.getText(); } } - } diff --git a/samples/xml/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java b/samples/xml/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java index 83138ff..1ca120c 100644 --- a/samples/xml/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java +++ b/samples/xml/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java @@ -16,14 +16,16 @@ package sample; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import sample.pages.HomePage; -import static org.assertj.core.api.Assertions.assertThat; +import sample.pages.HomePage; /** * @author Eddú Meléndez @@ -51,12 +53,8 @@ public class AttributeTests { @Test public void createAttribute() { HomePage home = HomePage.go(this.driver, HomePage.class); - home = home.form() - .attributeName("a") - .attributeValue("b") - .submit(HomePage.class); + home = home.form().attributeName("a").attributeValue("b").submit(HomePage.class); assertThat(home.attributes()).extracting("attributeName").containsOnly("a"); assertThat(home.attributes()).extracting("attributeValue").containsOnly("b"); } - } diff --git a/samples/xml/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java b/samples/xml/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java index 0f43fda..9ec1a6a 100644 --- a/samples/xml/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java +++ b/samples/xml/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java @@ -16,6 +16,8 @@ package sample.pages; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -29,12 +31,11 @@ import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.PageFactory; import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory; -import static org.assertj.core.api.Assertions.assertThat; - /** * @author Eddú Meléndez * @author Rob Winch */ +@SuppressWarnings("unused") public class HomePage { private WebDriver driver; @@ -49,7 +50,7 @@ public class HomePage { public HomePage(WebDriver driver) { this.driver = driver; - this.attributes = new ArrayList(); + this.attributes = new ArrayList<>(); } private static void get(WebDriver driver, String get) { @@ -73,14 +74,13 @@ public class HomePage { } public HomePage logout() { - WebElement logout = this.driver - .findElement(By.cssSelector("input[type=\"submit\"]")); + WebElement logout = this.driver.findElement(By.cssSelector("input[type=\"submit\"]")); logout.click(); return PageFactory.initElements(this.driver, HomePage.class); } public List attributes() { - List rows = new ArrayList(); + List rows = new ArrayList<>(); for (WebElement tr : this.trs) { rows.add(new Attribute(tr)); } @@ -93,6 +93,7 @@ public class HomePage { } public class Form { + @FindBy(name = "attributeName") WebElement attributeName; @@ -123,6 +124,7 @@ public class HomePage { } public static class Attribute { + @FindBy(xpath = ".//td[1]") WebElement attributeName; @@ -147,5 +149,4 @@ public class HomePage { return this.attributeValue.getText(); } } - } diff --git a/samples/xml/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java b/samples/xml/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java index 83138ff..1ca120c 100644 --- a/samples/xml/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java +++ b/samples/xml/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java @@ -16,14 +16,16 @@ package sample; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import sample.pages.HomePage; -import static org.assertj.core.api.Assertions.assertThat; +import sample.pages.HomePage; /** * @author Eddú Meléndez @@ -51,12 +53,8 @@ public class AttributeTests { @Test public void createAttribute() { HomePage home = HomePage.go(this.driver, HomePage.class); - home = home.form() - .attributeName("a") - .attributeValue("b") - .submit(HomePage.class); + home = home.form().attributeName("a").attributeValue("b").submit(HomePage.class); assertThat(home.attributes()).extracting("attributeName").containsOnly("a"); assertThat(home.attributes()).extracting("attributeValue").containsOnly("b"); } - } diff --git a/samples/xml/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java b/samples/xml/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java index 0f43fda..9ec1a6a 100644 --- a/samples/xml/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java +++ b/samples/xml/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java @@ -16,6 +16,8 @@ package sample.pages; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -29,12 +31,11 @@ import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.PageFactory; import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory; -import static org.assertj.core.api.Assertions.assertThat; - /** * @author Eddú Meléndez * @author Rob Winch */ +@SuppressWarnings("unused") public class HomePage { private WebDriver driver; @@ -49,7 +50,7 @@ public class HomePage { public HomePage(WebDriver driver) { this.driver = driver; - this.attributes = new ArrayList(); + this.attributes = new ArrayList<>(); } private static void get(WebDriver driver, String get) { @@ -73,14 +74,13 @@ public class HomePage { } public HomePage logout() { - WebElement logout = this.driver - .findElement(By.cssSelector("input[type=\"submit\"]")); + WebElement logout = this.driver.findElement(By.cssSelector("input[type=\"submit\"]")); logout.click(); return PageFactory.initElements(this.driver, HomePage.class); } public List attributes() { - List rows = new ArrayList(); + List rows = new ArrayList<>(); for (WebElement tr : this.trs) { rows.add(new Attribute(tr)); } @@ -93,6 +93,7 @@ public class HomePage { } public class Form { + @FindBy(name = "attributeName") WebElement attributeName; @@ -123,6 +124,7 @@ public class HomePage { } public static class Attribute { + @FindBy(xpath = ".//td[1]") WebElement attributeName; @@ -147,5 +149,4 @@ public class HomePage { return this.attributeValue.getText(); } } - }