issue #52: removed PowerMock in favour of plain Mockito

this frees us from the problems introduced by byte code manipulation.

Author: Luis Miranda

README.md

@@ -33,7 +33,3 @@ Make sure maven & your IDE uses this java version.
 
 At the Package Explorer, select the jsp-sample project, 2nd bottom of the mouse and Run As > Run Server
 Select a Tomcat Server in order to deploy the server.
-
-### Unit Tests
-
-The unit tests use PowerMock but do not run with the PowerMock javaagents enabled. This means you will not be able to mock out static methods, but other PowerMock features will work.

core/pom.xml

@@ -19,15 +19,9 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>1.6.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>1.6.2</version>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.10.19</version>
 			<scope>test</scope>
 		</dependency>
 

core/src/test/java/com/onelogin/saml2/test/authn/AuthnRequestTest.java

@@ -4,14 +4,11 @@
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-import static org.powermock.api.mockito.PowerMockito.when;
-import static org.powermock.api.support.membermodification.MemberMatcher.method;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
-import org.powermock.api.mockito.PowerMockito;
 
 import com.onelogin.saml2.authn.AuthnRequest;
 import com.onelogin.saml2.settings.Saml2Settings;
@@ -31,11 +28,13 @@ public class AuthnRequestTest {
 	public void testGetEncodedAuthnRequestSimulated() throws Exception {
 		Saml2Settings settings = new SettingsBuilder().fromFile("config/config.min.properties").build();
 
-		String authnRequestString = Util.getFileAsString("data/requests/authn_request.xml");
-		AuthnRequest authnRequest = PowerMockito.spy(new AuthnRequest(settings));
-
-		when(authnRequest, method(AuthnRequest.class, "getAuthnRequestXml")).withNoArguments().thenReturn(
-				authnRequestString);
+		final String authnRequestString = Util.getFileAsString("data/requests/authn_request.xml");
+		AuthnRequest authnRequest = new AuthnRequest(settings) {
+			@Override
+			protected String getAuthnRequestXml() {
+				return authnRequestString;
+			}
+		};
 
 		String expectedAuthnRequestStringBase64 = Util.getFileAsString("data/requests/authn_request.xml.deflated.base64");
 		String authnRequestStringBase64 = authnRequest.getEncodedAuthnRequest();

core/src/test/java/com/onelogin/saml2/test/logout/LogoutRequestTest.java

@@ -9,7 +9,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.powermock.api.support.membermodification.MemberMatcher.method;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,10 +20,8 @@
 
 import java.security.PrivateKey;
 
-import org.powermock.api.mockito.PowerMockito;
 import org.w3c.dom.Document;
 
-import org.junit.Rule;
 import org.junit.Test;
 
 import com.onelogin.saml2.exception.XMLEntityException;
@@ -46,10 +43,13 @@ public class LogoutRequestTest {
 	public void testGetEncodedLogoutRequestSimulated() throws Exception {
 		Saml2Settings settings = new SettingsBuilder().fromFile("config/config.min.properties").build();
 
-		String logoutRequestString = Util.getFileAsString("data/logout_requests/logout_request.xml");
-		LogoutRequest logoutRequest = PowerMockito.spy(new LogoutRequest(settings));
- 		PowerMockito.when(logoutRequest, method(LogoutRequest.class, "getLogoutRequestXml")).withNoArguments().thenReturn(
-				logoutRequestString);
+		final String logoutRequestString = Util.getFileAsString("data/logout_requests/logout_request.xml");
+		LogoutRequest logoutRequest = new LogoutRequest(settings) {
+			@Override
+			protected String getLogoutRequestXml() {
+				return logoutRequestString;
+			}
+		};
 
 		String expectedLogoutRequestStringBase64 = Util.getFileAsString("data/logout_requests/logout_request_deflated.xml.base64");
 		String logoutRequestStringBase64 = logoutRequest.getEncodedLogoutRequest();

core/src/test/java/com/onelogin/saml2/test/logout/LogoutResponseTest.java

@@ -9,7 +9,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.powermock.api.support.membermodification.MemberMatcher.method;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -18,7 +17,6 @@
 import javax.xml.xpath.XPathExpressionException;
 
 import org.junit.Test;
-import org.powermock.api.mockito.PowerMockito;
 
 import com.onelogin.saml2.exception.XMLEntityException;
 import com.onelogin.saml2.logout.LogoutResponse;
@@ -40,14 +38,17 @@ public class LogoutResponseTest {
 	public void testGetEncodedLogoutResponseSimulated() throws Exception {
 		Saml2Settings settings = new SettingsBuilder().fromFile("config/config.min.properties").build();
 
-		String logoutResponseString = Util.getFileAsString("data/logout_responses/logout_response.xml");
+		final String logoutResponseString = Util.getFileAsString("data/logout_responses/logout_response.xml");
 
 		HttpServletRequest request = mock(HttpServletRequest.class);
 		when(request.getRequestURL()).thenReturn(new StringBuffer( "/"));
 
-		LogoutResponse logoutResponseBuilder = PowerMockito.spy(new LogoutResponse(settings, request));
- 		PowerMockito.when(logoutResponseBuilder, method(LogoutResponse.class, "getLogoutResponseXml")).withNoArguments().thenReturn(
- 				logoutResponseString);
+		LogoutResponse logoutResponseBuilder = new LogoutResponse(settings, request) {
+			@Override
+			protected String getLogoutResponseXml() {
+				return logoutResponseString;
+			}
+		};
 
  		logoutResponseBuilder.build();
 
@@ -56,9 +57,12 @@ public void testGetEncodedLogoutResponseSimulated() throws Exception {
 
 		assertEquals(logoutResponseStringBase64, expectedLogoutResponseStringBase64);
 
-		LogoutResponse logoutResponse = PowerMockito.spy(new LogoutResponse(settings, request));
- 		PowerMockito.when(logoutResponse, method(LogoutResponse.class, "getLogoutResponseXml")).withNoArguments().thenReturn(
- 				logoutResponseString);
+		LogoutResponse logoutResponse = new LogoutResponse(settings, request) {
+			@Override
+			protected String getLogoutResponseXml() {
+				return logoutResponseString;
+			}
+		};
  		logoutResponseStringBase64 = logoutResponse.getEncodedLogoutResponse();
  		assertEquals(logoutResponseStringBase64, expectedLogoutResponseStringBase64);
 	}