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 2010/11/16 22:15:45 UTC
svn commit: r1035816 - in /tiles/sandbox/trunk:
tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/
tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/
tiles3/tiles-freem...
Author: apetrelli
Date: Tue Nov 16 21:15:42 2010
New Revision: 1035816
URL: http://svn.apache.org/viewvc?rev=1035816&view=rev
Log:
TILESSB-11
Some tests to complete tiles-request coverage.
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfigTest.java (with props)
Removed:
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java?rev=1035816&r1=1035815&r2=1035816&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java Tue Nov 16 21:15:42 2010
@@ -1,6 +1,7 @@
package org.apache.tiles.request.velocity.render;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletContext;
@@ -31,7 +32,7 @@ public class ApplicationContextJeeConfig
public ApplicationContextJeeConfig(ApplicationContext applicationContext, Map<String, String> params) {
this.applicationContext = applicationContext;
- this.params = params;
+ this.params = new HashMap<String, String>(params);
}
/** {@inheritDoc} */
Added: tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfigTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfigTest.java?rev=1035816&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfigTest.java (added)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfigTest.java Tue Nov 16 21:15:42 2010
@@ -0,0 +1,87 @@
+package org.apache.tiles.request.velocity.render;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.tiles.request.servlet.ServletApplicationContext;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ApplicationContextJeeConfigTest {
+
+ private ApplicationContextJeeConfig config;
+
+ private ServletApplicationContext applicationContext;
+
+ private ServletContext servletContext;
+
+ private Map<String, String> params;
+
+ @Before
+ public void setUp() {
+ servletContext = createMock(ServletContext.class);
+ applicationContext = new ServletApplicationContext(servletContext);
+ }
+
+ @After
+ public void tearDown() {
+ verify(servletContext);
+ }
+
+ @Test
+ public void testGetInitParameter() {
+ params = new HashMap<String, String>();
+ params.put("one", "value1");
+ config = new ApplicationContextJeeConfig(applicationContext, params);
+ replay(servletContext);
+ assertEquals("value1", config.getInitParameter("one"));
+ }
+
+ @Test
+ public void testFindInitParameter() {
+ params = new HashMap<String, String>();
+ params.put("one", "value1");
+ config = new ApplicationContextJeeConfig(applicationContext, params);
+ replay(servletContext);
+ assertEquals("value1", config.findInitParameter("one"));
+ }
+
+ @Test
+ public void testGetInitParameterNames() {
+ params = new HashMap<String, String>();
+ params.put("one", "value1");
+ config = new ApplicationContextJeeConfig(applicationContext, params);
+ replay(servletContext);
+ @SuppressWarnings("unchecked")
+ Enumeration<String> names = config.getInitParameterNames();
+ assertTrue(names.hasMoreElements());
+ assertEquals("one", names.nextElement());
+ assertFalse(names.hasMoreElements());
+ }
+
+ @Test
+ public void testGetName() {
+ params = new HashMap<String, String>();
+ params.put("one", "value1");
+ config = new ApplicationContextJeeConfig(applicationContext, params);
+ replay(servletContext);
+ assertEquals("Application Context JEE Config", config.getName());
+ }
+
+ @Test
+ public void testGetServletContext() {
+ params = new HashMap<String, String>();
+ params.put("one", "value1");
+ config = new ApplicationContextJeeConfig(applicationContext, params);
+ replay(servletContext);
+ assertEquals(servletContext, config.getServletContext());
+ }
+
+}
Propchange: tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfigTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfigTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL