Provide unit tests for new javax wrappers

Author: ashleymercer

toolkit/pom.xml

@@ -46,48 +46,13 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- for log -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- httprequest and httpresponse -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<version>2.5</version>
 			<scope>provided</scope>
 		</dependency>
-
-		<!-- date and time library for Java -->
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>2.9.4</version>
-		</dependency>
-
-		<!-- commons -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>${apacheCommonsLangVersion}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.santuario</groupId>
-			<artifactId>xmlsec</artifactId>
-			<version>2.0.7</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
-		</dependency>
 	</dependencies>
 
 	<build>

toolkit/src/test/java/com/onelogin/saml2/test/http/JavaxHttpRequestTest.java

@@ -0,0 +1,97 @@
+package com.onelogin.saml2.test.http;
+
+import com.onelogin.saml2.http.HttpRequest;
+import com.onelogin.saml2.http.JavaxHttpRequest;
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletRequest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author ashley.mercer@skylightipv.com
+ */
+public class JavaxHttpRequestTest {
+
+    @Test
+    public void testIsSecure() {
+        final HttpServletRequest javaxRequest = mock(HttpServletRequest.class);
+        final HttpRequest request = new JavaxHttpRequest(javaxRequest);
+
+        when(javaxRequest.isSecure()).thenReturn(true);
+        assertTrue(request.isSecure());
+
+        when(javaxRequest.isSecure()).thenReturn(false);
+        assertFalse(request.isSecure());
+    }
+
+    @Test
+    public void testGetScheme() {
+        final HttpServletRequest javaxRequest = mock(HttpServletRequest.class);
+        final HttpRequest request = new JavaxHttpRequest(javaxRequest);
+
+        when(javaxRequest.getScheme()).thenReturn("http");
+        assertEquals(request.getScheme(), "http");
+    }
+
+    @Test
+    public void testGetServerName() {
+        final HttpServletRequest javaxRequest = mock(HttpServletRequest.class);
+        final HttpRequest request = new JavaxHttpRequest(javaxRequest);
+
+        when(javaxRequest.getServerName()).thenReturn("www.example.com");
+        assertEquals(request.getServerName(), "www.example.com");
+    }
+
+    @Test
+    public void testGetServerPort() {
+        final HttpServletRequest javaxRequest = mock(HttpServletRequest.class);
+        final HttpRequest request = new JavaxHttpRequest(javaxRequest);
+
+        when(javaxRequest.getServerPort()).thenReturn(80);
+        assertEquals(request.getServerPort(), 80);
+
+        when(javaxRequest.getServerPort()).thenReturn(443);
+        assertEquals(request.getServerPort(), 443);
+    }
+
+    @Test
+    public void testGetQueryString() {
+        final HttpServletRequest javaxRequest = mock(HttpServletRequest.class);
+        final HttpRequest request = new JavaxHttpRequest(javaxRequest);
+
+        when(javaxRequest.getQueryString()).thenReturn("foo=bar");
+        assertEquals(request.getQueryString(), "foo=bar");
+    }
+
+    @Test
+    public void testGetRequestURI() {
+        final HttpServletRequest javaxRequest = mock(HttpServletRequest.class);
+        final HttpRequest request = new JavaxHttpRequest(javaxRequest);
+
+        when(javaxRequest.getRequestURI()).thenReturn("/test.html");
+        assertEquals(request.getRequestURI(), "/test.html");
+    }
+
+    @Test
+    public void testGetRequestURL() {
+        final HttpServletRequest javaxRequest = mock(HttpServletRequest.class);
+        final HttpRequest request = new JavaxHttpRequest(javaxRequest);
+
+        when(javaxRequest.getRequestURL()).thenReturn(new StringBuffer("http://www.example.com/test"));
+        assertEquals(request.getRequestURL(), "http://www.example.com/test");
+    }
+
+    @Test
+    public void testGetParameter() {
+        final HttpServletRequest javaxRequest = mock(HttpServletRequest.class);
+        final HttpRequest request = new JavaxHttpRequest(javaxRequest);
+
+        when(javaxRequest.getParameter("foo")).thenReturn("bar");
+        assertEquals(request.getParameter("foo"), "bar");
+    }
+}

toolkit/src/test/java/com/onelogin/saml2/test/http/JavaxHttpResponseTest.java

@@ -0,0 +1,25 @@
+package com.onelogin.saml2.test.http;
+
+import com.onelogin.saml2.http.HttpResponse;
+import com.onelogin.saml2.http.JavaxHttpResponse;
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+import static org.mockito.Mockito.*;
+
+/**
+ * @author ashley.mercer@skylightipv.com
+ */
+public class JavaxHttpResponseTest {
+
+    @Test
+    public void testSendRedirect() throws IOException {
+        final HttpServletResponse javaxResponse = mock(HttpServletResponse.class);
+        final HttpResponse response = new JavaxHttpResponse(javaxResponse);
+
+        response.sendRedirect("http://www.example.com");
+        verify(javaxResponse, times(1)).sendRedirect(matches("http://www\\.example\\.com"));
+    }
+}