Unit tests for jodd-decora module to increase code coverage from 63% to 90%

build.gradle

@@ -304,7 +304,7 @@ configure(javaModules()) {
 
 			systemProperties = System.properties
 
-			List<String> excludes = ['*Test*', '*.?', '*Foo*', '*.data.*', '*.tst*', 'jodd.asm5.*', 'jodd.json.mo*']
+			List<String> excludes = ['*Test*', '*.?', '*Foo*', '*.data.*', '*.tst*', 'jodd.asm5.*', 'jodd.json.mo*', 'jodd.json.db*']
 
 			jvmArgs "-javaagent:${configurations.jacoco.asPath}=destfile=${project.buildDir.path}/jacoco/${testTask.name}.exec," +
 					"sessionid=HSServ,append=false,excludes=${excludes.join(':')}",

jodd-decora/build.gradle

@@ -9,4 +9,6 @@ dependencies {
 	provided lib.servlet
 
 	testCompile lib.junit
+	testCompile 'org.powermock:powermock-module-junit4:1.6.3'
+	testCompile 'org.powermock:powermock-api-mockito:1.6.3'
 }

jodd-decora/src/test/java/jodd/decora/DecoraExceptionTest.java

@@ -0,0 +1,75 @@
+// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+package jodd.decora;
+
+import static org.junit.Assert.assertEquals;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.reflect.Whitebox.getInternalState;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import jodd.decora.DecoraException;
+
+public class DecoraExceptionTest {
+
+	private Throwable throwableMock;
+	private final String TEST_STRING = "TEST";
+
+	@Before
+	public void setUp() {
+		throwableMock = mock(Throwable.class);
+	}
+
+	@Test
+	public final void testDecoraExceptionThrowable() {
+		// when
+		DecoraException decoraException = new DecoraException(throwableMock);
+
+		// then
+		assertEquals("Cause field must be set.", throwableMock, getInternalState(decoraException, "cause"));
+	}
+
+	@Test
+	public final void testDecoraExceptionString() {
+		// when
+		DecoraException decoraException = new DecoraException(TEST_STRING);
+
+		// then
+		assertEquals("DetailMessage field must be set.", TEST_STRING, getInternalState(decoraException, "detailMessage"));
+	}
+
+	@Test
+	public final void testDecoraExceptionStringThrowable() {
+		// when
+		DecoraException decoraException = new DecoraException(TEST_STRING, throwableMock);
+
+		// then
+		assertEquals("Cause field must be set.", throwableMock, getInternalState(decoraException, "cause"));
+		assertEquals("DetailMessage field must be set.", TEST_STRING, getInternalState(decoraException, "detailMessage"));
+	}
+
+}

jodd-decora/src/test/java/jodd/decora/DecoraManagerTest.java

@@ -0,0 +1,151 @@
+// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+package jodd.decora;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.reflect.Whitebox.getInternalState;
+import static org.powermock.reflect.Whitebox.setInternalState;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class DecoraManagerTest {
+
+	private DecoraManager decoraManager;
+
+	@Before
+	public void setUp() {
+		decoraManager = new DecoraManager();
+	}
+
+	@Test
+	public final void testIsDecorateErrorPages() {
+		// when
+		setInternalState(decoraManager, "decorateErrorPages", true);
+
+		// then
+		assertTrue("DecorateErrorPages should be true.", decoraManager.isDecorateErrorPages());
+	}
+
+	@Test
+	public final void testSetDecorateErrorPages() {
+		// when
+		decoraManager.setDecorateErrorPages(true);
+
+		// then
+		assertTrue("DecorateErrorPages should be true.", (boolean) getInternalState(decoraManager, "decorateErrorPages"));
+	}
+
+	@Test
+	public final void testDecorateRequest() {
+		// when
+		HttpServletRequest httpServletRequestMock = mock(HttpServletRequest.class);
+
+		// then
+		assertTrue("DecorateRequest function always returns true.", decoraManager.decorateRequest(httpServletRequestMock));
+	}
+
+	@Test
+	public final void testDecorateContentType() {
+		// when
+		String testString = "TEST";
+
+		// then
+		assertTrue("DecorateContentType function always returns true.", decoraManager.decorateContentType(testString, testString, testString));
+	}
+
+	@Test
+	public final void testDecorateStatusCode() {
+		// when
+		int statusCode = 200;
+
+		// then
+		assertTrue("Returns <code>true</code> for status code 200", decoraManager.decorateStatusCode(statusCode));
+	}
+
+	@Test
+	public final void testDecorateStatusCode2() {
+		// when
+		int statusCode = 300;
+		setInternalState(decoraManager, "decorateErrorPages", true);
+
+		// then
+		assertFalse("Returns <code>false</code> for status code 300", decoraManager.decorateStatusCode(statusCode));
+	}
+
+	@Test
+	public final void testDecorateStatusCode3() {
+		// when
+		int statusCode = 404;
+		setInternalState(decoraManager, "decorateErrorPages", false);
+
+		// then
+		assertFalse("Returns <code>false</code> for status code 404", decoraManager.decorateStatusCode(statusCode));
+	}
+
+	@Test
+	public final void testDecorateStatusCode4() {
+		// when
+		int statusCode = 404;
+		setInternalState(decoraManager, "decorateErrorPages", true);
+
+		// then
+		assertTrue("For error pages (status code {@literal >=} 400) should return true", decoraManager.decorateStatusCode(statusCode));
+	}
+
+	@Test
+	public final void testResolveDecoratorNull() {
+		// setup
+		HttpServletRequest httpServletRequestMock = mock(HttpServletRequest.class);
+		String actionPath = "TEST";
+
+		// when
+		String result = decoraManager.resolveDecorator(httpServletRequestMock, actionPath);
+
+		// then
+		assertNull("If decorator is not found, returns <code>null</code>.", result);
+	}
+
+	@Test
+	public final void testResolveDecoratorNotNull() {
+		// setup
+		HttpServletRequest httpServletRequestMock = mock(HttpServletRequest.class);
+		String actionPath = "TEST.html";
+
+		// when
+		String result = decoraManager.resolveDecorator(httpServletRequestMock, actionPath);
+
+		// then
+		assertEquals("Result value must be equal to default decorator path.", DecoraManager.DEFAULT_DECORATOR, result);
+	}
+
+}

jodd-decora/src/test/java/jodd/decora/DecoraRequestWrapperTest.java

@@ -0,0 +1,115 @@
+// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+package jodd.decora;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.verify;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.reflect.Whitebox.getInternalState;
+import static org.powermock.reflect.Whitebox.setInternalState;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class DecoraRequestWrapperTest {
+
+	private HttpServletRequest httpServletRequestMock;
+	private HttpServletRequest httpServletRequestMock2;
+	private final String TEST_STRING = "TEST";
+
+	@Before
+	public void setUp() {
+		httpServletRequestMock = mock(HttpServletRequest.class);
+		httpServletRequestMock2 = mock(HttpServletRequest.class);
+	}
+
+	@Test
+	public final void testConstructor() {
+		// when
+		DecoraRequestWrapper decoraRequestWrapper = new DecoraRequestWrapper(httpServletRequestMock);
+
+		// then
+		assertEquals("Parameter should be set.", httpServletRequestMock, getInternalState(decoraRequestWrapper, "request"));
+	}
+
+	@Test
+	public final void testGetHeaderString() {
+		// setup
+		DecoraRequestWrapper decoraRequestWrapper = new DecoraRequestWrapper(httpServletRequestMock);
+		setInternalState(decoraRequestWrapper, "request", httpServletRequestMock2);
+
+		// when
+		decoraRequestWrapper.getHeader(TEST_STRING);
+
+		// then
+		verify(httpServletRequestMock2).getHeader(TEST_STRING);
+	}
+
+	@Test
+	public final void testGetHeaderStringReturnNull() {
+		// setup
+		DecoraRequestWrapper decoraRequestWrapper = new DecoraRequestWrapper(httpServletRequestMock);
+		setInternalState(decoraRequestWrapper, "request", httpServletRequestMock2);
+		String nullRespondingString = "If-Modified-Since";
+
+		// when
+		String result = decoraRequestWrapper.getHeader(nullRespondingString);
+
+		// then
+		assertNull("<code>null</code> for excluded HTTP headers.", result);
+	}
+
+	@Test
+	public final void testGetDateHeaderString() {
+		// setup
+		DecoraRequestWrapper decoraRequestWrapper = new DecoraRequestWrapper(httpServletRequestMock);
+		setInternalState(decoraRequestWrapper, "request", httpServletRequestMock2);
+
+		// when
+		decoraRequestWrapper.getDateHeader(TEST_STRING);
+
+		// then
+		verify(httpServletRequestMock2).getDateHeader(TEST_STRING);
+	}
+
+	@Test
+	public final void testGetDateHeaderStringReturnMinusOne() {
+		// setup
+		DecoraRequestWrapper decoraRequestWrapper = new DecoraRequestWrapper(httpServletRequestMock);
+		setInternalState(decoraRequestWrapper, "request", httpServletRequestMock2);
+		String nullRespondingString = "If-Modified-Since";
+
+		// when
+		long result = decoraRequestWrapper.getDateHeader(nullRespondingString);
+
+		// then
+		assertEquals("<code>-1</code> for excluded HTTP headers.", -1, result);
+	}
+
+}