You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by dd...@apache.org on 2006/12/19 15:31:59 UTC
svn commit: r488690 - /struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java

Author: ddewolf
Date: Tue Dec 19 06:31:58 2006
New Revision: 488690

URL: http://svn.apache.org/viewvc?view=rev&rev=488690
Log:
Fixing 2 of three factory tests via easymock

Modified:
    struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java

Modified: struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java?view=diff&rev=488690&r1=488689&r2=488690
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java Tue Dec 19 06:31:58 2006
@@ -48,6 +48,10 @@
     }
 
     public void testGetFactory() throws TilesException {
+        Vector v = new Vector();
+        v.add(TilesContainerFactory.CONTAINER_FACTORY_INIT_PARAM);
+
+        EasyMock.expect(context.getInitParameterNames()).andReturn(v.elements());
         EasyMock.expect(context.getInitParameter(TilesContainerFactory.CONTAINER_FACTORY_INIT_PARAM)).andReturn(null);
         EasyMock.replay(context);
         TilesContainerFactory factory = TilesContainerFactory.getFactory(context);
@@ -55,6 +59,7 @@
         assertEquals(TilesContainerFactory.class, factory.getClass());
 
         EasyMock.reset(context);
+        EasyMock.expect(context.getInitParameterNames()).andReturn(v.elements());
         EasyMock.expect(context.getInitParameter(TilesContainerFactory.CONTAINER_FACTORY_INIT_PARAM)).andReturn(TestFactory.class.getName());
         EasyMock.replay(context);
         factory = TilesContainerFactory.getFactory(context);
@@ -62,6 +67,7 @@
         assertEquals(TestFactory.class, factory.getClass());
 
         EasyMock.reset(context);
+        EasyMock.expect(context.getInitParameterNames()).andReturn(v.elements());
         EasyMock.expect(context.getInitParameter(TilesContainerFactory.CONTAINER_FACTORY_INIT_PARAM)).andReturn("org.missing.Class");
         EasyMock.replay(context);
         try {
@@ -79,7 +85,7 @@
         EasyMock.expect(context.getInitParameter(TilesContainerFactory.CONTEXT_FACTORY_INIT_PARAM)).andReturn(null);
         EasyMock.expect(context.getInitParameter(TilesContainerFactory.DEFINITIONS_FACTORY_INIT_PARAM)).andReturn(null);
         EasyMock.expect(context.getInitParameter(EasyMock.isA(String.class))).andReturn(null).anyTimes();
-        EasyMock.expect(context.getInitParameterNames()).andReturn(enumeration.elements());
+        EasyMock.expect(context.getInitParameterNames()).andReturn(enumeration.elements()).anyTimes();
         EasyMock.expect(context.getResource("/WEB-INF/tiles.xml")).andReturn(url);
         EasyMock.replay(context);
 
@@ -103,7 +109,7 @@
         keys.add("two");
 
         EasyMock.expect(context.getInitParameter(TilesContainerFactory.CONTAINER_FACTORY_INIT_PARAM)).andReturn(null);
-        EasyMock.expect(context.getInitParameterNames()).andReturn(keys.elements());
+        EasyMock.expect(context.getInitParameterNames()).andReturn(keys.elements()).anyTimes();
         EasyMock.expect(context.getInitParameter("one")).andReturn("oneValue");
         EasyMock.expect(context.getInitParameter("two")).andReturn("twoValue");
         EasyMock.replay(context);