Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java?rev=797765&r1=797764&r2=797765&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java (original) +++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java Sat Jul 25 13:20:26 2009 @@ -21,16 +21,17 @@ 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; -import java.util.Stack; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.tiles.ArrayStack; import org.apache.tiles.servlet.context.ServletUtil; import org.apache.tiles.template.AddListAttributeModel; import org.apache.tiles.velocity.context.VelocityUtil; @@ -73,7 +74,7 @@ HttpServletResponse response = createMock(HttpServletResponse.class); Context velocityContext = createMock(Context.class); Map<String, Object> params = createParams(); - Stack<Object> composeStack = new Stack<Object>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) .andReturn(composeStack); @@ -94,7 +95,7 @@ HttpServletRequest request = createMock(HttpServletRequest.class); HttpServletResponse response = createMock(HttpServletResponse.class); Context velocityContext = createMock(Context.class); - Stack<Object> composeStack = new Stack<Object>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) .andReturn(composeStack);
Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java?rev=797765&r1=797764&r2=797765&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java (original) +++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java Sat Jul 25 13:20:26 2009 @@ -21,18 +21,19 @@ 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.util.HashMap; import java.util.Map; -import java.util.Stack; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.tiles.ArrayStack; import org.apache.tiles.mgmt.MutableTilesContainer; import org.apache.tiles.servlet.context.ServletUtil; import org.apache.tiles.template.DefinitionModel; @@ -83,7 +84,7 @@ Context velocityContext = createMock(Context.class); MutableTilesContainer container = createMock(MutableTilesContainer.class); Map<String, Object> params = createParams(); - Stack<Object> composeStack = new Stack<Object>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) @@ -108,7 +109,7 @@ HttpServletResponse response = createMock(HttpServletResponse.class); Context velocityContext = createMock(Context.class); Map<String, Object> params = createParams(); - Stack<Object> composeStack = new Stack<Object>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) .andReturn(composeStack); @@ -132,7 +133,7 @@ HttpServletResponse response = createMock(HttpServletResponse.class); Context velocityContext = createMock(Context.class); MutableTilesContainer container = createMock(MutableTilesContainer.class); - Stack<Object> composeStack = new Stack<Object>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java?rev=797765&r1=797764&r2=797765&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java (original) +++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java Sat Jul 25 13:20:26 2009 @@ -21,20 +21,21 @@ 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.io.Writer; import java.util.HashMap; import java.util.Map; -import java.util.Stack; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.tiles.ArrayStack; import org.apache.tiles.Attribute; import org.apache.tiles.TilesContainer; import org.apache.tiles.servlet.context.ServletUtil; @@ -126,8 +127,8 @@ Context velocityContext = createMock(Context.class); TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); - Stack<Object> composeStack = new Stack<Object>(); - Stack<Map<String, Object>> paramStack = new Stack<Map<String, Object>>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); + ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) .andReturn(composeStack); @@ -159,9 +160,9 @@ TilesContainer container = createMock(TilesContainer.class); InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class); Writer writer = new StringWriter(); - Stack<Object> composeStack = new Stack<Object>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); Map<String, Object> params = createParams(); - Stack<Map<String, Object>> paramStack = new Stack<Map<String, Object>>(); + ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); paramStack.push(params); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java?rev=797765&r1=797764&r2=797765&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java (original) +++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java Sat Jul 25 13:20:26 2009 @@ -21,20 +21,21 @@ 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.io.Writer; import java.util.HashMap; import java.util.Map; -import java.util.Stack; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.tiles.ArrayStack; import org.apache.tiles.Attribute; import org.apache.tiles.TilesContainer; import org.apache.tiles.servlet.context.ServletUtil; @@ -126,8 +127,8 @@ Context velocityContext = createMock(Context.class); TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); - Stack<Object> composeStack = new Stack<Object>(); - Stack<Map<String, Object>> paramStack = new Stack<Map<String, Object>>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); + ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) .andReturn(composeStack); @@ -159,9 +160,9 @@ TilesContainer container = createMock(TilesContainer.class); InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class); Writer writer = new StringWriter(); - Stack<Object> composeStack = new Stack<Object>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); Map<String, Object> params = createParams(); - Stack<Map<String, Object>> paramStack = new Stack<Map<String, Object>>(); + ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); paramStack.push(params); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java?rev=797765&r1=797764&r2=797765&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java (original) +++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java Sat Jul 25 13:20:26 2009 @@ -21,20 +21,21 @@ 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.io.Writer; import java.util.HashMap; import java.util.Map; -import java.util.Stack; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.tiles.ArrayStack; import org.apache.tiles.TilesContainer; import org.apache.tiles.servlet.context.ServletUtil; import org.apache.tiles.template.InsertDefinitionModel; @@ -118,7 +119,7 @@ Context velocityContext = createMock(Context.class); TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); - Stack<Map<String, Object>> paramStack = new Stack<Map<String, Object>>(); + ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); @@ -147,7 +148,7 @@ InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class); Writer writer = new StringWriter(); Map<String, Object> params = createParams(); - Stack<Map<String, Object>> paramStack = new Stack<Map<String, Object>>(); + ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); paramStack.push(params); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java?rev=797765&r1=797764&r2=797765&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java (original) +++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java Sat Jul 25 13:20:26 2009 @@ -21,20 +21,21 @@ 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.io.Writer; import java.util.HashMap; import java.util.Map; -import java.util.Stack; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.tiles.ArrayStack; import org.apache.tiles.TilesContainer; import org.apache.tiles.servlet.context.ServletUtil; import org.apache.tiles.template.InsertTemplateModel; @@ -118,7 +119,7 @@ Context velocityContext = createMock(Context.class); TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); - Stack<Map<String, Object>> paramStack = new Stack<Map<String, Object>>(); + ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); @@ -147,7 +148,7 @@ InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class); Writer writer = new StringWriter(); Map<String, Object> params = createParams(); - Stack<Map<String, Object>> paramStack = new Stack<Map<String, Object>>(); + ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); paramStack.push(params); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java?rev=797765&r1=797764&r2=797765&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java (original) +++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java Sat Jul 25 13:20:26 2009 @@ -21,17 +21,18 @@ 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; -import java.util.Stack; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.tiles.ArrayStack; import org.apache.tiles.TilesContainer; import org.apache.tiles.servlet.context.ServletUtil; import org.apache.tiles.template.PutAttributeModel; @@ -86,7 +87,7 @@ Context velocityContext = createMock(Context.class); TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); - Stack<Object> composeStack = new Stack<Object>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) @@ -112,8 +113,8 @@ HttpServletResponse response = createMock(HttpServletResponse.class); Context velocityContext = createMock(Context.class); Map<String, Object> params = createParams(); - Stack<Object> composeStack = new Stack<Object>(); - Stack<Map<String, Object>> parameterMapStack = new Stack<Map<String, Object>>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); + ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>(); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) .andReturn(composeStack); @@ -140,8 +141,8 @@ Context velocityContext = createMock(Context.class); TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); - Stack<Object> composeStack = new Stack<Object>(); - Stack<Map<String, Object>> parameterMapStack = new Stack<Map<String, Object>>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); + ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>(); parameterMapStack.push(params); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java?rev=797765&r1=797764&r2=797765&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java (original) +++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java Sat Jul 25 13:20:26 2009 @@ -21,17 +21,18 @@ 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; -import java.util.Stack; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.tiles.ArrayStack; import org.apache.tiles.TilesContainer; import org.apache.tiles.servlet.context.ServletUtil; import org.apache.tiles.template.PutListAttributeModel; @@ -85,8 +86,8 @@ HttpServletResponse response = createMock(HttpServletResponse.class); Context velocityContext = createMock(Context.class); Map<String, Object> params = createParams(); - Stack<Object> composeStack = new Stack<Object>(); - Stack<Map<String, Object>> parameterMapStack = new Stack<Map<String, Object>>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); + ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>(); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) .andReturn(composeStack); @@ -112,9 +113,9 @@ HttpServletResponse response = createMock(HttpServletResponse.class); Context velocityContext = createMock(Context.class); TilesContainer container = createMock(TilesContainer.class); - Stack<Object> composeStack = new Stack<Object>(); + ArrayStack<Object> composeStack = new ArrayStack<Object>(); Map<String, Object> params = createParams(); - Stack<Map<String, Object>> parameterMapStack = new Stack<Map<String, Object>>(); + ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>(); parameterMapStack.push(params); expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
