Author: craigmcc
Date: Wed Oct 18 15:57:05 2006
New Revision: 465409
URL: http://svn.apache.org/viewvc?view=rev&rev=465409
Log:
Add test case for the Tiger variant of subview lifecycle events also.
SHALE-220
Added:
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Subview1.java
- copied, changed from r465405,
shale/framework/trunk/shale-apps/shale-test-view/src/main/java/org/apache/shale/examples/test/view/Subview1.java
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Subview2.java
- copied, changed from r465405,
shale/framework/trunk/shale-apps/shale-test-view/src/main/java/org/apache/shale/examples/test/view/Subview2.java
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/subview1.jsp
- copied unchanged from r465405,
shale/framework/trunk/shale-apps/shale-test-view/src/main/webapp/subview1.jsp
Modified:
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/WEB-INF/faces-config.xml
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/menu.jsp
shale/framework/trunk/shale-apps/shale-test-tiger/src/test/java/org/apache/shale/examples/test/tiger/systest/IntegrationTestCase.java
Copied:
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Subview1.java
(from r465405,
shale/framework/trunk/shale-apps/shale-test-view/src/main/java/org/apache/shale/examples/test/view/Subview1.java)
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Subview1.java?view=diff&rev=465409&p1=shale/framework/trunk/shale-apps/shale-test-view/src/main/java/org/apache/shale/examples/test/view/Subview1.java&r1=465405&p2=shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Subview1.java&r2=465409
==============================================================================
---
shale/framework/trunk/shale-apps/shale-test-view/src/main/java/org/apache/shale/examples/test/view/Subview1.java
(original)
+++
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Subview1.java
Wed Oct 18 15:57:05 2006
@@ -17,20 +17,29 @@
* $Id$
*/
-package org.apache.shale.examples.test.view;
+package org.apache.shale.examples.test.tiger;
-import org.apache.shale.view.AbstractViewController;
+import org.apache.shale.tiger.managed.Bean;
+import org.apache.shale.tiger.managed.Property;
+import org.apache.shale.tiger.managed.Scope;
+import org.apache.shale.tiger.view.Destroy;
+import org.apache.shale.tiger.view.Init;
+import org.apache.shale.tiger.view.Preprocess;
+import org.apache.shale.tiger.view.Prerender;
+import org.apache.shale.tiger.view.View;
/**
* <p>First page for subview lifecycle event tests.</p>
*/
-public class Subview1 extends AbstractViewController {
[EMAIL PROTECTED](name="subview1", scope=Scope.REQUEST) @View
+public class Subview1 {
// --------------------------------------------------------------
Properties
// The "Recorder" object for this request
+ @Property(value="#{recorder}")
private Recorder recorder = null;
public Recorder getRecorder() {
return this.recorder;
@@ -57,6 +66,7 @@
/**
* <p>Record an init event.</p>
*/
+ @Init
public void init() {
getRecorder().record("init1");
System.out.println("Subview1.init()");
@@ -66,6 +76,7 @@
/**
* <p>Record a preprocess event.</p>
*/
+ @Preprocess
public void preprocess() {
getRecorder().record("preprocess1");
System.out.println("Subview1.preprocess()");
@@ -75,6 +86,7 @@
/**
* <p>Record a prerender event.</p>
*/
+ @Prerender
public void prerender() {
getRecorder().record("prerender1");
System.out.println("Subview1.prerender()");
@@ -84,6 +96,7 @@
/**
* <p>Record a destroy event.</p>
*/
+ @Destroy
public void destroy() {
getRecorder().record("destroy1");
System.out.println("Subview1.destroy()");
Copied:
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Subview2.java
(from r465405,
shale/framework/trunk/shale-apps/shale-test-view/src/main/java/org/apache/shale/examples/test/view/Subview2.java)
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Subview2.java?view=diff&rev=465409&p1=shale/framework/trunk/shale-apps/shale-test-view/src/main/java/org/apache/shale/examples/test/view/Subview2.java&r1=465405&p2=shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Subview2.java&r2=465409
==============================================================================
---
shale/framework/trunk/shale-apps/shale-test-view/src/main/java/org/apache/shale/examples/test/view/Subview2.java
(original)
+++
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Subview2.java
Wed Oct 18 15:57:05 2006
@@ -17,20 +17,30 @@
* $Id$
*/
-package org.apache.shale.examples.test.view;
+package org.apache.shale.examples.test.tiger;
+
+import org.apache.shale.tiger.managed.Bean;
+import org.apache.shale.tiger.managed.Property;
+import org.apache.shale.tiger.managed.Scope;
+import org.apache.shale.tiger.view.Destroy;
+import org.apache.shale.tiger.view.Init;
+import org.apache.shale.tiger.view.Preprocess;
+import org.apache.shale.tiger.view.Prerender;
+import org.apache.shale.tiger.view.View;
-import org.apache.shale.view.AbstractViewController;
/**
* <p>Second page for subview lifecycle event tests.</p>
*/
-public class Subview2 extends AbstractViewController {
[EMAIL PROTECTED](name="subview2", scope=Scope.REQUEST) @View
+public class Subview2 {
// --------------------------------------------------------------
Properties
// The "Recorder" object for this request
+ @Property(value="#{recorder}")
private Recorder recorder = null;
public Recorder getRecorder() {
return this.recorder;
@@ -46,6 +56,7 @@
/**
* <p>Record an init event.</p>
*/
+ @Init
public void init() {
getRecorder().record("init2");
System.out.println("Subview2.init()");
@@ -55,6 +66,7 @@
/**
* <p>Record a preprocess event.</p>
*/
+ @Preprocess
public void preprocess() {
getRecorder().record("preprocess2");
System.out.println("Subview2.preprocess()");
@@ -64,6 +76,7 @@
/**
* <p>Record a prerender event.</p>
*/
+ @Prerender
public void prerender() {
getRecorder().record("prerender2");
System.out.println("Subview2.prerender()");
@@ -73,6 +86,7 @@
/**
* <p>Record a destroy event.</p>
*/
+ @Destroy
public void destroy() {
getRecorder().record("destroy2");
System.out.println("Subview2.destroy()");
Modified:
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/WEB-INF/faces-config.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=465409&r1=465408&r2=465409
==============================================================================
---
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/WEB-INF/faces-config.xml
Wed Oct 18 15:57:05 2006
@@ -97,6 +97,10 @@
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
+ <!-- Bean "subview1" is declared with annotations -->
+
+ <!-- Bean "subview2" is declared with annotations -->
+
<!-- ========== Other Managed Beans ========== -->
</faces-config>
Modified:
shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/menu.jsp
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/menu.jsp?view=diff&rev=465409&r1=465408&r2=465409
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/menu.jsp
(original)
+++ shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/menu.jsp
Wed Oct 18 15:57:05 2006
@@ -37,6 +37,7 @@
<li><a href="lifecycle1.faces">Lifecyle Navigation Events</a></li>
<li><a href="standard.faces">Standard ViewController Lifecycle
Events</a></li>
<li><a href="status.faces">Static Status Information</a></li>
+ <li><a href="subview1.faces">Subview Lifecycle Events</a></li>
</ul>
Modified:
shale/framework/trunk/shale-apps/shale-test-tiger/src/test/java/org/apache/shale/examples/test/tiger/systest/IntegrationTestCase.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/test/java/org/apache/shale/examples/test/tiger/systest/IntegrationTestCase.java?view=diff&rev=465409&r1=465408&r2=465409
==============================================================================
---
shale/framework/trunk/shale-apps/shale-test-tiger/src/test/java/org/apache/shale/examples/test/tiger/systest/IntegrationTestCase.java
(original)
+++
shale/framework/trunk/shale-apps/shale-test-tiger/src/test/java/org/apache/shale/examples/test/tiger/systest/IntegrationTestCase.java
Wed Oct 18 15:57:05 2006
@@ -343,4 +343,34 @@
}
+ // Test /subview1.jsp
+ public void testSubview() throws Exception {
+
+ HtmlElement element;
+ page("/subview1.faces");
+ assertEquals("Subview Lifecycle Events", title());
+
+ // Validate values for initial non-postback call
+
+ element = element("recorderEvents");
+ assertNotNull(element);
+ assertEquals("init1/prerender1/", element.asText());
+
+ // Click the resubmit hyperlink
+
+ HtmlAnchor anchor = (HtmlAnchor) element("form:resubmit");
+ assertNotNull(anchor);
+ link(anchor);
+
+ // Validate values for subsequent postback call
+
+ assertEquals("Subview Lifecycle Events", title());
+
+ element = element("recorderEvents");
+ assertNotNull(element);
+ assertEquals("init1/preprocess1/init2/preprocess2/prerender1/",
element.asText());
+
+ }
+
+
}
