You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/11/22 14:57:14 UTC
svn commit: r883078 [5/5] - in /tiles/sandbox/trunk/tiles3:
tiles-api/src/main/java/org/apache/tiles/access/
tiles-api/src/test/java/org/apache/tiles/access/
tiles-core/src/main/java/org/apache/tiles/startup/
tiles-core/src/test/java/org/apache/tiles/s...
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java?rev=883078&r1=883077&r2=883078&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java Sun Nov 22 13:57:09 2009
@@ -37,9 +37,8 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.util.ApplicationContextUtil;
import org.apache.tiles.template.GetAsStringModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
@@ -78,6 +77,8 @@
*/
private Attribute attribute;
+ private ApplicationContext applicationContext;
+
/**
* Sets up the model to test.
*/
@@ -86,6 +87,10 @@
tModel = createMock(GetAsStringModel.class);
servletContext = createMock(ServletContext.class);
attribute = new Attribute("myAttributeValue");
+ applicationContext = createMock(ApplicationContext.class);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
}
/**
@@ -99,24 +104,19 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
attribute = new Attribute("myAttributeValue");
Map<String, Object> params = createParams();
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- tModel.execute(eq(container), eq(writer), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"),
- eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute),
- isA(VelocityTilesRequestContext.class));
+ tModel.execute(eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"), eq("myDefaultValueType"),
+ eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.execute(request, response, velocityContext, params);
renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
@@ -129,23 +129,19 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.start(eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"),
- eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class));
+ tModel.start(eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"), eq("myDefaultValueType"),
+ eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, container, request, response, velocityContext, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, applicationContext);
initializeModel();
model.start(request, response, velocityContext, params);
assertEquals(1, paramStack.size());
assertEquals(params, paramStack.peek());
- verify(tModel, servletContext, container, request, response, velocityContext, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, applicationContext);
}
/**
@@ -159,25 +155,21 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
paramStack.push(params);
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.end(eq(container), eq(writer), eq(false), isA(VelocityTilesRequestContext.class));
+ tModel.end(eq(false), isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.end(request, response, velocityContext);
renderable.render(internalContextAdapter, writer);
assertTrue(paramStack.isEmpty());
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java?rev=883078&r1=883077&r2=883078&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java Sun Nov 22 13:57:09 2009
@@ -35,9 +35,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.util.ApplicationContextUtil;
import org.apache.tiles.template.ImportAttributeModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
@@ -66,6 +65,8 @@
*/
private ServletContext servletContext;
+ private ApplicationContext applicationContext;
+
/**
* Sets up the model to test.
*/
@@ -73,6 +74,10 @@
public void setUp() {
tModel = createMock(ImportAttributeModel.class);
servletContext = createMock(ServletContext.class);
+ applicationContext = createMock(ApplicationContext.class);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
}
/**
@@ -86,27 +91,22 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put("one", "value1");
attributes.put("two", "value2");
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false),
- isA(VelocityTilesRequestContext.class))).andReturn(attributes);
+ expect(tModel.getImportedAttributes(eq("myName"), eq("myToName"), eq(false), isA(VelocityTilesRequestContext.class))).andReturn(attributes);
expect(internalContextAdapter.put("one", "value1")).andReturn("value1");
expect(internalContextAdapter.put("two", "value2")).andReturn("value2");
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.execute(request, response, velocityContext, params);
renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
@@ -120,7 +120,6 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
@@ -128,20 +127,16 @@
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put("one", "value1");
attributes.put("two", "value2");
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false),
- isA(VelocityTilesRequestContext.class))).andReturn(attributes);
+ expect(tModel.getImportedAttributes(eq("myName"), eq("myToName"), eq(false), isA(VelocityTilesRequestContext.class))).andReturn(attributes);
request.setAttribute("one", "value1");
request.setAttribute("two", "value2");
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.execute(request, response, velocityContext, params);
renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
@@ -156,7 +151,6 @@
HttpServletResponse response = createMock(HttpServletResponse.class);
HttpSession session = createMock(HttpSession.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
@@ -164,21 +158,17 @@
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put("one", "value1");
attributes.put("two", "value2");
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false),
- isA(VelocityTilesRequestContext.class))).andReturn(attributes);
+ expect(tModel.getImportedAttributes(eq("myName"), eq("myToName"), eq(false), isA(VelocityTilesRequestContext.class))).andReturn(attributes);
expect(request.getSession()).andReturn(session).times(2);
session.setAttribute("one", "value1");
session.setAttribute("two", "value2");
- replay(tModel, servletContext, request, response, session, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, session, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.execute(request, response, velocityContext, params);
renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, session, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, session, velocityContext, internalContextAdapter, applicationContext);
}
/**
@@ -192,7 +182,6 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
@@ -200,20 +189,16 @@
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put("one", "value1");
attributes.put("two", "value2");
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false),
- isA(VelocityTilesRequestContext.class))).andReturn(attributes);
+ expect(tModel.getImportedAttributes(eq("myName"), eq("myToName"), eq(false), isA(VelocityTilesRequestContext.class))).andReturn(attributes);
servletContext.setAttribute("one", "value1");
servletContext.setAttribute("two", "value2");
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.execute(request, response, velocityContext, params);
renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java?rev=883078&r1=883077&r2=883078&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java Sun Nov 22 13:57:09 2009
@@ -37,9 +37,8 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.util.ApplicationContextUtil;
import org.apache.tiles.template.InsertAttributeModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
@@ -78,6 +77,8 @@
*/
private Attribute attribute;
+ private ApplicationContext applicationContext;
+
/**
* Sets up the model to test.
*/
@@ -86,6 +87,10 @@
tModel = createMock(InsertAttributeModel.class);
servletContext = createMock(ServletContext.class);
attribute = new Attribute("myAttributeValue");
+ applicationContext = createMock(ApplicationContext.class);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
}
/**
@@ -99,24 +104,19 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
attribute = new Attribute("myAttributeValue");
Map<String, Object> params = createParams();
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- tModel.execute(eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"),
- eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute),
- isA(VelocityTilesRequestContext.class));
+ tModel.execute(eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"),
+ eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.execute(request, response, velocityContext, params);
renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
@@ -129,23 +129,19 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.start(eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"),
- eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class));
+ tModel.start(eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"), eq("myDefaultValueType"),
+ eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, container, request, response, velocityContext, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, applicationContext);
initializeModel();
model.start(request, response, velocityContext, params);
assertEquals(1, paramStack.size());
assertEquals(params, paramStack.peek());
- verify(tModel, servletContext, container, request, response, velocityContext, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, applicationContext);
}
/**
@@ -159,25 +155,21 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
paramStack.push(params);
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.end(eq(container), eq(false), isA(VelocityTilesRequestContext.class));
+ tModel.end(eq(false), isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.end(request, response, velocityContext);
renderable.render(internalContextAdapter, writer);
assertTrue(paramStack.isEmpty());
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java?rev=883078&r1=883077&r2=883078&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java Sun Nov 22 13:57:09 2009
@@ -36,9 +36,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.ArrayStack;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.util.ApplicationContextUtil;
import org.apache.tiles.template.InsertDefinitionModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
@@ -72,6 +71,8 @@
*/
private ServletContext servletContext;
+ private ApplicationContext applicationContext;
+
/**
* Sets up the model to test.
*/
@@ -79,6 +80,10 @@
public void setUp() {
tModel = createMock(InsertDefinitionModel.class);
servletContext = createMock(ServletContext.class);
+ applicationContext = createMock(ApplicationContext.class);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
}
/**
@@ -92,23 +97,19 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- tModel.execute(eq(container), eq("myDefinitionName"), eq("myTemplate"),
- eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"),
- eq("myPreparer"), isA(VelocityTilesRequestContext.class));
+ tModel.execute(eq("myDefinitionName"), eq("myTemplate"), eq("myTemplateType"),
+ eq("myTemplateExpression"), eq("myRole"), eq("myPreparer"),
+ isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.execute(request, response, velocityContext, params);
renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
@@ -121,22 +122,18 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.start(eq(container), isA(VelocityTilesRequestContext.class));
+ tModel.start(isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, container, request, response, velocityContext, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, applicationContext);
initializeModel();
model.start(request, response, velocityContext, params);
assertEquals(1, paramStack.size());
assertEquals(params, paramStack.peek());
- verify(tModel, servletContext, container, request, response, velocityContext, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, applicationContext);
}
/**
@@ -150,27 +147,23 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
paramStack.push(params);
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.end(eq(container), eq("myDefinitionName"), eq("myTemplate"),
- eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"),
- eq("myPreparer"), isA(VelocityTilesRequestContext.class));
+ tModel.end(eq("myDefinitionName"), eq("myTemplate"), eq("myTemplateType"),
+ eq("myTemplateExpression"), eq("myRole"), eq("myPreparer"),
+ isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.end(request, response, velocityContext);
renderable.render(internalContextAdapter, writer);
assertTrue(paramStack.isEmpty());
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java?rev=883078&r1=883077&r2=883078&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java Sun Nov 22 13:57:09 2009
@@ -36,9 +36,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.ArrayStack;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.util.ApplicationContextUtil;
import org.apache.tiles.template.InsertTemplateModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
@@ -72,6 +71,8 @@
*/
private ServletContext servletContext;
+ private ApplicationContext applicationContext;
+
/**
* Sets up the model to test.
*/
@@ -79,6 +80,10 @@
public void setUp() {
tModel = createMock(InsertTemplateModel.class);
servletContext = createMock(ServletContext.class);
+ applicationContext = createMock(ApplicationContext.class);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
}
/**
@@ -92,23 +97,19 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- tModel.execute(eq(container), eq("myTemplate"), eq("myTemplateType"),
- eq("myTemplateExpression"), eq("myRole"), eq("myPreparer"),
- isA(VelocityTilesRequestContext.class));
+ tModel.execute(eq("myTemplate"), eq("myTemplateType"), eq("myTemplateExpression"),
+ eq("myRole"), eq("myPreparer"), isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.execute(request, response, velocityContext, params);
renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
@@ -121,22 +122,18 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.start(eq(container), isA(VelocityTilesRequestContext.class));
+ tModel.start(isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, container, request, response, velocityContext, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, applicationContext);
initializeModel();
model.start(request, response, velocityContext, params);
assertEquals(1, paramStack.size());
assertEquals(params, paramStack.peek());
- verify(tModel, servletContext, container, request, response, velocityContext, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, applicationContext);
}
/**
@@ -150,27 +147,23 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
paramStack.push(params);
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.end(eq(container), eq("myTemplate"), eq("myTemplateType"),
- eq("myTemplateExpression"), eq("myRole"),
- eq("myPreparer"), isA(VelocityTilesRequestContext.class));
+ tModel.end(eq("myTemplate"), eq("myTemplateType"), eq("myTemplateExpression"),
+ eq("myRole"), eq("myPreparer"),
+ isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
initializeModel();
Renderable renderable = model.end(request, response, velocityContext);
renderable.render(internalContextAdapter, writer);
assertTrue(paramStack.isEmpty());
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java?rev=883078&r1=883077&r2=883078&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java Sun Nov 22 13:57:09 2009
@@ -33,9 +33,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.ArrayStack;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.util.ApplicationContextUtil;
import org.apache.tiles.template.PutAttributeModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
@@ -68,6 +67,8 @@
*/
private ServletContext servletContext;
+ private ApplicationContext applicationContext;
+
/**
* Sets up the model to test.
*/
@@ -75,6 +76,10 @@
public void setUp() {
tModel = createMock(PutAttributeModel.class);
servletContext = createMock(ServletContext.class);
+ applicationContext = createMock(ApplicationContext.class);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
}
/**
@@ -87,20 +92,15 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> params = createParams();
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- tModel.execute(eq(container), eq("myName"), eq("myValue"), eq("myExpression"),
- (String) isNull(), eq("myRole"), eq("myType"), eq(false),
- isA(VelocityTilesRequestContext.class));
+ tModel.execute(eq("myName"), eq("myValue"), eq("myExpression"), (String) isNull(),
+ eq("myRole"), eq("myType"), eq(false), isA(VelocityTilesRequestContext.class));
- replay(tModel, container, servletContext, request, response, velocityContext, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, applicationContext);
initializeModel();
assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.execute(request, response, velocityContext, params));
- verify(tModel, container, servletContext, request, response, velocityContext, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, applicationContext);
}
/**
@@ -115,20 +115,16 @@
Context velocityContext = createMock(Context.class);
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>();
- TilesContainer container = createMock(TilesContainer.class);
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
tModel.start(isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, request, response, velocityContext, container, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, applicationContext);
initializeModel();
model.start(request, response, velocityContext, params);
assertEquals(1, parameterMapStack.size());
assertEquals(params, parameterMapStack.peek());
- verify(tModel, servletContext, request, response, velocityContext, container, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, applicationContext);
}
/**
@@ -141,24 +137,19 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>();
parameterMapStack.push(params);
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
- tModel.end(eq(container), eq("myName"), eq("myValue"), eq("myExpression"),
- (String) isNull(), eq("myRole"), eq("myType"), eq(false),
- isA(VelocityTilesRequestContext.class));
+ tModel.end(eq("myName"), eq("myValue"), eq("myExpression"), (String) isNull(),
+ eq("myRole"), eq("myType"), eq(false), isA(VelocityTilesRequestContext.class));
- replay(tModel, container, servletContext, request, response, velocityContext, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, applicationContext);
initializeModel();
assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext));
assertTrue(parameterMapStack.isEmpty());
- verify(tModel, container, servletContext, request, response, velocityContext, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, applicationContext);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java?rev=883078&r1=883077&r2=883078&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java Sun Nov 22 13:57:09 2009
@@ -33,9 +33,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.ArrayStack;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.util.ApplicationContextUtil;
import org.apache.tiles.template.PutListAttributeModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
@@ -68,6 +67,8 @@
*/
private ServletContext servletContext;
+ private ApplicationContext applicationContext;
+
/**
* Sets up the model to test.
*/
@@ -75,6 +76,10 @@
public void setUp() {
tModel = createMock(PutListAttributeModel.class);
servletContext = createMock(ServletContext.class);
+ applicationContext = createMock(ApplicationContext.class);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
}
/**
@@ -89,20 +94,16 @@
Context velocityContext = createMock(Context.class);
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>();
- TilesContainer container = createMock(TilesContainer.class);
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
tModel.start(eq("myRole"), eq(false), isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, request, response, velocityContext, container, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, applicationContext);
initializeModel();
model.start(request, response, velocityContext, params);
assertEquals(1, parameterMapStack.size());
assertEquals(params, parameterMapStack.peek());
- verify(tModel, servletContext, request, response, velocityContext, container, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, applicationContext);
}
/**
@@ -118,19 +119,15 @@
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>();
parameterMapStack.push(params);
- TilesContainer container = createMock(TilesContainer.class);
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- tModel.end(eq(container), eq("myName"), eq(false), isA(VelocityTilesRequestContext.class));
+ tModel.end(eq("myName"), eq(false), isA(VelocityTilesRequestContext.class));
- replay(tModel, servletContext, container, request, response, velocityContext, applicationContext);
+ replay(tModel, servletContext, request, response, velocityContext, applicationContext);
initializeModel();
assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext));
assertTrue(parameterMapStack.isEmpty());
- verify(tModel, servletContext, container, request, response, velocityContext, applicationContext);
+ verify(tModel, servletContext, request, response, velocityContext, applicationContext);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java?rev=883078&r1=883077&r2=883078&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java Sun Nov 22 13:57:09 2009
@@ -21,8 +21,9 @@
package org.apache.tiles.velocity.template;
-import static org.junit.Assert.*;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
+import static org.junit.Assert.*;
import java.util.HashMap;
import java.util.Map;
@@ -31,12 +32,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.Attribute;
-import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.Renderable;
import org.junit.Before;
@@ -78,10 +75,10 @@
private Context velocityContext;
/**
- * @throws java.lang.Exception If something goes wrong.
+ * Sets up the model.
*/
@Before
- public void setUp() throws Exception {
+ public void setUp() {
tool = new Tiles2Tool();
request = createMock(HttpServletRequest.class);
response = createMock(HttpServletResponse.class);
@@ -403,22 +400,6 @@
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.Tiles2Tool#setCurrentContainer(java.lang.String)}.
- */
- @Test
- public void testSetCurrentContainer() {
- TilesContainer container = createMock(TilesContainer.class);
-
- expect(servletContext.getAttribute("myKey")).andReturn(container);
- request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
-
- replay(velocityContext, request, response, servletContext, container);
- initializeTool();
- assertEquals(tool, tool.setCurrentContainer("myKey"));
- verify(velocityContext, request, response, servletContext, container);
- }
-
- /**
* Test method for {@link org.apache.tiles.velocity.template.Tiles2Tool#start(java.util.Map)}.
*/
@Test
@@ -457,30 +438,6 @@
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.Tiles2Tool#getAttribute(java.lang.String)}.
- */
- @Test
- public void testGetAttribute() {
- TilesContainer container = createMock(TilesContainer.class);
- AttributeContext attributeContext = createMock(AttributeContext.class);
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
- Attribute attribute = new Attribute("myAttributeValue");
-
- expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(
- container
- .getAttributeContext(isA(VelocityTilesRequestContext.class)))
- .andReturn(attributeContext);
- expect(attributeContext.getAttribute("myAttribute")).andReturn(attribute);
-
- replay(velocityContext, request, response, servletContext, container, attributeContext, applicationContext);
- initializeTool();
- assertEquals(attribute, tool.getAttribute("myAttribute"));
- verify(velocityContext, request, response, servletContext, container, attributeContext, applicationContext);
- }
-
- /**
* Test method for {@link org.apache.tiles.velocity.template.Tiles2Tool#toString()}.
*/
@Test
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java?rev=883078&r1=883077&r2=883078&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java Sun Nov 22 13:57:09 2009
@@ -21,11 +21,14 @@
package org.apache.tiles.velocity.template;
-import static org.junit.Assert.*;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -37,6 +40,7 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.util.ApplicationContextUtil;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
@@ -101,9 +105,11 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
Attribute attribute = new Attribute("myValue");
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
.andReturn(container);
- expect(container.getApplicationContext()).andReturn(applicationContext);
expect(container.getAttributeContext(isA(VelocityTilesRequestContext.class)))
.andReturn(attributeContext);
expect(attributeContext.getAttribute("myAttribute")).andReturn(attribute);
@@ -171,7 +177,9 @@
StringWriter writer = new StringWriter();
Attribute attribute = new Attribute("myValue");
- expect(container.getApplicationContext()).andReturn(applicationContext);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
.andReturn(container);
container.render(eq(attribute), isA(VelocityTilesRequestContext.class));
@@ -195,7 +203,9 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
StringWriter writer = new StringWriter();
- expect(container.getApplicationContext()).andReturn(applicationContext);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
.andReturn(container);
container.render(eq("myDefinition"), isA(VelocityTilesRequestContext.class));
@@ -218,7 +228,9 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
StringWriter writer = new StringWriter();
- expect(container.getApplicationContext()).andReturn(applicationContext);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
.andReturn(container);
container.renderContext(isA(VelocityTilesRequestContext.class));
@@ -239,7 +251,9 @@
AttributeContext attributeContext = createMock(AttributeContext.class);
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
.andReturn(container);
expect(container.startContext(isA(VelocityTilesRequestContext.class)))
@@ -260,7 +274,9 @@
AttributeContext attributeContext = createMock(AttributeContext.class);
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
.andReturn(container);
container.endContext(isA(VelocityTilesRequestContext.class));
@@ -280,7 +296,9 @@
AttributeContext attributeContext = createMock(AttributeContext.class);
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- expect(container.getApplicationContext()).andReturn(applicationContext);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
.andReturn(container);
expect(container.getAttributeContext(isA(VelocityTilesRequestContext.class)))
@@ -299,14 +317,21 @@
@Test
public void testSetCurrentContainer() {
TilesContainer container = createMock(TilesContainer.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
+ Map<String, Object> applicationScope = new HashMap<String, Object>();
+ applicationScope.put("myKey", container);
- expect(servletContext.getAttribute("myKey")).andReturn(container);
+ expect(servletContext.getAttribute(ApplicationContextUtil
+ .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
+ .anyTimes();
+ expect(applicationContext.getApplicationScope()).andReturn(applicationScope);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
- replay(velocityContext, request, response, servletContext, container);
+ replay(velocityContext, request, response, servletContext, container, applicationContext);
initializeTool();
assertEquals(tool, tool.setCurrentContainer("myKey"));
- verify(velocityContext, request, response, servletContext, container);
+ verify(velocityContext, request, response, servletContext, container, applicationContext);
}
/**