Shale test? In core? Did you mean to do that? I thought we were trying to keep 3rd party deps out of core. I'm not too concerned since it's test scope, but I am curious.

[EMAIL PROTECTED] wrote:
Author: apetrelli
Date: Wed Mar  7 02:13:31 2007
New Revision: 515512

URL: http://svn.apache.org/viewvc?view=rev&rev=515512
Log:
TILES-130
Added test case for ServletTilesRequestContext.
Added dependency to shale-test.

Added:
    
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/
    
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java
   (with props)
Modified:
    tiles/framework/trunk/tiles-core/pom.xml

Modified: tiles/framework/trunk/tiles-core/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?view=diff&rev=515512&r1=515511&r2=515512
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Wed Mar  7 02:13:31 2007
@@ -253,9 +253,9 @@
     </dependency>
<dependency>
-      <groupId>strutstestcase</groupId>
-      <artifactId>strutstestcase</artifactId>
-      <version>2.1.2-1.1-2.3</version>
+      <groupId>org.apache.shale</groupId>
+      <artifactId>shale-test</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
Added: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java?view=auto&rev=515512
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java
 (added)
+++ 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java
 Wed Mar  7 02:13:31 2007
@@ -0,0 +1,159 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.tiles.context.servlet;
+
+import java.util.Map;
+
+import org.apache.shale.test.mock.MockHttpServletRequest;
+import org.apache.shale.test.mock.MockHttpServletResponse;
+import org.apache.shale.test.mock.MockHttpSession;
+import org.apache.shale.test.mock.MockServletContext;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.context.TilesRequestContext;
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ServletTilesRequestContextTest extends TestCase {
+
+    private TilesRequestContext context;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        MockServletContext servletContext = new MockServletContext();
+        servletContext
+                .addInitParameter("initParameter1", "initParameterValue1");
+        MockHttpSession session = new MockHttpSession(servletContext);
+        MockHttpServletRequest request = new MockHttpServletRequest(session);
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        request.addHeader("Content-Type", "text/html");
+        request.addParameter("myParam", "value1");
+        request.addParameter("myParam", "value2");
+
+        context = new ServletTilesRequestContext(servletContext, request,
+                response);
+
+        Map<String, Object> requestScope = context.getRequestScope();
+        requestScope.put("attribute1", "value1");
+        requestScope.put("attribute2", "value2");
+
+        Map<String, Object> sessionScope = context.getSessionScope();
+        sessionScope.put("sessionAttribute1", "sessionValue1");
+        sessionScope.put("sessionAttribute2", "sessionValue2");
+
+        Map<String, Object> applicationScope = ((TilesApplicationContext) 
context)
+                .getApplicationScope();
+        applicationScope.put("applicationAttribute1", "applicationValue1");
+        applicationScope.put("applicationAttribute2", "applicationValue2");
+    }
+
+    public void testGetHeader() {
+        Map<String, String> map = context.getHeader();
+        assertTrue("The header does not contain a set value", "text/html"
+                .equals(map.get("Content-Type")));
+        doTestReadMap(map, String.class, String.class, "header map");
+    }
+
+    public void testGetHeaderValues() {
+        Map<String, String[]> map = context.getHeaderValues();
+        String[] array = map.get("Content-Type");
+        assertTrue("The header does not contain a set value", array.length == 1
+                && "text/html".equals(array[0]));
+        doTestReadMap(map, String.class, String[].class, "header values map");
+    }
+
+    public void testGetParam() {
+        Map<String, String> map = context.getParam();
+        assertTrue("The parameters do not contain a set value", "value1"
+                .equals(map.get("myParam"))
+                || "value2".equals(map.get("myParam")));
+        doTestReadMap(map, String.class, String.class, "parameter map");
+    }
+
+    public void testGetParamValues() {
+        Map<String, String[]> map = context.getParamValues();
+        String[] array = map.get("myParam");
+        assertTrue(
+                "The parameters not contain a set value",
+                array.length == 2
+                        && (("value1".equals(array[0]) && "value2"
+                                .equals(array[1])) || ("value1"
+                                .equals(array[1]) && 
"value2".equals(array[0]))));
+        doTestReadMap(map, String.class, String[].class, "parameter values 
map");
+    }
+
+    public void testGetRequestScope() {
+        Map<String, Object> map = context.getRequestScope();
+        assertTrue("The request scope does not contain a set value", "value1"
+                .equals(map.get("attribute1")));
+        assertTrue("The request scope does not contain a set value", "value2"
+                .equals(map.get("attribute2")));
+        doTestReadMap(map, String.class, Object.class, "request scope map");
+    }
+
+    public void testGetSessionScope() {
+        Map<String, Object> map = context.getSessionScope();
+        assertTrue("The session scope does not contain a set value",
+                "sessionValue1".equals(map.get("sessionAttribute1")));
+        assertTrue("The session scope does not contain a set value",
+                "sessionValue2".equals(map.get("sessionAttribute2")));
+        doTestReadMap(map, String.class, Object.class, "session scope map");
+    }
+
+    public void testGetApplicationScope() {
+        Map<String, Object> map = ((TilesApplicationContext) context)
+                .getApplicationScope();
+        assertTrue("The application scope does not contain a set value",
+                "applicationValue1".equals(map.get("applicationAttribute1")));
+        assertTrue("The application scope does not contain a set value",
+                "applicationValue2".equals(map.get("applicationAttribute2")));
+        doTestReadMap(map, String.class, Object.class, "application scope 
map");
+    }
+
+    public void testGetInitParams() {
+        Map<String, String> map = ((TilesApplicationContext) context)
+                .getInitParams();
+        assertTrue("The init parameters do not contain a set value",
+                "initParameterValue1".equals(map.get("initParameter1")));
+        doTestReadMap(map, String.class, String.class,
+                "init parameters scope map");
+    }
+
+    private <K, V> void doTestReadMap(Map<K, V> currentMap, Class<K> keyClass,
+            Class<V> valueClass, String mapName) {
+        int size1, size2;
+        size1 = currentMap.keySet().size();
+        size2 = currentMap.entrySet().size();
+        assertEquals("The map" + mapName
+                + " has keySet and entrySet of different size", size1, size2);
+        for (K key : currentMap.keySet()) {
+            V value = currentMap.get(key);
+            assertTrue("The map " + mapName
+                    + " does not return the correct value for 'containsValue'",
+                    currentMap.containsValue(value));
+        }
+    }
+}

Propchange: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



Reply via email to