[seam-commits] Seam SVN: r9560 - trunk/src/test/unit/org/jboss/seam/test/unit.

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2008-11-13 19:47:05 -0500 (Thu, 13 Nov 2008)
New Revision: 9560

Modified:
   trunk/src/test/unit/org/jboss/seam/test/unit/AbstractPageTest.java
   trunk/src/test/unit/org/jboss/seam/test/unit/PageActionsTest.java
Log:
update PageActionsTest to override the correct redirect() method on FacesManager


Modified: trunk/src/test/unit/org/jboss/seam/test/unit/AbstractPageTest.java
===================================================================
--- trunk/src/test/unit/org/jboss/seam/test/unit/AbstractPageTest.java	2008-11-13 16:55:11 UTC (rev 9559)
+++ trunk/src/test/unit/org/jboss/seam/test/unit/AbstractPageTest.java	2008-11-14 00:47:05 UTC (rev 9560)
@@ -63,7 +63,7 @@
       Lifecycle.unmockApplication();
    }
    
-   private void installComponents(Context appContext)
+   protected void installComponents(Context appContext)
    {
       Init init = new Init();
       init.setTransactionManagementEnabled(false);
@@ -72,13 +72,10 @@
       appContext.set(Component.PROPERTIES, properties);
       properties.put(Seam.getComponentName(Pages.class) + ".resources", new Conversions.FlatPropertyValue(TEST_PAGES_DOT_XML));
 
-      installComponent(appContext, NoRedirectFacesManager.class);
       installComponent(appContext, ResourceLoader.class);
       installComponent(appContext, Expressions.class);
       installComponent(appContext, Pages.class);
       installComponent(appContext, Interpolator.class);
-
-      installComponent(appContext, TestActions.class);
    }
 
    /**

Modified: trunk/src/test/unit/org/jboss/seam/test/unit/PageActionsTest.java
===================================================================
--- trunk/src/test/unit/org/jboss/seam/test/unit/PageActionsTest.java	2008-11-13 16:55:11 UTC (rev 9559)
+++ trunk/src/test/unit/org/jboss/seam/test/unit/PageActionsTest.java	2008-11-14 00:47:05 UTC (rev 9560)
@@ -5,6 +5,7 @@
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.intercept.BypassInterceptors;
+import org.jboss.seam.contexts.Context;
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.faces.FacesManager;
 import org.jboss.seam.mock.MockHttpServletRequest;
@@ -24,6 +25,14 @@
  */
 public class PageActionsTest extends AbstractPageTest
 {
+   @Override
+   protected void installComponents(Context appContext)
+   {
+      super.installComponents(appContext);
+      installComponent(appContext, NoRedirectFacesManager.class);
+      installComponent(appContext, TestActions.class);
+   }
+
    /**
     * This test verifies that a non-null outcome will short-circuit the page
     * actions. It tests two difference variations. The first variation includes
@@ -205,7 +214,7 @@
    public static class NoRedirectFacesManager extends FacesManager {
 
       @Override
-      public void redirect(String viewId, Map<String, Object> parameters, boolean includeConversationId)
+      public void redirect(String viewId, Map<String, Object> parameters, boolean includeConversationId, boolean includePageParams)
       {
          Contexts.getEventContext().set("lastRedirectViewId", viewId);
          // a lot of shit happens we don't need; the important part is that the