Update from jmock to mockito
diff --git a/src/test/java/org/apache/sling/auth/core/AuthUtilTest.java b/src/test/java/org/apache/sling/auth/core/AuthUtilTest.java
index 92c86dc..839c4a7 100644
--- a/src/test/java/org/apache/sling/auth/core/AuthUtilTest.java
+++ b/src/test/java/org/apache/sling/auth/core/AuthUtilTest.java
@@ -19,217 +19,146 @@
package org.apache.sling.auth.core;
import javax.servlet.http.HttpServletRequest;
-import junit.framework.TestCase;
import org.apache.sling.api.resource.NonExistingResource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.SyntheticResource;
-import org.apache.sling.auth.core.AuthenticationSupport;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.mockito.Mockito;
-@RunWith(JMock.class)
public class AuthUtilTest {
- final Mockery context = new JUnit4Mockery();
+ final ResourceResolver resolver = Mockito.mock(ResourceResolver.class);
- final ResourceResolver resolver = context.mock(ResourceResolver.class);
-
- final HttpServletRequest request = context.mock(HttpServletRequest.class);
+ final HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
@Test
public void test_isRedirectValid_null_empty() {
- TestCase.assertFalse(AuthUtil.isRedirectValid(null, null));
- TestCase.assertFalse(AuthUtil.isRedirectValid(null, ""));
+ Assert.assertFalse(AuthUtil.isRedirectValid(null, null));
+ Assert.assertFalse(AuthUtil.isRedirectValid(null, ""));
}
@Test
public void test_isRedirectValid_url() {
- TestCase.assertFalse(AuthUtil.isRedirectValid(null, "http://www.google.com"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(null, "http://www.google.com"));
}
@Test
public void test_isRedirectValid_no_request() {
- TestCase.assertFalse(AuthUtil.isRedirectValid(null, "relative/path"));
- TestCase.assertTrue(AuthUtil.isRedirectValid(null, "/absolute/path"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(null, "relative/path"));
+ Assert.assertTrue(AuthUtil.isRedirectValid(null, "/absolute/path"));
}
@Test
public void test_isRedirectValid_normalized() {
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized//double/slash"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized/double/slash//"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized/./dot"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized/../dot"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized/dot/."));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized/dot/.."));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized//double/slash"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized/double/slash//"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized/./dot"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized/../dot"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized/dot/."));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/unnormalized/dot/.."));
}
@Test
public void test_isRedirectValid_invalid_characters() {
- context.checking(new Expectations() {
- {
- allowing(request).getContextPath();
- will(returnValue(""));
- allowing(request).getAttribute(with(any(String.class)));
- will(returnValue(null));
- }
- });
+ Mockito.when(request.getContextPath()).thenReturn("");
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/</x"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/>/x"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/'/x"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/\"/x"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/\n"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/\r"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/</x"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/>/x"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/'/x"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/\"/x"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/\n"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/illegal/\r"));
}
@Test
public void test_isRedirectValid_no_resource_resolver_root_context() {
- context.checking(new Expectations() {
- {
- allowing(request).getContextPath();
- will(returnValue(""));
- allowing(request).getAttribute(with(any(String.class)));
- will(returnValue(null));
- }
- });
+ Mockito.when(request.getContextPath()).thenReturn("");
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "relative/path"));
- TestCase.assertTrue(AuthUtil.isRedirectValid(request, "/absolute/path"));
- TestCase.assertTrue(AuthUtil.isRedirectValid(request, "/"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "relative/path"));
+ Assert.assertTrue(AuthUtil.isRedirectValid(request, "/absolute/path"));
+ Assert.assertTrue(AuthUtil.isRedirectValid(request, "/"));
}
@Test
public void test_isRedirectValid_no_resource_resolver_non_root_context() {
- context.checking(new Expectations() {
- {
- allowing(request).getContextPath();
- will(returnValue("/ctx"));
- allowing(request).getAttribute(with(any(String.class)));
- will(returnValue(null));
- }
- });
+ Mockito.when(request.getContextPath()).thenReturn("/ctx");
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "relative/path"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/path"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "relative/path"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/path"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "ctx/relative/path"));
- TestCase.assertTrue(AuthUtil.isRedirectValid(request, "/ctx/absolute/path"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "ctx/relative/path"));
+ Assert.assertTrue(AuthUtil.isRedirectValid(request, "/ctx/absolute/path"));
- TestCase.assertTrue(AuthUtil.isRedirectValid(request, "/ctx/"));
- TestCase.assertTrue(AuthUtil.isRedirectValid(request, "/ctx"));
+ Assert.assertTrue(AuthUtil.isRedirectValid(request, "/ctx/"));
+ Assert.assertTrue(AuthUtil.isRedirectValid(request, "/ctx"));
}
@Test
public void test_isRedirectValid_resource_resolver_root_context() {
- context.checking(new Expectations() {
- {
- allowing(resolver).resolve(with(any(HttpServletRequest.class)), with(equal("/absolute/path")));
- will(returnValue(new SyntheticResource(resolver, "/absolute/path", "test")));
+ Mockito.when(request.getContextPath()).thenReturn("");
+ Mockito.when(request.getAttribute(AuthenticationSupport.REQUEST_ATTRIBUTE_RESOLVER)).thenReturn(resolver);
- allowing(resolver).resolve(with(any(HttpServletRequest.class)), with(equal("relative/path")));
- will(returnValue(new NonExistingResource(resolver, "relative/path")));
+ Mockito.when(resolver.resolve(Mockito.any(), Mockito.eq("/absolute/path")))
+ .thenReturn(new SyntheticResource(resolver, "/absolute/path", "test"));
+ Mockito.when(resolver.resolve(Mockito.any(), Mockito.eq("relative/path")))
+ .thenReturn(new NonExistingResource(resolver, "relative/path"));
+ Mockito.when(resolver.resolve(Mockito.any(), Mockito.any()))
+ .thenReturn(new NonExistingResource(resolver, "/absolute/missing"));
- allowing(resolver).resolve(with(any(HttpServletRequest.class)), with(any(String.class)));
- will(returnValue(new NonExistingResource(resolver, "/absolute/missing")));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "relative/path"));
+ Assert.assertTrue(AuthUtil.isRedirectValid(request, "/absolute/path"));
- allowing(request).getAttribute(with(AuthenticationSupport.REQUEST_ATTRIBUTE_RESOLVER));
- will(returnValue(resolver));
-
- allowing(request).getAttribute(with(any(String.class)));
- will(returnValue(null));
-
- allowing(request).getContextPath();
- will(returnValue(""));
- }
- });
-
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "relative/path"));
- TestCase.assertTrue(AuthUtil.isRedirectValid(request, "/absolute/path"));
-
- TestCase.assertTrue(AuthUtil.isRedirectValid(request, "/absolute/missing"));
- TestCase.assertTrue(AuthUtil.isRedirectValid(request, "/absolute/missing/valid"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/missing/invalid/<"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/missing/invalid/>"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/missing/invalid/'"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/missing/invalid/\""));
+ Assert.assertTrue(AuthUtil.isRedirectValid(request, "/absolute/missing"));
+ Assert.assertTrue(AuthUtil.isRedirectValid(request, "/absolute/missing/valid"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/missing/invalid/<"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/missing/invalid/>"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/missing/invalid/'"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/missing/invalid/\""));
}
@Test
public void test_isRedirectValid_resource_resolver_non_root_context() {
- context.checking(new Expectations() {
- {
- allowing(resolver).resolve(with(any(HttpServletRequest.class)), with(equal("/absolute/path")));
- will(returnValue(new SyntheticResource(resolver, "/absolute/path", "test")));
+ Mockito.when(request.getContextPath()).thenReturn("/ctx");
+ Mockito.when(request.getAttribute(AuthenticationSupport.REQUEST_ATTRIBUTE_RESOLVER)).thenReturn(resolver);
- allowing(resolver).resolve(with(any(HttpServletRequest.class)), with(equal("relative/path")));
- will(returnValue(new NonExistingResource(resolver, "relative/path")));
+ Mockito.when(resolver.resolve(Mockito.any(), Mockito.eq("/absolute/path")))
+ .thenReturn(new SyntheticResource(resolver, "/absolute/path", "test"));
+ Mockito.when(resolver.resolve(Mockito.any(), Mockito.eq("relative/path")))
+ .thenReturn(new NonExistingResource(resolver, "relative/path"));
+ Mockito.when(resolver.resolve(Mockito.any(), Mockito.any()))
+ .thenReturn(new NonExistingResource(resolver, "/absolute/missing"));
- allowing(request).getAttribute(with(AuthenticationSupport.REQUEST_ATTRIBUTE_RESOLVER));
- will(returnValue(resolver));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "relative/path"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/path"));
- allowing(request).getAttribute(with(any(String.class)));
- will(returnValue(null));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "ctx/relative/path"));
+ Assert.assertTrue(AuthUtil.isRedirectValid(request, "/ctx/absolute/path"));
- allowing(request).getContextPath();
- will(returnValue("/ctx"));
- }
- });
-
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "relative/path"));
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/absolute/path"));
-
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "ctx/relative/path"));
- TestCase.assertTrue(AuthUtil.isRedirectValid(request, "/ctx/absolute/path"));
-
- TestCase.assertFalse(AuthUtil.isRedirectValid(request, "/ctxrelative/path"));
+ Assert.assertFalse(AuthUtil.isRedirectValid(request, "/ctxrelative/path"));
}
@Test
public void test_isBrowserRequest_null() {
- context.checking(new Expectations() {
- {
- allowing(request).getHeader(with("User-Agent"));
- will(returnValue(null));
- }
- });
- TestCase.assertFalse(AuthUtil.isBrowserRequest(request));
+ Assert.assertFalse(AuthUtil.isBrowserRequest(request));
}
@Test
public void test_isBrowserRequest_Mozilla() {
- context.checking(new Expectations() {
- {
- allowing(request).getHeader(with("User-Agent"));
- will(returnValue("This is firefox (Mozilla)"));
- }
- });
- TestCase.assertTrue(AuthUtil.isBrowserRequest(request));
+ Mockito.when(request.getHeader("User-Agent")).thenReturn("This is firefox (Mozilla)");
+ Assert.assertTrue(AuthUtil.isBrowserRequest(request));
}
@Test
public void test_isBrowserRequest_Opera() {
- context.checking(new Expectations() {
- {
- allowing(request).getHeader(with("User-Agent"));
- will(returnValue("This is opera (Opera)"));
- }
- });
- TestCase.assertTrue(AuthUtil.isBrowserRequest(request));
+ Mockito.when(request.getHeader("User-Agent")).thenReturn("This is opera (Opera)");
+ Assert.assertTrue(AuthUtil.isBrowserRequest(request));
}
@Test
public void test_isBrowserRequest_WebDAV() {
- context.checking(new Expectations() {
- {
- allowing(request).getHeader(with("User-Agent"));
- will(returnValue("WebDAV Client"));
- }
- });
- TestCase.assertFalse(AuthUtil.isBrowserRequest(request));
+ Mockito.when(request.getHeader("User-Agent")).thenReturn("WebDAV Client");
+ Assert.assertFalse(AuthUtil.isBrowserRequest(request));
}
}
diff --git a/src/test/java/org/apache/sling/auth/core/spi/AuthenticationInfoTest.java b/src/test/java/org/apache/sling/auth/core/spi/AuthenticationInfoTest.java
index 305ff36..3684717 100644
--- a/src/test/java/org/apache/sling/auth/core/spi/AuthenticationInfoTest.java
+++ b/src/test/java/org/apache/sling/auth/core/spi/AuthenticationInfoTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.auth.core.spi;
-import static junit.framework.Assert.failNotEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
@@ -28,7 +28,6 @@
import javax.jcr.SimpleCredentials;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.auth.core.spi.AuthenticationInfo;
import org.junit.Assert;
import org.junit.Test;
@@ -181,7 +180,7 @@
pwd);
assertSame(pwd, info.getPassword());
- assertEquals(pwd, (char[]) info.get(ResourceResolverFactory.PASSWORD));
+ assertEquals(String.valueOf(pwd), String.valueOf((char[]) info.get(ResourceResolverFactory.PASSWORD)));
Assert.assertEquals(info.get(ResourceResolverFactory.PASSWORD),
info.getPassword());
}
@@ -274,22 +273,4 @@
}
assertSame(oldValue, info.get(key));
}
-
- static void assertEquals(final char[] expected, final char[] actual) {
- if (expected == null && actual != null) {
- failNotEquals(null, expected, actual);
- }
- if (expected != null && actual == null) {
- failNotEquals(null, expected, actual);
- }
- if (expected.length != actual.length) {
- failNotEquals(null, expected, actual);
- }
-
- for (int i = 0; i < expected.length; i++) {
- if (expected[i] != actual[i]) {
- failNotEquals(null, expected, actual);
- }
- }
- }
}
