svn commit: r493004 - /struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java

[apetrelli]

Author: apetrelli
Date: Fri Jan  5 04:12:47 2007
New Revision: 493004

URL: http://svn.apache.org/viewvc?view=rev&rev=493004
Log:
STR-2986
Corrected test case, now TestTilesPlugin works.

Modified:
    
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java

Modified: 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java?view=diff&rev=493004&r1=493003&r2=493004
==============================================================================
--- 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
 Fri Jan  5 04:12:47 2007
@@ -39,6 +39,7 @@
 import org.apache.tiles.access.TilesAccess;
 import org.apache.tiles.definition.DefinitionsFactory;
 import org.apache.tiles.impl.BasicTilesContainer;
+import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
 
 public class TestTilesPlugin extends TestMockBase {
 
@@ -173,11 +174,11 @@
         TilesContainer container = TilesAccess.getContainer(actionServlet
                 .getServletContext());
         assertSame(container.getClass().getName(),
-                BasicTilesContainer.class.getName());
+                KeyedDefinitionsFactoryTilesContainer.class.getName());
         
         // Retrieve factory for module1
-        DefinitionsFactory factory1 = ((BasicTilesContainer) container)
-            .getDefinitionsFactory();
+        DefinitionsFactory factory1 = ((KeyedDefinitionsFactoryTilesContainer) 
container)
+            .getDefinitionsFactory("/module1");
 
         assertNotNull("factory found", factory1);
 
@@ -185,8 +186,8 @@
         request.setAttribute(Globals.MODULE_KEY, module2);
         request.setPathElements("/myapp", "/module2/foo.do", null, null);
         // Retrieve factory for module2
-        DefinitionsFactory factory2 = ((BasicTilesContainer) container)
-                .getDefinitionsFactory();
+        DefinitionsFactory factory2 = ((KeyedDefinitionsFactoryTilesContainer) 
container)
+                .getDefinitionsFactory("/module2");
         assertNotNull("factory found", factory2);
 
         // Check that factory are different