You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ra...@apache.org on 2014/06/10 23:02:31 UTC
git commit: DELTASPIKE-571 view-config drone tests
Repository: deltaspike
Updated Branches:
refs/heads/master 93b974328 -> 82fe52d6a
DELTASPIKE-571 view-config drone tests
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/82fe52d6
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/82fe52d6
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/82fe52d6
Branch: refs/heads/master
Commit: 82fe52d6af84af9e6aac4fc0f69c4d176386e391
Parents: 93b9743
Author: Rafael Benevides <ra...@gmail.com>
Authored: Tue Jun 10 17:45:45 2014 -0300
Committer: Rafael Benevides <ra...@gmail.com>
Committed: Tue Jun 10 18:00:40 2014 -0300
----------------------------------------------------------------------
.../view/controller/uc001/PageBean001.java | 8 ++
.../controller/uc001/ViewConfigTestDrone.java | 75 ++++++++++++
.../view/controller/uc002/PageBean002.java | 9 ++
.../controller/uc002/ViewConfigTestDrone.java | 75 ++++++++++++
.../view/controller/uc003/PageBean003.java | 4 +
.../controller/uc003/ViewConfigTestDrone.java | 75 ++++++++++++
.../navigation/destination/uc001/Pages.java | 1 +
.../destination/uc001/ViewConfigTest.java | 80 -------------
.../destination/uc001/ViewConfigTestDrone.java | 84 ++++++++++++++
.../destination/uc002/ViewConfigTest.java | 114 -------------------
.../destination/uc002/ViewConfigTestDrone.java | 114 +++++++++++++++++++
.../destination/uc003/PageBean003.java | 37 ++++++
.../navigation/destination/uc003/Pages.java | 2 +-
.../destination/uc003/PagesViolation.java | 34 ++++++
.../destination/uc003/ViewConfigTest.java | 12 +-
.../destination/uc003/ViewConfigTestDrone.java | 96 ++++++++++++++++
.../destination/uc004/PageBean004.java | 37 ++++++
.../destination/uc004/ViewConfigTestDrone.java | 95 ++++++++++++++++
.../destination/uc006/PageBean006.java | 34 ++++++
.../navigation/destination/uc006/Pages.java | 13 +--
.../destination/uc006/PagesViolation.java | 44 +++++++
.../uc006/ViewConfigBasePathValidationTest.java | 4 +-
.../destination/uc006/ViewConfigTestDrone.java | 83 ++++++++++++++
.../uc001/PreViewConfigNavigateEventTest.java | 1 -
.../jsf/impl/config/view/validation/Pages.java | 1 -
.../resources/controller/simplePageConfig.xhtml | 32 ++++++
.../src/test/resources/navigation/origin.xhtml | 5 +
.../resources/navigation/wizard1/step1.xhtml | 29 +++++
28 files changed, 982 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/PageBean001.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/PageBean001.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/PageBean001.java
index 2f33b73..839375c 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/PageBean001.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/PageBean001.java
@@ -25,8 +25,16 @@ import javax.enterprise.inject.Model;
@Model
class PageBean001
{
+ private boolean called = false;
+
@PreRenderView
protected void preRenderViewCallbackMethod()
{
+ called = true;
+ }
+
+ public boolean getCalled()
+ {
+ return called;
}
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTestDrone.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..f70e5a3
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTestDrone.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc001;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.warp.WarpTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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.support.ui.ExpectedConditions;
+
+@WarpTest
+@RunWith(Arquillian.class)
+@Category(WebProfileCategory.class)
+public class ViewConfigTestDrone
+{
+ @Drone
+ private WebDriver driver;
+
+ @ArquillianResource
+ private URL contextPath;
+
+ @Deployment
+ public static WebArchive deploy()
+ {
+ return ShrinkWrap
+ .create(WebArchive.class, "nav-controller-uc001.war")
+ .addPackage(PageBean001.class.getPackage())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
+ .addAsWebResource("controller/simplePageConfig.xhtml", "/simplePageConfig.xhtml")
+ .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Test
+ @RunAsClient
+ public void testNavigation() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "simplePageConfig.xhtml").toString());
+
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("pageBean001Called"), "true").apply(driver));
+ }
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/PageBean002.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/PageBean002.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/PageBean002.java
index 6320cb1..ecd6ddb 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/PageBean002.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/PageBean002.java
@@ -23,12 +23,21 @@ import org.apache.deltaspike.core.api.config.view.controller.PostRenderView;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
+
@Named("pageBean")
@RequestScoped
class PageBean002
{
+ private boolean called = false;
+
@PostRenderView
protected void postRenderViewCallbackMethod()
{
+ called = true;
+ }
+
+ public boolean getCalled()
+ {
+ return called;
}
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTestDrone.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..0ab39ae
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTestDrone.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc002;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.warp.WarpTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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.support.ui.ExpectedConditions;
+
+@WarpTest
+@RunWith(Arquillian.class)
+@Category(WebProfileCategory.class)
+public class ViewConfigTestDrone
+{
+ @Drone
+ private WebDriver driver;
+
+ @ArquillianResource
+ private URL contextPath;
+
+ @Deployment
+ public static WebArchive deploy()
+ {
+ return ShrinkWrap
+ .create(WebArchive.class, "nav-controller-uc002.war")
+ .addPackage(PageBean002.class.getPackage())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
+ .addAsWebResource("controller/simplePageConfig.xhtml", "/simplePageConfig.xhtml")
+ .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Test
+ @RunAsClient
+ public void testNavigation() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "simplePageConfig.xhtml").toString());
+
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("pageBean002Called"), "true").apply(driver));
+ }
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/PageBean003.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/PageBean003.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/PageBean003.java
index 10ce4a6..3d3ef8a 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/PageBean003.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/PageBean003.java
@@ -29,10 +29,14 @@ import javax.enterprise.inject.Model;
@ViewRef(config = SimplePageConfig.class)
class PageBean003
{
+
+ private boolean called = false;
+
@InitView
@PreViewAction
protected void callbackMethod1()
{
+ called = true;
}
@PreRenderView
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTestDrone.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..b9508d8
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTestDrone.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc003;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.warp.WarpTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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.support.ui.ExpectedConditions;
+
+@WarpTest
+@RunWith(Arquillian.class)
+@Category(WebProfileCategory.class)
+public class ViewConfigTestDrone
+{
+ @Drone
+ private WebDriver driver;
+
+ @ArquillianResource
+ private URL contextPath;
+
+ @Deployment
+ public static WebArchive deploy()
+ {
+ return ShrinkWrap
+ .create(WebArchive.class, "nav-controller-uc003.war")
+ .addPackage(PageBean003.class.getPackage())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
+ .addAsWebResource("controller/simplePageConfig.xhtml", "/simplePageConfig.xhtml")
+ .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Test
+ @RunAsClient
+ public void testNavigation() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "simplePageConfig.xhtml").toString());
+
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("pageBean003Called"), "true").apply(driver));
+ }
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/Pages.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/Pages.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/Pages.java
index c21a107..43773d3 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/Pages.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/Pages.java
@@ -26,4 +26,5 @@ interface Pages
class Index implements ViewConfig
{
}
+
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/ViewConfigTest.java
deleted file mode 100644
index a3d8c4b..0000000
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/ViewConfigTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc001;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.deltaspike.test.category.WebProfileCategory;
-import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.drone.api.annotation.Drone;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.arquillian.warp.WarpTest;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-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;
-
-@WarpTest
-@RunWith(Arquillian.class)
-@Category(WebProfileCategory.class)
-public class ViewConfigTest
-{
-
- @Drone
- private WebDriver driver;
-
- @ArquillianResource
- private URL contextPath;
-
- @Deployment
- public static WebArchive deploy()
- {
- return ShrinkWrap
- .create(WebArchive.class, "nav-destination-uc001.war")
- .addPackage(Pages.class.getPackage())
- .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
- .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
- .addAsWebResource("navigation/origin.xhtml", "/origin.xhtml")
- .addAsWebResource("navigation/pages/index.xhtml", "/pages/index.xhtml")
- .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
- .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
- }
-
- @Test
- @RunAsClient
- public void testNavigation() throws MalformedURLException
- {
- driver.get(new URL(contextPath, "origin.xhtml").toString());
-
- WebElement button = driver.findElement(By.id("destination:pb001ActionMethod"));
- button.click();
- Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("indexPage"), "You arrived at index page").apply(driver));
- }
-}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/ViewConfigTestDrone.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..7846abe
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc001/ViewConfigTestDrone.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc001;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.warp.WarpTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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;
+
+@WarpTest
+@RunWith(Arquillian.class)
+@Category(WebProfileCategory.class)
+public class ViewConfigTestDrone
+{
+
+ @Drone
+ private WebDriver driver;
+
+ @ArquillianResource
+ private URL contextPath;
+
+ @Deployment
+ public static WebArchive deploy()
+ {
+ return ShrinkWrap
+ .create(WebArchive.class, "nav-destination-uc001.war")
+ .addPackage(Pages.class.getPackage())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
+ .addAsWebResource("navigation/origin.xhtml", "/origin.xhtml")
+ .addAsWebResource("navigation/pages/index.xhtml", "/pages/index.xhtml")
+ .addAsWebResource("navigation/pages/home.xhtml", "/pages/home.xhtml")
+ .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+
+ @Test
+ @RunAsClient
+ public void testNavigationActionMethod() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "origin.xhtml").toString());
+
+ WebElement button = driver.findElement(By.id("destination:pb001ActionMethod"));
+ button.click();
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("indexPage"),
+ "You arrived at index page").apply(driver));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc002/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc002/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc002/ViewConfigTest.java
deleted file mode 100644
index 81622e9..0000000
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc002/ViewConfigTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc002;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.deltaspike.test.category.WebProfileCategory;
-import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.drone.api.annotation.Drone;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.arquillian.warp.WarpTest;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-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;
-
-@WarpTest
-@RunWith(Arquillian.class)
-@Category(WebProfileCategory.class)
-public class ViewConfigTest
-{
-
- @Drone
- private WebDriver driver;
-
- @ArquillianResource
- private URL contextPath;
-
- @Deployment
- public static WebArchive deploy()
- {
- return ShrinkWrap
- .create(WebArchive.class, "nav-destination-uc002.war")
- .addPackage(Pages.class.getPackage())
- .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
- .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
- .addAsWebResource("navigation/origin.xhtml", "/origin.xhtml")
- .addAsWebResource("navigation/pages/index.xhtml", "/pages/index.xhtml")
- .addAsWebResource("navigation/pages/home.xhtml", "/pages/home.xhtml")
- .addAsWebResource("navigation/pages/overview.xhtml", "/pages/overview.xhtml")
- .addAsWebResource("navigation/pages/customErrorPage.xhtml", "/pages/customErrorPage.xhtml")
- .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
- .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
- }
-
- @Test
- @RunAsClient
- public void testNavigationActionWithoutError() throws MalformedURLException
- {
- driver.get(new URL(contextPath, "origin.xhtml").toString());
-
- WebElement button = driver.findElement(By.id("destination:pb002ActionWithoutError"));
- button.click();
- Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("overviewPage"),
- "You arrived at overview page").apply(driver));
- // Was redirected ?
- Assert.assertTrue(driver.getCurrentUrl().contains("overview.xhtml"));
- }
-
- @Test
- @RunAsClient
- public void testNavigationActionWithError() throws MalformedURLException
- {
- driver.get(new URL(contextPath, "origin.xhtml").toString());
-
- WebElement button = driver.findElement(By.id("destination:pb002ActionWithError"));
- button.click();
- Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("customErrorPage"),
- "This is a custom error page").apply(driver));
- }
-
-
- @Test
- @RunAsClient
- public void testNavigationRestrictedToPages() throws MalformedURLException
- {
- driver.get(new URL(contextPath, "origin.xhtml").toString());
-
- WebElement button = driver.findElement(By.id("destination:pb002RestrictedToPages"));
- button.click();
- Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("homePage"), "You arrived at home page")
- .apply(driver));
- // Was fowarded ?
- Assert.assertTrue(driver.getCurrentUrl().contains("origin.xhtml"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc002/ViewConfigTestDrone.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..6cb550f
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc002/ViewConfigTestDrone.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc002;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.warp.WarpTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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;
+
+@WarpTest
+@RunWith(Arquillian.class)
+@Category(WebProfileCategory.class)
+public class ViewConfigTestDrone
+{
+
+ @Drone
+ private WebDriver driver;
+
+ @ArquillianResource
+ private URL contextPath;
+
+ @Deployment
+ public static WebArchive deploy()
+ {
+ return ShrinkWrap
+ .create(WebArchive.class, "nav-destination-uc002.war")
+ .addPackage(Pages.class.getPackage())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
+ .addAsWebResource("navigation/origin.xhtml", "/origin.xhtml")
+ .addAsWebResource("navigation/pages/index.xhtml", "/pages/index.xhtml")
+ .addAsWebResource("navigation/pages/home.xhtml", "/pages/home.xhtml")
+ .addAsWebResource("navigation/pages/overview.xhtml", "/pages/overview.xhtml")
+ .addAsWebResource("navigation/pages/customErrorPage.xhtml", "/pages/customErrorPage.xhtml")
+ .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Test
+ @RunAsClient
+ public void testNavigationActionWithoutError() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "origin.xhtml").toString());
+
+ WebElement button = driver.findElement(By.id("destination:pb002ActionWithoutError"));
+ button.click();
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("overviewPage"),
+ "You arrived at overview page").apply(driver));
+ // Was redirected ?
+ Assert.assertTrue(driver.getCurrentUrl().contains("overview.xhtml"));
+ }
+
+ @Test
+ @RunAsClient
+ public void testNavigationActionWithError() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "origin.xhtml").toString());
+
+ WebElement button = driver.findElement(By.id("destination:pb002ActionWithError"));
+ button.click();
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("customErrorPage"),
+ "This is a custom error page").apply(driver));
+ }
+
+
+ @Test
+ @RunAsClient
+ public void testNavigationRestrictedToPages() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "origin.xhtml").toString());
+
+ WebElement button = driver.findElement(By.id("destination:pb002RestrictedToPages"));
+ button.click();
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("homePage"), "You arrived at home page")
+ .apply(driver));
+ // Was fowarded ?
+ Assert.assertTrue(driver.getCurrentUrl().contains("origin.xhtml"));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/PageBean003.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/PageBean003.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/PageBean003.java
new file mode 100644
index 0000000..f2c6834
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/PageBean003.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc003;
+
+import javax.enterprise.inject.Model;
+
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+
+@Model
+public class PageBean003
+{
+ public Class<? extends ViewConfig> actionMethod()
+ {
+ return Pages.Index.class;
+ }
+
+ public Class<? extends ViewConfig> actionMethod2()
+ {
+ return Pages.Overview.class;
+ }
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/Pages.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/Pages.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/Pages.java
index af7fbe5..b4ca2d3 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/Pages.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/Pages.java
@@ -27,7 +27,7 @@ interface Pages extends ViewConfig
{
}
- @View(name = "index")
+ @View(name = "home")
class Overview implements Pages
{
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/PagesViolation.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/PagesViolation.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/PagesViolation.java
new file mode 100644
index 0000000..b8cd453
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/PagesViolation.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc003;
+
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+import org.apache.deltaspike.jsf.api.config.view.View;
+
+interface PagesViolation extends ViewConfig
+{
+ class Index implements PagesViolation
+ {
+ }
+
+ @View(name = "index")
+ class Overview implements PagesViolation
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTest.java
index 939a0a4..240eced 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTest.java
@@ -49,10 +49,10 @@ public class ViewConfigTest
@Test
public void testDuplicatedNavigationTargetsInMetaDataTree()
{
- this.viewConfigExtension.addPageDefinition(Pages.Index.class);
- this.viewConfigExtension.addPageDefinition(Pages.Overview.class);
+ this.viewConfigExtension.addPageDefinition(PagesViolation.Index.class);
+ this.viewConfigExtension.addPageDefinition(PagesViolation.Overview.class);
- ViewConfigNode node = this.viewConfigExtension.findNode(Pages.Index.class);
+ ViewConfigNode node = this.viewConfigExtension.findNode(PagesViolation.Index.class);
Assert.assertNotNull(node);
Assert.assertNotNull(node.getParent());
@@ -69,7 +69,7 @@ public class ViewConfigTest
Assert.assertEquals(0, node.getInheritedMetaData().size());
- node = this.viewConfigExtension.findNode(Pages.Overview.class);
+ node = this.viewConfigExtension.findNode(PagesViolation.Overview.class);
Assert.assertNotNull(node);
Assert.assertNotNull(node.getParent());
@@ -90,8 +90,8 @@ public class ViewConfigTest
@Test(expected = IllegalStateException.class)
public void testDuplicatedNavigationTargetsDuringPageMetaDataTransformation()
{
- this.viewConfigExtension.addPageDefinition(Pages.Index.class);
- this.viewConfigExtension.addPageDefinition(Pages.Overview.class);
+ this.viewConfigExtension.addPageDefinition(PagesViolation.Index.class);
+ this.viewConfigExtension.addPageDefinition(PagesViolation.Overview.class);
this.viewConfigResolverProducer.createViewConfigResolver();
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTestDrone.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..9f538b4
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc003/ViewConfigTestDrone.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc003;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.warp.WarpTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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;
+
+@WarpTest
+@RunWith(Arquillian.class)
+@Category(WebProfileCategory.class)
+public class ViewConfigTestDrone
+{
+
+ @Drone
+ private WebDriver driver;
+
+ @ArquillianResource
+ private URL contextPath;
+
+ @Deployment
+ public static WebArchive deploy()
+ {
+ return ShrinkWrap
+ .create(WebArchive.class, "nav-destination-uc003.war")
+ .addClass(Pages.class)
+ .addClass(ViewConfigTestDrone.class)
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
+ .addAsWebResource("navigation/pages/index.xhtml", "/pages/index.xhtml")
+ .addAsWebResource("navigation/pages/home.xhtml", "/pages/home.xhtml")
+ .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+
+ @Test
+ @RunAsClient
+ public void testNavigationActionMethod() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "origin.xhtml").toString());
+
+ WebElement button = driver.findElement(By.id("destination:pb003ActionMethod"));
+ button.click();
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("indexPage"),
+ "You arrived at index page").apply(driver));
+ }
+
+ @Test
+ @RunAsClient
+ public void testNavigationActionMethod2() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "origin.xhtml").toString());
+
+ WebElement button = driver.findElement(By.id("destination:pb003ActionMethod2"));
+ button.click();
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("homePage"),
+ "You arrived at home page").apply(driver));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/PageBean004.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/PageBean004.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/PageBean004.java
new file mode 100644
index 0000000..fec19c0
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/PageBean004.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc004;
+
+import javax.enterprise.inject.Model;
+
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+
+@Model
+public class PageBean004
+{
+ public Class<? extends ViewConfig> actionMethod()
+ {
+ return Pages.Index.class;
+ }
+
+ public Class<? extends ViewConfig> actionMethod2()
+ {
+ return Pages.Overview.class;
+ }
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTestDrone.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..0686cf9
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTestDrone.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc004;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.warp.WarpTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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;
+
+@WarpTest
+@RunWith(Arquillian.class)
+@Category(WebProfileCategory.class)
+public class ViewConfigTestDrone
+{
+
+ @Drone
+ private WebDriver driver;
+
+ @ArquillianResource
+ private URL contextPath;
+
+ @Deployment
+ public static WebArchive deploy()
+ {
+ return ShrinkWrap
+ .create(WebArchive.class, "nav-destination-uc004.war")
+ .addPackage(Pages.class.getPackage())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
+ .addAsWebResource("navigation/pages/index.xhtml", "/pages/index.xhtml")
+ .addAsWebResource("navigation/pages/overview.xhtml", "/pages/overview.xhtml")
+ .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+
+ @Test
+ @RunAsClient
+ public void testNavigationActionMethod() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "origin.xhtml").toString());
+
+ WebElement button = driver.findElement(By.id("destination:pb004ActionMethod"));
+ button.click();
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("indexPage"),
+ "You arrived at index page").apply(driver));
+ }
+
+ @Test
+ @RunAsClient
+ public void testNavigationActionMethod2() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "origin.xhtml").toString());
+
+ WebElement button = driver.findElement(By.id("destination:pb004ActionMethod2"));
+ button.click();
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("overviewPage"),
+ "You arrived at overview page").apply(driver));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/PageBean006.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/PageBean006.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/PageBean006.java
new file mode 100644
index 0000000..631e123
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/PageBean006.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc006;
+
+import javax.enterprise.inject.Model;
+
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+
+@Model
+public class PageBean006
+{
+ public Class<? extends ViewConfig> actionMethod()
+ {
+ return Pages.Wizard1.Step1.class;
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/Pages.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/Pages.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/Pages.java
index 62dcd10..bc5d082 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/Pages.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/Pages.java
@@ -24,20 +24,11 @@ import org.apache.deltaspike.jsf.api.config.view.View;
interface Pages
{
- @View(basePath = "w1") //causes a violation because @Folder should be used instead
+ @Folder(name = "wizard1") //valid usage
interface Wizard1
{
@View(basePath = "")
- class Start implements ViewConfig
- {
- }
- }
-
- @Folder(name = "w2") //valid usage
- interface Wizard2
- {
- @View(basePath = "")
- class Start implements ViewConfig
+ class Step1 implements ViewConfig
{
}
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/PagesViolation.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/PagesViolation.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/PagesViolation.java
new file mode 100644
index 0000000..94ff673
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/PagesViolation.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc006;
+
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+import org.apache.deltaspike.jsf.api.config.view.Folder;
+import org.apache.deltaspike.jsf.api.config.view.View;
+
+interface PagesViolation
+{
+ @View(basePath = "w1") //causes a violation because @Folder should be used instead
+ interface Wizard1
+ {
+ @View(basePath = "")
+ class Start implements ViewConfig
+ {
+ }
+ }
+
+ @Folder(name = "w2") //valid usage
+ interface Wizard2
+ {
+ @View(basePath = "")
+ class Start implements ViewConfig
+ {
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigBasePathValidationTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigBasePathValidationTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigBasePathValidationTest.java
index 149daf3..256ad4e 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigBasePathValidationTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigBasePathValidationTest.java
@@ -49,7 +49,7 @@ public class ViewConfigBasePathValidationTest
@Test
public void testInvalidBasePathUsage()
{
- this.viewConfigExtension.addPageDefinition(Pages.Wizard1.Start.class);
+ this.viewConfigExtension.addPageDefinition(PagesViolation.Wizard1.Start.class);
try
{
@@ -71,7 +71,7 @@ public class ViewConfigBasePathValidationTest
@Test
public void testValidBasePathUsage()
{
- this.viewConfigExtension.addPageDefinition(Pages.Wizard2.Start.class);
+ this.viewConfigExtension.addPageDefinition(PagesViolation.Wizard2.Start.class);
Assert.assertNotNull(this.viewConfigResolverProducer.createViewConfigResolver()); //won't cause an exception
}
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigTestDrone.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..0d7df38
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc006/ViewConfigTestDrone.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.test.jsf.impl.config.view.navigation.destination.uc006;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.warp.WarpTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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;
+
+@WarpTest
+@RunWith(Arquillian.class)
+@Category(WebProfileCategory.class)
+public class ViewConfigTestDrone
+{
+
+ @Drone
+ private WebDriver driver;
+
+ @ArquillianResource
+ private URL contextPath;
+
+ @Deployment
+ public static WebArchive deploy()
+ {
+ return ShrinkWrap
+ .create(WebArchive.class, "nav-destination-uc006.war")
+ .addClass(Pages.class)
+ .addClass(ViewConfigTestDrone.class)
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJsfArchive())
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeSecurityArchive())
+ .addAsWebResource("navigation/wizard1/step1.xhtml", "/wizard1/step1.xhtml")
+ .addAsWebInfResource("default/WEB-INF/web.xml", "web.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+
+ @Test
+ @RunAsClient
+ public void testNavigationActionMethod() throws MalformedURLException
+ {
+ driver.get(new URL(contextPath, "origin.xhtml").toString());
+
+ WebElement button = driver.findElement(By.id("destination:pb006ActionMethod"));
+ button.click();
+ Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("step1"),
+ "You arrived at step1 page").apply(driver));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/event/uc001/PreViewConfigNavigateEventTest.java
----------------------------------------------------------------------
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 c1289f2..22ad979 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
@@ -41,7 +41,6 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;
-//Needs DELTASPIKE-565 to be fixed
@WarpTest
@RunWith(Arquillian.class)
@Category(WebProfileCategory.class)
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/validation/Pages.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/validation/Pages.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/validation/Pages.java
index 0e65d52..0f30eea 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/validation/Pages.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/validation/Pages.java
@@ -19,7 +19,6 @@
package org.apache.deltaspike.test.jsf.impl.config.view.validation;
import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.View;
interface Pages extends ViewConfig
{
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/resources/controller/simplePageConfig.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/controller/simplePageConfig.xhtml b/deltaspike/modules/jsf/impl/src/test/resources/controller/simplePageConfig.xhtml
new file mode 100644
index 0000000..1f9d8de
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/resources/controller/simplePageConfig.xhtml
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<h:head><title>Test</title></h:head>
+<body>
+ <div id="simplePageConfig">You arrived at simplePageConfig page</div>
+ <div id="pageBean001Called">#{pageBean001.called}</div>
+ <div id="pageBean002Called">#{pageBean002.called}</div>
+ <div id="pageBean002Called">#{pageBean003.called}</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/resources/navigation/origin.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/navigation/origin.xhtml b/deltaspike/modules/jsf/impl/src/test/resources/navigation/origin.xhtml
index 98353c0..d956507 100644
--- a/deltaspike/modules/jsf/impl/src/test/resources/navigation/origin.xhtml
+++ b/deltaspike/modules/jsf/impl/src/test/resources/navigation/origin.xhtml
@@ -29,6 +29,11 @@
<h:commandButton id="pb002ActionWithoutError" value="Action Method" action="#{pageBean002.actionWithoutError()}" />
<h:commandButton id="pb002ActionWithError" value="Action Method" action="#{pageBean002.actionWithError()}" />
<h:commandButton id="pb002RestrictedToPages" value="Action Method" action="#{pageBean002.restrictedToPages()}" />
+ <h:commandButton id="pb003ActionMethod" value="Action Method" action="#{pageBean003.actionMethod()}" />
+ <h:commandButton id="pb003ActionMethod2" value="Action Method" action="#{pageBean003.actionMethod2()}" />
+ <h:commandButton id="pb004ActionMethod" value="Action Method" action="#{pageBean004.actionMethod()}" />
+ <h:commandButton id="pb004ActionMethod2" value="Action Method" action="#{pageBean004.actionMethod2()}" />
+ <h:commandButton id="pb006ActionMethod" value="Action Method" action="#{pageBean006.actionMethod()}" />
</h:form>
<h:form id="event">
<h:commandButton id="pb002ActionWithError" value="Action Method" action="#{pageBean002.actionWithError()}" />
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82fe52d6/deltaspike/modules/jsf/impl/src/test/resources/navigation/wizard1/step1.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/navigation/wizard1/step1.xhtml b/deltaspike/modules/jsf/impl/src/test/resources/navigation/wizard1/step1.xhtml
new file mode 100644
index 0000000..72a6854
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/resources/navigation/wizard1/step1.xhtml
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<h:head><title>Test</title></h:head>
+<body>
+ <div id="step1">You arrived at step1 page</div>
+</body>
+</html>