You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/10/05 09:32:31 UTC
[2/2] git commit: DELTASPIKE-266 migrate test to WebDriver and
Selenium2
DELTASPIKE-266 migrate test to WebDriver and Selenium2
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/cd493457
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/cd493457
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/cd493457
Branch: refs/heads/master
Commit: cd49345731dbd3e7837b5ff2d89363ba2f753f71
Parents: 5f57588
Author: Mark Struberg <st...@apache.org>
Authored: Fri Oct 5 08:48:53 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Fri Oct 5 08:48:53 2012 +0200
----------------------------------------------------------------------
deltaspike/modules/jsf/impl/pom.xml | 2 +-
.../jsf/impl/scope/view/ViewScopedContextTest.java | 37 ++++++--------
.../test/jsf/impl/util/ArchiveUtils.java | 1 +
3 files changed, 18 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/cd493457/deltaspike/modules/jsf/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/pom.xml b/deltaspike/modules/jsf/impl/pom.xml
index 0045543..26cd5d0 100644
--- a/deltaspike/modules/jsf/impl/pom.xml
+++ b/deltaspike/modules/jsf/impl/pom.xml
@@ -62,7 +62,7 @@
</dependency>
<dependency>
<groupId>org.jboss.arquillian.graphene</groupId>
- <artifactId>arquillian-graphene</artifactId>
+ <artifactId>graphene-webdriver</artifactId>
<version>2.0.0.Alpha2</version>
<type>pom</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/cd493457/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/ViewScopedContextTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/ViewScopedContextTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/ViewScopedContextTest.java
index 1a86827..11caa26 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/ViewScopedContextTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/view/ViewScopedContextTest.java
@@ -24,9 +24,9 @@ import java.net.URL;
import org.apache.deltaspike.test.jsf.impl.scope.view.beans.BackingBean;
import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
import org.apache.deltaspike.test.category.WebProfileCategory;
-import org.jboss.arquillian.ajocado.framework.GrapheneSelenium;
-import org.jboss.arquillian.ajocado.locator.IdLocator;
-import org.jboss.arquillian.ajocado.Graphene;
+//X import org.jboss.arquillian.ajocado.framework.GrapheneSelenium;
+//X import org.jboss.arquillian.ajocado.locator.IdLocator;
+//X import org.jboss.arquillian.ajocado.Graphene;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
@@ -41,9 +41,13 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
-import static org.jboss.arquillian.ajocado.Graphene.id;
-import static org.jboss.arquillian.ajocado.Graphene.waitModel;
+//X import static org.jboss.arquillian.ajocado.Graphene.id;
+//X import static org.jboss.arquillian.ajocado.Graphene.waitModel;
/**
* Test for the DeltaSpike ViewScoped context
@@ -54,7 +58,7 @@ import static org.jboss.arquillian.ajocado.Graphene.waitModel;
public class ViewScopedContextTest
{
@Drone
- private GrapheneSelenium browser;
+ private WebDriver driver;
@ArquillianResource
private URL contextPath;
@@ -77,24 +81,15 @@ public class ViewScopedContextTest
@RunAsClient
public void testViewScopedContext() throws Exception
{
- browser.open(new URL(contextPath, "page1.xhtml"));
+ driver.get(new URL(contextPath, "page1.xhtml").toString());
- waitModel.until(Graphene.elementVisible.locator(Graphene.xp("//body")));
+ WebElement inputField = driver.findElement(By.id("test:valueInput"));
+ inputField.sendKeys("23");
- // we have to prefix all ids with "test:" as this is in the 'test' form
- // this sucks as the algorithm is not well defined in the JSF spec!
+ WebElement button = driver.findElement(By.id("test:saveButton"));
+ button.click();
- IdLocator inputField = id("test:valueInput");
- browser.type(inputField, "23");
-
- IdLocator button = id("test:saveButton");
- browser.click(button);
-
- waitModel.until(Graphene.elementVisible.locator(Graphene.xp("//body")));
-
- IdLocator outputField = id("test:valueOutput");
- String outputValue = browser.getValue(outputField);
- Assert.assertEquals("23", outputValue);
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("test:valueOutput"), "23").apply(driver));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/cd493457/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
index 08af46d..017add0 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/util/ArchiveUtils.java
@@ -52,6 +52,7 @@ public class ArchiveUtils
.addClass(ArchiveUtils.class)
.addPackages(true, "org.jboss.arquillian.graphene")
.addPackages(true, "org.jboss.arquillian.ajocado")
+ .addPackages(true, "org.openqa.selenium")
.addPackage(WebProfileCategory.class.getPackage());
JavaArchive[] coreArchives = ShrinkWrapArchiveUtil.getArchives(null