You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sl...@apache.org on 2009/01/15 01:12:34 UTC
svn commit: r734572 - in
/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context:
IsRenderedTest.java RenderPhaseClientIdsTest.java
ResponseWrapperSwitchTest.java TestIsAjaxRequest.java
Author: slessard
Date: Wed Jan 14 16:12:34 2009
New Revision: 734572
URL: http://svn.apache.org/viewvc?rev=734572&view=rev
Log:
Fix test compilation issue.
Modified:
myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java
myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java
myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java
myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java?rev=734572&r1=734571&r2=734572&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/IsRenderedTest.java Wed Jan 14 16:12:34 2009
@@ -18,6 +18,8 @@
import java.util.HashMap;
import java.util.Map;
import javax.faces.context.FacesContext;
+import javax.faces.context.PartialViewContext;
+
import org.apache.myfaces.context.servlet.FacesContextImpl;
import org.apache.shale.test.base.AbstractJsfTestCase;
@@ -49,22 +51,25 @@
//otherwise it is false!
Map<String, String> requestParamMap = new HashMap<String, String>();
- requestParamMap.put(FacesContext.PARTIAL_EXECUTE_PARAM_NAME, FacesContext.NO_PARTIAL_PHASE_CLIENT_IDS);
+ requestParamMap.put(PartialViewContext.PARTIAL_EXECUTE_PARAM_NAME,
+ PartialViewContext.NO_PARTIAL_PHASE_CLIENT_IDS);
ContextTestRequestWrapper wrapper = new ContextTestRequestWrapper(request, requestParamMap);
FacesContext context = new FacesContextImpl(servletContext, wrapper, response);
- assertTrue("Execute none set", context.isExecuteNone());
+ PartialViewContext pprContext = context.getPartialViewContext();
+
+ assertTrue("Execute none set", pprContext.isExecuteNone());
requestParamMap = new HashMap<String,String>();
wrapper = new ContextTestRequestWrapper(request, requestParamMap);
context = new FacesContextImpl(servletContext, wrapper, response);
- assertFalse("Execute none not set", context.isExecuteNone());
+ assertFalse("Execute none not set", pprContext.isExecuteNone());
requestParamMap = new HashMap<String,String>();
- requestParamMap.put(FacesContext.PARTIAL_EXECUTE_PARAM_NAME,"pebkac");
+ requestParamMap.put(PartialViewContext.PARTIAL_EXECUTE_PARAM_NAME,"pebkac");
wrapper = new ContextTestRequestWrapper(request, requestParamMap);
context = new FacesContextImpl(servletContext, wrapper, response);
- assertFalse("Execute none wrong value", context.isExecuteNone());
+ assertFalse("Execute none wrong value", pprContext.isExecuteNone());
}
/**
@@ -78,22 +83,25 @@
//otherwise it is false!
Map<String, String> requestParamMap = new HashMap<String, String>();
- requestParamMap.put(FacesContext.PARTIAL_RENDER_PARAM_NAME, FacesContext.NO_PARTIAL_PHASE_CLIENT_IDS);
+ requestParamMap.put(PartialViewContext.PARTIAL_RENDER_PARAM_NAME,
+ PartialViewContext.NO_PARTIAL_PHASE_CLIENT_IDS);
ContextTestRequestWrapper wrapper = new ContextTestRequestWrapper(request, requestParamMap);
FacesContext context = new FacesContextImpl(servletContext, wrapper, response);
+
+ PartialViewContext pprContext = context.getPartialViewContext();
- assertTrue("Render none set", context.isRenderNone());
+ assertTrue("Render none set", pprContext.isRenderNone());
requestParamMap = new HashMap<String,String>();
wrapper = new ContextTestRequestWrapper(request, requestParamMap);
context = new FacesContextImpl(servletContext, wrapper, response);
- assertFalse("Render none not set", context.isRenderNone());
+ assertFalse("Render none not set", pprContext.isRenderNone());
requestParamMap = new HashMap<String,String>();
- requestParamMap.put(FacesContext.PARTIAL_RENDER_PARAM_NAME,"pebkac");
+ requestParamMap.put(PartialViewContext.PARTIAL_RENDER_PARAM_NAME,"pebkac");
wrapper = new ContextTestRequestWrapper(request, requestParamMap);
context = new FacesContextImpl(servletContext, wrapper, response);
- assertFalse("Render none wrong value", context.isRenderNone());
+ assertFalse("Render none wrong value", pprContext.isRenderNone());
}
@@ -104,12 +112,15 @@
*/
public void testRenderAll1() {
FacesContext context = new FacesContextImpl(servletContext, request, response);
- context.setRenderAll(true);
- assertTrue("override should trigger no matter which condition we have", context.isRenderAll());
+
+ PartialViewContext pprContext = context.getPartialViewContext();
+
+ pprContext.setRenderAll(true);
+ assertTrue("override should trigger no matter which condition we have", pprContext.isRenderAll());
context = new FacesContextImpl(servletContext, request, response);
- context.setRenderAll(false);
- assertFalse("override should trigger no matter which condition we have", context.isRenderAll());
+ pprContext.setRenderAll(false);
+ assertFalse("override should trigger no matter which condition we have", pprContext.isRenderAll());
}
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java?rev=734572&r1=734571&r2=734572&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java Wed Jan 14 16:12:34 2009
@@ -20,6 +20,8 @@
import java.util.List;
import java.util.Map;
import javax.faces.context.FacesContext;
+import javax.faces.context.PartialViewContext;
+
import org.apache.myfaces.context.servlet.FacesContextImpl;
import org.apache.shale.test.base.AbstractJsfTestCase;
@@ -44,11 +46,14 @@
public void testRequestParams1() {
String empty = " \n \t ";
Map<String, String> requestParamMap = new HashMap<String, String>();
- requestParamMap.put(FacesContext.PARTIAL_RENDER_PARAM_NAME, empty);
+ requestParamMap.put(PartialViewContext.PARTIAL_RENDER_PARAM_NAME, empty);
ContextTestRequestWrapper wrapper = new ContextTestRequestWrapper(request, requestParamMap);
FacesContext context = new FacesContextImpl(servletContext, wrapper, response);
- assertTrue(context.getRenderPhaseClientIds().isEmpty());
+
+ PartialViewContext pprContext = context.getPartialViewContext();
+
+ assertTrue(pprContext.getRenderPhaseClientIds().isEmpty());
}
/**
@@ -60,7 +65,10 @@
ContextTestRequestWrapper wrapper = new ContextTestRequestWrapper(request, requestParamMap);
FacesContext context = new FacesContextImpl(servletContext, wrapper, response);
- assertTrue(context.getRenderPhaseClientIds().isEmpty());
+
+ PartialViewContext pprContext = context.getPartialViewContext();
+
+ assertTrue(pprContext.getRenderPhaseClientIds().isEmpty());
}
/**
@@ -68,11 +76,15 @@
*/
public void testRequestParams4() {
Map<String, String> requestParamMap = new HashMap<String, String>();
- requestParamMap.put(FacesContext.PARTIAL_RENDER_PARAM_NAME, FacesContext.NO_PARTIAL_PHASE_CLIENT_IDS);
+ requestParamMap.put(PartialViewContext.PARTIAL_RENDER_PARAM_NAME,
+ PartialViewContext.NO_PARTIAL_PHASE_CLIENT_IDS);
ContextTestRequestWrapper wrapper = new ContextTestRequestWrapper(request, requestParamMap);
FacesContext context = new FacesContextImpl(servletContext, wrapper, response);
- assertTrue(context.getRenderPhaseClientIds().isEmpty());
+
+ PartialViewContext pprContext = context.getPartialViewContext();
+
+ assertTrue(pprContext.getRenderPhaseClientIds().isEmpty());
}
/**
@@ -81,12 +93,15 @@
public void testRequestParams5() {
String params = " view1:panel1:_component1 ";
Map<String, String> requestParamMap = new HashMap<String, String>();
- requestParamMap.put(FacesContext.PARTIAL_RENDER_PARAM_NAME, params);
+ requestParamMap.put(PartialViewContext.PARTIAL_RENDER_PARAM_NAME, params);
ContextTestRequestWrapper wrapper = new ContextTestRequestWrapper(request, requestParamMap);
FacesContext context = new FacesContextImpl(servletContext, wrapper, response);
- assertTrue("Length must be one",context.getRenderPhaseClientIds().size() == 1);
- assertTrue("Value match",context.getRenderPhaseClientIds().get(0).equals("view1:panel1:_component1"));
+
+ PartialViewContext pprContext = context.getPartialViewContext();
+
+ assertTrue("Length must be one",pprContext.getRenderPhaseClientIds().size() == 1);
+ assertTrue("Value match",pprContext.getRenderPhaseClientIds().get(0).equals("view1:panel1:_component1"));
}
/**
@@ -96,17 +111,20 @@
public void testRequestParams6() {
String params = " view1:panel1:_component1,view1:panel1:_component2 \n , component3, component4 ";
Map<String, String> requestParamMap = new HashMap<String, String>();
- requestParamMap.put(FacesContext.PARTIAL_RENDER_PARAM_NAME, params);
+ requestParamMap.put(PartialViewContext.PARTIAL_RENDER_PARAM_NAME, params);
ContextTestRequestWrapper wrapper = new ContextTestRequestWrapper(request, requestParamMap);
FacesContext context = new FacesContextImpl(servletContext, wrapper, response);
- assertTrue("Length must be four",context.getRenderPhaseClientIds().size() == 4);
+
+ PartialViewContext pprContext = context.getPartialViewContext();
+
+ assertTrue("Length must be four",pprContext.getRenderPhaseClientIds().size() == 4);
- assertTrue("Value match",context.getRenderPhaseClientIds().get(0).equals("view1:panel1:_component1"));
- assertTrue("Value match",context.getRenderPhaseClientIds().get(2).equals("component3"));
+ assertTrue("Value match",pprContext.getRenderPhaseClientIds().get(0).equals("view1:panel1:_component1"));
+ assertTrue("Value match",pprContext.getRenderPhaseClientIds().get(2).equals("component3"));
- assertTrue("Value match",context.getRenderPhaseClientIds().get(3).equals("component4"));
+ assertTrue("Value match",pprContext.getRenderPhaseClientIds().get(3).equals("component4"));
}
/**
@@ -119,12 +137,15 @@
renderPhaseClientIds.add("component2");
String params = " view1:panel1:_component1,view1:panel1:_component2 \n , component3, component4 ";
Map<String, String> requestParamMap = new HashMap<String, String>();
- requestParamMap.put(FacesContext.PARTIAL_RENDER_PARAM_NAME, params);
+ requestParamMap.put(PartialViewContext.PARTIAL_RENDER_PARAM_NAME, params);
ContextTestRequestWrapper wrapper = new ContextTestRequestWrapper(request, requestParamMap);
FacesContext context = new FacesContextImpl(servletContext, wrapper, response);
- context.setRenderPhaseClientIds(renderPhaseClientIds);
- assertTrue(context.getRenderPhaseClientIds().size() == 2);
+
+ PartialViewContext pprContext = context.getPartialViewContext();
+
+ pprContext.setRenderPhaseClientIds(renderPhaseClientIds);
+ assertTrue(pprContext.getRenderPhaseClientIds().size() == 2);
}
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java?rev=734572&r1=734571&r2=734572&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/ResponseWrapperSwitchTest.java Wed Jan 14 16:12:34 2009
@@ -200,7 +200,7 @@
assertTrue("responsewriter not null", responseWriter != null);
- context.enableResponseWriting(false);
+ context.getPartialViewContext().enableResponseWriting(false);
try {
responseWriter.append("hello world");
@@ -231,7 +231,7 @@
NewStreamingMockResponse resp = new NewStreamingMockResponse(response, sOstr, writer);
FacesContext context = new FacesContextImpl(servletContext, request, resp);
- context.enableResponseWriting(false);
+ context.getPartialViewContext().enableResponseWriting(false);
try {
OutputStream finalOstr = (OutputStream) ((ServletResponse) context.getExternalContext().getResponse()).getOutputStream();
PrintWriter finalWriter = new PrintWriter(finalOstr);
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java?rev=734572&r1=734571&r2=734572&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/context/TestIsAjaxRequest.java Wed Jan 14 16:12:34 2009
@@ -29,7 +29,7 @@
* @version $Revision$ $Date$
*/
public class TestIsAjaxRequest extends AbstractJsfTestCase {
- Map requestParameterMap = null;
+ Map<String, String> requestParameterMap = null;
FacesContext context = null;
public TestIsAjaxRequest() {
@@ -51,13 +51,13 @@
public void testNoEntry() {
- assertFalse("no ajax request found", context.isAjaxRequest());
+ assertFalse("no ajax request found", context.getPartialViewContext().isAjaxRequest());
}
public void testEntry() {
requestParameterMap.put("javax.faces.partial.ajax", "yess");
- assertTrue("no ajax request found", context.isAjaxRequest());
+ assertTrue("no ajax request found", context.getPartialViewContext().isAjaxRequest());
}