Extend test coverage in servlet module

servlet/build.gradle

@@ -22,9 +22,11 @@ dependencies {
   compile project (':tangram-core')
 
   testCompile "org.testng:testng:$versions.testng"
+  // test logging at debug level through special logback.groovy
+  testCompile "ch.qos.logback:logback-classic:$versions.logback"
   testCompile "org.mockito:mockito-all:$versions.mockito"
+  testCompile "org.springframework:spring-test:$versions.springframework"
+  testCompile "org.springframework:spring-web:$versions.springframework"
   // more or less a dummy for the various autoscanned and auto injected beans
   testCompile project(':tangram-dinistiq')
-  // test logging at debug level through special logback.groovy
-  testCompile "ch.qos.logback:logback-classic:$versions.logback"
 }

servlet/test/org/tangram/servlet/test/MeasureTimeFilterTest.java

@@ -0,0 +1,71 @@
+/*
+ *
+ * Copyright 2016 Martin Goellnitz
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.tangram.servlet.test;
+
+import java.io.IOException;
+import java.util.Collections;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.mock.web.MockFilterChain;
+import org.springframework.mock.web.MockFilterConfig;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockServletContext;
+import org.tangram.Constants;
+import org.tangram.components.SimpleStatistics;
+import org.tangram.monitor.Statistics;
+import org.tangram.servlet.MeasureTimeFilter;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+/**
+ * Test aspects of the measure time servlet filter.
+ */
+public class MeasureTimeFilterTest {
+
+    @Test
+    public void testMeasureTimeFilter() {
+        MeasureTimeFilter measureTimeFilter = new MeasureTimeFilter();
+        Statistics statistics = new SimpleStatistics();
+
+        ServletContext context = new MockServletContext(".");
+        context.setAttribute(Constants.ATTRIBUTE_STATISTICS, statistics);
+        measureTimeFilter.setFreeUrls(Collections.EMPTY_SET);
+        FilterConfig config = new MockFilterConfig(context, "test");
+        try {
+            measureTimeFilter.init(config);
+        } catch (ServletException e) {
+            Assert.fail("Init should not fail.", e);
+        } // try/catch
+        HttpServletRequest request = new MockHttpServletRequest();
+        HttpServletResponse response = new MockHttpServletResponse();
+        FilterChain chain = new MockFilterChain();
+        try {
+            measureTimeFilter.doFilter(request, response, chain);
+        } catch (IOException|ServletException e) {
+            Assert.fail("DoFilter should not fail.", e);
+        } // try/catch
+    } // testMeasureTimeFilter
+
+} // MeasureTimeFilterTest

servlet/test/org/tangram/servlet/test/ResponseWrapperTest.java

@@ -0,0 +1,72 @@
+/*
+ *
+ * Copyright 2016 Martin Goellnitz
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.tangram.servlet.test;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.tangram.servlet.ResponseWrapper;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+/**
+ * Test aspects of the response wrapper.
+ */
+public class ResponseWrapperTest {
+
+    @Test
+    public void testResponseWrapper() {
+        HttpServletResponse response = new MockHttpServletResponse();
+        ResponseWrapper responseWrapper = new ResponseWrapper(response);
+        Assert.assertEquals(responseWrapper.getContentType(), null, "Initial content type expected.");
+        responseWrapper.setContentType("text/html");
+        Assert.assertEquals(responseWrapper.getContentType(), "text/html", "Modified content type expected.");
+        Assert.assertEquals(responseWrapper.getHeaders().size(), 0, "No initial headers expected.");
+        responseWrapper.addHeader("a", "b");
+        Assert.assertEquals(responseWrapper.getHeaders().size(), 1, "Added header value not found.");
+        Assert.assertEquals(responseWrapper.getHeaders("a").size(), 1, "Added header value not found.");
+        responseWrapper.addIntHeader("a", 42);
+        Assert.assertEquals(responseWrapper.getHeaders().size(), 1, "Added header values not found.");
+        Assert.assertEquals(responseWrapper.getHeaders("a").size(), 2, "Added header values not found.");
+        Assert.assertEquals(responseWrapper.getHeader("a"), "b", "Added header values not found.");
+        responseWrapper.setHeader("a", "c");
+        Assert.assertEquals(responseWrapper.getHeaders("a").size(), 1, "Added header values not found.");
+        Assert.assertEquals(responseWrapper.getHeader("a"), "c", "Added header values not found.");
+        responseWrapper.setIntHeader("a", 19);
+        Assert.assertEquals(responseWrapper.getHeaders("a").size(), 1, "Added header values not found.");
+        Assert.assertEquals(responseWrapper.getHeader("a"), "19", "Added header values not found.");
+        Assert.assertFalse(responseWrapper.containsHeader("date"), "We didn't add a date header so far.");
+        responseWrapper.addDateHeader("date", 135678896456L);
+        Assert.assertEquals(responseWrapper.getHeaders().size(), 1, "Added date header values not found.");
+        Assert.assertEquals(responseWrapper.getHeaders("date").size(), 1, "Added date header values not found.");
+        responseWrapper.addDateHeader("date", 145678896456L);
+        Assert.assertEquals(responseWrapper.getHeaders().size(), 1, "Added date header values not found.");
+        Assert.assertEquals(responseWrapper.getHeaders("date").size(), 2, "Added date header values not found.");
+        responseWrapper.setDateHeader("date", 145678543453456L);
+        Assert.assertEquals(responseWrapper.getHeaders().size(), 1, "Added date header values not found.");
+        Assert.assertEquals(responseWrapper.getHeaders("date").size(), 1, "Added date header values not found.");
+        try {
+            responseWrapper.flushBuffer();
+        } catch (IOException e) {
+            Assert.fail("flushBuffer should not fail.", e);
+        } // try/catch
+    } // testResponseWrapper()
+
+} // ResponseWrapperTest