svn commit: r882674 [2/2] - in /tiles/sandbox/trunk/tiles3: tiles-api/src/main/java/org/apache/tiles/ 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/impl/ tile...

[apetrelli]

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=882674&r1=882673&r2=882674&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
 Fri Nov 20 19:04:29 2009
@@ -35,8 +35,8 @@
 import org.apache.tiles.AttributeContext;
 import org.apache.tiles.Expression;
 import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
 import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.context.InternalContextAdapter;
@@ -101,7 +101,7 @@
         ApplicationContext applicationContext = 
createMock(ApplicationContext.class);
         Attribute attribute = new Attribute("myValue");
 
-        
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME))
+        
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
                 .andReturn(container);
         
expect(container.getApplicationContext()).andReturn(applicationContext);
         
expect(container.getAttributeContext(isA(VelocityTilesRequestContext.class)))
@@ -172,7 +172,7 @@
         Attribute attribute = new Attribute("myValue");
 
         
expect(container.getApplicationContext()).andReturn(applicationContext);
-        
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME))
+        
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
                 .andReturn(container);
         container.render(eq(attribute), 
isA(VelocityTilesRequestContext.class));
 
@@ -196,7 +196,7 @@
         StringWriter writer = new StringWriter();
 
         
expect(container.getApplicationContext()).andReturn(applicationContext);
-        
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME))
+        
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
                 .andReturn(container);
         container.render(eq("myDefinition"), 
isA(VelocityTilesRequestContext.class));
 
@@ -219,7 +219,7 @@
         StringWriter writer = new StringWriter();
 
         
expect(container.getApplicationContext()).andReturn(applicationContext);
-        
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME))
+        
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
                 .andReturn(container);
         container.renderContext(isA(VelocityTilesRequestContext.class));
 
@@ -240,7 +240,7 @@
         ApplicationContext applicationContext = 
createMock(ApplicationContext.class);
 
         
expect(container.getApplicationContext()).andReturn(applicationContext);
-        
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME))
+        
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
                 .andReturn(container);
         expect(container.startContext(isA(VelocityTilesRequestContext.class)))
                 .andReturn(attributeContext);
@@ -261,7 +261,7 @@
         ApplicationContext applicationContext = 
createMock(ApplicationContext.class);
 
         
expect(container.getApplicationContext()).andReturn(applicationContext);
-        
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME))
+        
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
                 .andReturn(container);
         container.endContext(isA(VelocityTilesRequestContext.class));
 
@@ -281,7 +281,7 @@
         ApplicationContext applicationContext = 
createMock(ApplicationContext.class);
 
         
expect(container.getApplicationContext()).andReturn(applicationContext);
-        
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME))
+        
expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME))
                 .andReturn(container);
         
expect(container.getAttributeContext(isA(VelocityTilesRequestContext.class)))
                 .andReturn(attributeContext);
@@ -301,7 +301,7 @@
         TilesContainer container = createMock(TilesContainer.class);
 
         expect(servletContext.getAttribute("myKey")).andReturn(container);
-        request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, 
container);
+        request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, 
container);
 
         replay(velocityContext, request, response, servletContext, container);
         initializeTool();