This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push:
new 645c0ca55 upgraded graphene + selenium
645c0ca55 is described below
commit 645c0ca55086701120e96301e2052acaf4f80ea5
Author: Thomas Andraschko <[email protected]>
AuthorDate: Wed Feb 28 13:29:52 2024 +0100
upgraded graphene + selenium
---
deltaspike/modules/jsf/impl/pom.xml | 2 +-
.../view/controller/uc001/ViewConfigTestDrone.java | 3 ++-
.../view/controller/uc002/ViewConfigTestDrone.java | 3 ++-
.../view/controller/uc003/ViewConfigTestDrone.java | 3 ++-
.../destination/uc001/ViewConfigTestDrone.java | 2 +-
.../destination/uc002/ViewConfigTestDrone.java | 7 ++++---
.../destination/uc003/ViewConfigTestDrone.java | 4 ++--
.../destination/uc004/ViewConfigTestDrone.java | 4 ++--
.../destination/uc006/ViewConfigTestDrone.java | 2 +-
.../uc001/PreViewConfigNavigateEventTest.java | 3 ++-
.../parameter/uc003/NavigationParameterTest.java | 3 ++-
.../parameter/uc004/NavigationParameterTest.java | 2 +-
.../parameter/uc005/NavigationParameterTest.java | 4 ++--
.../parameter/uc006/NavigationParameterTest.java | 2 +-
.../impl/injection/uc001/InjectionDroneTest.java | 12 +++++++----
.../impl/injection/uc002/InjectionDroneTest.java | 12 +++++++----
.../impl/injection/uc003/InjectionDroneTest.java | 12 +++++++----
.../impl/injection/uc004/InjectionDroneTest.java | 5 +++--
.../test/jsf/impl/message/JsfMessageTest.java | 24 +++++++++++-----------
.../viewaccess/ViewAccessScopedWebAppTest.java | 9 +++++---
.../ViewAccessScopedWithFViewActionWebAppTest.java | 6 ++++--
.../impl/scope/window/WindowScopedContextTest.java | 3 ++-
22 files changed, 76 insertions(+), 51 deletions(-)
diff --git a/deltaspike/modules/jsf/impl/pom.xml
b/deltaspike/modules/jsf/impl/pom.xml
index e4139186d..7c34f3b71 100644
--- a/deltaspike/modules/jsf/impl/pom.xml
+++ b/deltaspike/modules/jsf/impl/pom.xml
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.jboss.arquillian.graphene</groupId>
<artifactId>graphene-webdriver</artifactId>
- <version>2.5.4</version>
+ <version>3.0.0-alpha.3</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTestDrone.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTestDrone.java
index 94ee1868e..0cc97d555 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTestDrone.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTestDrone.java
@@ -71,6 +71,7 @@ public class ViewConfigTestDrone
{
driver.get(new URL(contextPath, "simplePageConfig.xhtml").toString());
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("pageBean001Called"),
"true").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("pageBean001Called")),
"true").apply(driver));
}
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTestDrone.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTestDrone.java
index 4af5a9b2b..4975ced39 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTestDrone.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTestDrone.java
@@ -72,6 +72,7 @@ public class ViewConfigTestDrone
{
driver.get(new URL(contextPath, "simplePageConfig.xhtml").toString());
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("pageBean002Called"),
"true").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("pageBean002Called")),
"true").apply(driver));
}
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTestDrone.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTestDrone.java
index 5b6732fb1..af2cd664d 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTestDrone.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTestDrone.java
@@ -72,6 +72,7 @@ public class ViewConfigTestDrone
{
driver.get(new URL(contextPath, "simplePageConfig.xhtml").toString());
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("pageBean003Called"),
"true").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("pageBean003Called")),
"true").apply(driver));
}
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/ViewConfigTestDrone.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/ViewConfigTestDrone.java
index c8b017888..ef740a31f 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/ViewConfigTestDrone.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/ViewConfigTestDrone.java
@@ -79,7 +79,7 @@ public class ViewConfigTestDrone
WebElement button =
driver.findElement(By.id("destination:pb001ActionMethod"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("indexPage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("indexPage")),
"You arrived at index page").apply(driver));
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc002/ViewConfigTestDrone.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc002/ViewConfigTestDrone.java
index 3b7efd220..66233c0c2 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc002/ViewConfigTestDrone.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc002/ViewConfigTestDrone.java
@@ -80,7 +80,7 @@ public class ViewConfigTestDrone
WebElement button =
driver.findElement(By.id("destination:pb002ActionWithoutError"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("overviewPage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("overviewPage")),
"You arrived at overview page").apply(driver));
// Was redirected ?
Assert.assertTrue(driver.getCurrentUrl().contains("overview.xhtml"));
@@ -94,7 +94,7 @@ public class ViewConfigTestDrone
WebElement button =
driver.findElement(By.id("destination:pb002ActionWithError"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("customErrorPage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("customErrorPage")),
"This is a custom error page").apply(driver));
}
@@ -107,7 +107,8 @@ public class ViewConfigTestDrone
WebElement button =
driver.findElement(By.id("destination:pb002RestrictedToPages"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("homePage"),
"You arrived at home page")
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("homePage")), "You arrived at home
page")
.apply(driver));
// Was fowarded ?
Assert.assertTrue(driver.getCurrentUrl().contains("origin.xhtml"));
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTestDrone.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTestDrone.java
index 971b2d100..3525f87f5 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTestDrone.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTestDrone.java
@@ -78,7 +78,7 @@ public class ViewConfigTestDrone
WebElement button =
driver.findElement(By.id("destination:pb003ActionMethod"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("indexPage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("indexPage")),
"You arrived at index page").apply(driver));
}
@@ -90,7 +90,7 @@ public class ViewConfigTestDrone
WebElement button =
driver.findElement(By.id("destination:pb003ActionMethod2"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("homePage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("homePage")),
"You arrived at home page").apply(driver));
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTestDrone.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTestDrone.java
index 95cb38f05..b4d779fa6 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTestDrone.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTestDrone.java
@@ -77,7 +77,7 @@ public class ViewConfigTestDrone
WebElement button =
driver.findElement(By.id("destination:pb004ActionMethod"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("indexPage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("indexPage")),
"You arrived at index page").apply(driver));
}
@@ -89,7 +89,7 @@ public class ViewConfigTestDrone
WebElement button =
driver.findElement(By.id("destination:pb004ActionMethod2"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("overviewPage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("overviewPage")),
"You arrived at overview page").apply(driver));
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigTestDrone.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigTestDrone.java
index ef6f58c63..ef2e3566a 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigTestDrone.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigTestDrone.java
@@ -77,7 +77,7 @@ public class ViewConfigTestDrone
WebElement button =
driver.findElement(By.id("destination:pb006ActionMethod"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("step1"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("step1")),
"You arrived at step1 page").apply(driver));
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/event/uc001/PreViewConfigNavigateEventTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/event/uc001/PreViewConfigNavigateEventTest.java
index 42c404fad..cda289930 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/event/uc001/PreViewConfigNavigateEventTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/event/uc001/PreViewConfigNavigateEventTest.java
@@ -83,7 +83,8 @@ public class PreViewConfigNavigateEventTest
Assert.assertNotNull(button);
button.click();
// Index Page is shown instead of DefaultErrorView because
PreViewConfigNavigateEvent changed the navigation
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("indexPage"),
"You arrived at index page")
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("indexPage")), "You arrived at index
page")
.apply(driver));
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc003/NavigationParameterTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc003/NavigationParameterTest.java
index 00846dca4..e75761eb7 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc003/NavigationParameterTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc003/NavigationParameterTest.java
@@ -74,7 +74,8 @@ public class NavigationParameterTest
WebElement button =
driver.findElement(By.id("parameter:pb003ActionMethod"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("simplePageConfig"),
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("simplePageConfig")),
"You arrived at simplePageConfig page")
.apply(driver));
System.out.println(driver.getCurrentUrl());
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc004/NavigationParameterTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc004/NavigationParameterTest.java
index eb08f622e..791f6f1c5 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc004/NavigationParameterTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc004/NavigationParameterTest.java
@@ -84,7 +84,7 @@ public class NavigationParameterTest
button = driver.findElement(By.id("parameter:pb004ActionMethod"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("simplePageConfig"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("simplePageConfig")),
"You arrived at simplePageConfig page")
.apply(driver));
Assert.assertTrue(driver.getCurrentUrl().contains("cv="));
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc005/NavigationParameterTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc005/NavigationParameterTest.java
index 0fb71566b..79b8c8423 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc005/NavigationParameterTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc005/NavigationParameterTest.java
@@ -79,7 +79,7 @@ public class NavigationParameterTest
WebElement button =
driver.findElement(By.id("parameter:pb005Overview"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("overviewPage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("overviewPage")),
"You arrived at overview page")
.apply(driver));
System.out.println(driver.getCurrentUrl());
@@ -95,7 +95,7 @@ public class NavigationParameterTest
WebElement button = driver.findElement(By.id("parameter:pb005Index"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("indexPage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("indexPage")),
"You arrived at index page")
.apply(driver));
System.out.println(driver.getCurrentUrl());
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc006/NavigationParameterTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc006/NavigationParameterTest.java
index 9c43c999a..5d5cbfca1 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc006/NavigationParameterTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc006/NavigationParameterTest.java
@@ -78,7 +78,7 @@ public class NavigationParameterTest
WebElement button =
driver.findElement(By.id("parameter:pb006AnyMethod"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("customErrorPage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("customErrorPage")),
"This is a custom error page")
.apply(driver));
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java
index 91d73f522..02371bb24 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java
@@ -76,7 +76,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("123");
WebElement testConverterButton =
driver.findElement(By.id("converter:testConverterButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("messages"),
"Worked").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("messages")),
"Worked").apply(driver));
}
@Test
@@ -88,7 +89,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("String Value");
WebElement testConverterButton =
driver.findElement(By.id("converter:testConverterButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("converter:errorMessage"),
"Value is not an Integer").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("converter:errorMessage")), "Value is
not an Integer").apply(driver));
}
@Test
@@ -100,7 +102,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("DeltaSpike");
WebElement testConverterButton =
driver.findElement(By.id("validator:testValidatorButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("messages"),
"Worked").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("messages")),
"Worked").apply(driver));
}
@Test
@@ -112,6 +115,7 @@ public class InjectionDroneTest
convertedValue.sendKeys("Wrong Value");
WebElement testConverterButton =
driver.findElement(By.id("validator:testValidatorButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("validator:errorMessage"),
"Not a valid value").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("validator:errorMessage")), "Not a
valid value").apply(driver));
}
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc002/InjectionDroneTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc002/InjectionDroneTest.java
index 7938fc756..3cbdd3aaf 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc002/InjectionDroneTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc002/InjectionDroneTest.java
@@ -75,7 +75,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("123");
WebElement testConverterButton =
driver.findElement(By.id("converter:testConverterButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("messages"),
"Worked").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("messages")),
"Worked").apply(driver));
}
@Test
@@ -87,7 +88,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("String Value");
WebElement testConverterButton =
driver.findElement(By.id("converter:testConverterButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("converter:errorMessage"),
"Value is not an Integer").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("converter:errorMessage")), "Value is
not an Integer").apply(driver));
}
@Test
@@ -99,7 +101,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("DeltaSpike");
WebElement testConverterButton =
driver.findElement(By.id("validator:testValidatorButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("messages"),
"Worked").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("messages")),
"Worked").apply(driver));
}
@Test
@@ -111,6 +114,7 @@ public class InjectionDroneTest
convertedValue.sendKeys("Wrong Value");
WebElement testConverterButton =
driver.findElement(By.id("validator:testValidatorButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("validator:errorMessage"),
"Not a valid value").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("validator:errorMessage")), "Not a
valid value").apply(driver));
}
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc003/InjectionDroneTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc003/InjectionDroneTest.java
index 9d27a7abb..9cc3f801b 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc003/InjectionDroneTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc003/InjectionDroneTest.java
@@ -77,7 +77,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("123");
WebElement testConverterButton =
driver.findElement(By.id("converter:testConverterButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("messages"),
"Worked").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("messages")),
"Worked").apply(driver));
}
@Test
@@ -89,7 +90,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("String Value");
WebElement testConverterButton =
driver.findElement(By.id("converter:testConverterButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("converter:errorMessage"),
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("converter:errorMessage")),
"Value is not an Integer").apply(driver));
}
@@ -102,7 +104,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("DeltaSpike");
WebElement testConverterButton =
driver.findElement(By.id("validator:testValidatorButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("messages"),
"Worked").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("messages")),
"Worked").apply(driver));
}
@Test
@@ -114,7 +117,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("Wrong Value");
WebElement testConverterButton =
driver.findElement(By.id("validator:testValidatorButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("validator:errorMessage"),
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("validator:errorMessage")),
"Not a valid value").apply(driver));
}
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc004/InjectionDroneTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc004/InjectionDroneTest.java
index 2ffc27bdb..920403a31 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc004/InjectionDroneTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc004/InjectionDroneTest.java
@@ -77,7 +77,8 @@ public class InjectionDroneTest
convertedValue.sendKeys("DeltaSpike");
WebElement testConverterButton =
driver.findElement(By.id("validator:testValidatorButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("messages"),
"Worked").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("messages")),
"Worked").apply(driver));
}
@Test
@@ -89,7 +90,7 @@ public class InjectionDroneTest
convertedValue.sendKeys("Wrong Value");
WebElement testConverterButton =
driver.findElement(By.id("validator:testValidatorButton"));
testConverterButton.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("validator:errorMessage"),
+
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(driver.findElement(By.id("validator:errorMessage")),
"The valid value should be DeltaSpike").apply(driver));
}
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
index 50decf2fa..e33ec2b0c 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/JsfMessageTest.java
@@ -90,26 +90,26 @@ public class JsfMessageTest
Assert.assertNotNull(ExpectedConditions.presenceOfElementLocated(By.xpath("id('messages')")).apply(driver));
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.xpath("id('messages')/ul/li[1]"), "message with details
warnInfo!").apply(driver));
+ driver.findElement(By.xpath("id('messages')/ul/li[1]")),
"message with details warnInfo!").apply(driver));
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.xpath("id('messages')/ul/li[2]"), "message without detail
but parameter errorInfo.").apply(driver));
+ driver.findElement(By.xpath("id('messages')/ul/li[2]")),
"message without detail but parameter errorInfo.").apply(driver));
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.xpath("id('messages')/ul/li[3]"), "a simple message without
a param.").apply(driver));
+ driver.findElement(By.xpath("id('messages')/ul/li[3]")), "a
simple message without a param.").apply(driver));
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.xpath("id('messages')/ul/li[4]"), "simple message with a
string param fatalInfo.").apply(driver));
+ driver.findElement(By.xpath("id('messages')/ul/li[4]")),
"simple message with a string param fatalInfo.").apply(driver));
// check the free message usage
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.id("test:valueOutput"), "a simple message without a
param.").apply(driver));
+ driver.findElement(By.id("test:valueOutput")), "a simple
message without a param.").apply(driver));
// and also the usage via direct EL invocation
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.id("test:elOutput"), "a simple message without a
param.").apply(driver));
+ driver.findElement(By.id("test:elOutput")), "a simple message
without a param.").apply(driver));
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.id("test:elOutputWithParam"), "simple message with a string
param hiho.").apply(driver));
+ driver.findElement(By.id("test:elOutputWithParam")), "simple
message with a string param hiho.").apply(driver));
}
@Test
@@ -122,20 +122,20 @@ public class JsfMessageTest
Assert.assertNotNull(ExpectedConditions.presenceOfElementLocated(By.xpath("id('messages')")).apply(driver));
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.xpath("id('messages')/ul/li[1]"), "Nachricht mit Details
warnInfo!").apply(driver));
+ driver.findElement(By.xpath("id('messages')/ul/li[1]")),
"Nachricht mit Details warnInfo!").apply(driver));
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.xpath("id('messages')/ul/li[2]"), "Nachricht ohne Details
aber mit Parameter errorInfo.").apply(driver));
+ driver.findElement(By.xpath("id('messages')/ul/li[2]")),
"Nachricht ohne Details aber mit Parameter errorInfo.").apply(driver));
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.xpath("id('messages')/ul/li[3]"), "Einfache Nachricht ohne
Parameter.").apply(driver));
+ driver.findElement(By.xpath("id('messages')/ul/li[3]")),
"Einfache Nachricht ohne Parameter.").apply(driver));
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.xpath("id('messages')/ul/li[4]"), "Einfache Nachricht mit
String Parameter fatalInfo.").apply(driver));
+ driver.findElement(By.xpath("id('messages')/ul/li[4]")),
"Einfache Nachricht mit String Parameter fatalInfo.").apply(driver));
// check the free message usage
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
- By.id("test:valueOutput"), "Einfache Nachricht ohne
Parameter.").apply(driver));
+ driver.findElement(By.id("test:valueOutput")), "Einfache
Nachricht ohne Parameter.").apply(driver));
}
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWebAppTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWebAppTest.java
index 4a7c95f59..52ad2d55b 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWebAppTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWebAppTest.java
@@ -86,12 +86,15 @@ public class ViewAccessScopedWebAppTest
WebElement button = driver.findElement(By.id("testForm1:next"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("valueX"),
"abc").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("valueX")), "abc").apply(driver));
button = driver.findElement(By.id("testForm2:back"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("valueOutputX"),
"abc").apply(driver));
-
Assert.assertFalse(ExpectedConditions.textToBePresentInElement(By.id("valueOutputY"),
"xyz").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("valueOutputX")),
"abc").apply(driver));
+ Assert.assertFalse(ExpectedConditions.textToBePresentInElement(
+ driver.findElement( By.id("valueOutputY")),
"xyz").apply(driver));
}
}
\ No newline at end of file
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWithFViewActionWebAppTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWithFViewActionWebAppTest.java
index c40e3a64f..2630be7bb 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWithFViewActionWebAppTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWithFViewActionWebAppTest.java
@@ -86,8 +86,10 @@ public class ViewAccessScopedWithFViewActionWebAppTest
WebElement button = driver.findElement(By.id("form:next"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("firstValue"),
"abc").apply(driver));
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("secondValue"),
"xyz").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("firstValue")), "abc").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("secondValue")),
"xyz").apply(driver));
}
}
diff --git
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/window/WindowScopedContextTest.java
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/window/WindowScopedContextTest.java
index f5453fc5b..4659947b6 100644
---
a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/window/WindowScopedContextTest.java
+++
b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/window/WindowScopedContextTest.java
@@ -98,7 +98,8 @@ public class WindowScopedContextTest
WebElement button = driver.findElement(By.id("test:saveButton"));
button.click();
-
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("valueOutput"),
"23").apply(driver));
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(
+ driver.findElement(By.id("valueOutput")), "23").apply(driver));
}
