Author: markt
Date: Wed Jun 17 09:17:49 2015
New Revision: 1685968
URL: http://svn.apache.org/r1685968
Log:
Review JASPIC unit tests
- Line spacing
- Renaming to avoid failures when running via the build script
Added:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthConfig.java
- copied, changed from r1685958,
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthConfig.java
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthConfigProvider.java
- copied, changed from r1685958,
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthConfigProvider.java
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthModule.java
- copied, changed from r1685958,
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthModule.java
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterServerAuthContext.java
- copied, changed from r1685958,
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestServerAuthContext.java
Removed:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthConfig.java
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthConfigProvider.java
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthModule.java
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestServerAuthContext.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestJaspicAuthenticator.java
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestJaspicCallbackHandler.java
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPrincipalGroupCallback.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestJaspicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestJaspicAuthenticator.java?rev=1685968&r1=1685967&r2=1685968&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestJaspicAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestJaspicAuthenticator.java
Wed Jun 17 09:17:49 2015
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEqu
import org.junit.Test;
import org.apache.catalina.Context;
-import org.apache.catalina.authenticator.jaspic.sam.TestAuthConfigProvider;
+import org.apache.catalina.authenticator.jaspic.sam.TesterAuthConfigProvider;
import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -45,6 +45,7 @@ public class TestJaspicAuthenticator ext
private static final String ROLE = "group";
private Context context;
+
@Override
public void setUp() throws Exception {
super.setUp();
@@ -53,8 +54,8 @@ public class TestJaspicAuthenticator ext
this.context = tomcat.addContext(CONTEXT_PATH, null);
// Add protected servlet
- Tomcat.addServlet(context, "TesterServlet3", new TesterServlet());
- context.addServletMapping(URI_PROTECTED, "TesterServlet3");
+ Tomcat.addServlet(context, "TesterServlet", new TesterServlet());
+ context.addServletMapping(URI_PROTECTED, "TesterServlet");
SecurityCollection collection = new SecurityCollection();
collection.addPattern(URI_PROTECTED);
@@ -70,11 +71,12 @@ public class TestJaspicAuthenticator ext
context.getPipeline().addValve(new JaspicAuthenticator());
AuthConfigFactory factory = AuthConfigFactory.getFactory();
- factory.registerConfigProvider(new TestAuthConfigProvider(),
"HttpServlet", null,
+ factory.registerConfigProvider(new TesterAuthConfigProvider(),
"HttpServlet", null,
"Description");
getTomcatInstance().start();
}
+
@Test
public void shouldAuthenticateUsingRegistredJaspicProvider() throws
Exception {
// given
@@ -89,6 +91,7 @@ public class TestJaspicAuthenticator ext
assertEquals("OK", byteChunk.toString());
}
+
@Test
public void shouldFailAuthenticationUsingRegistredJaspicProvider() throws
Exception {
// given
@@ -102,8 +105,8 @@ public class TestJaspicAuthenticator ext
assertEquals(HttpServletResponse.SC_FORBIDDEN, result);
}
+
private String getUrl() throws MalformedURLException {
return new URL("http", "localhost", getPort(),
CONTEXT_PATH).toString();
}
-
}
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestJaspicCallbackHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestJaspicCallbackHandler.java?rev=1685968&r1=1685967&r2=1685968&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestJaspicCallbackHandler.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestJaspicCallbackHandler.java
Wed Jun 17 09:17:49 2015
@@ -30,10 +30,12 @@ import org.junit.Test;
import org.apache.catalina.realm.GenericPrincipal;
public class TestJaspicCallbackHandler {
+
private static final String USER = "user";
private JaspicCallbackHandler jaspicCallbackHandler = new
JaspicCallbackHandler(null);
+
@Test
public void shouldConvertCallbackToTomcatPrincipal() throws Exception {
// given
@@ -52,6 +54,7 @@ public class TestJaspicCallbackHandler {
assertArrayEquals(groups, principal.getRoles());
}
+
@Test(expected = IllegalStateException.class)
public void shouldHandleUnknowCallback() throws Exception {
// given
@@ -64,5 +67,4 @@ public class TestJaspicCallbackHandler {
// then
fail("Should throw exception");
}
-
}
\ No newline at end of file
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPrincipalGroupCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPrincipalGroupCallback.java?rev=1685968&r1=1685967&r2=1685968&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPrincipalGroupCallback.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPrincipalGroupCallback.java
Wed Jun 17 09:17:49 2015
@@ -34,6 +34,7 @@ public class TestPrincipalGroupCallback
private static final String USER_NAME = "user";
+
@Test
public void shouldAddUserPrincipal() throws Exception {
// given
@@ -50,6 +51,7 @@ public class TestPrincipalGroupCallback
assertEquals(userPrincipal, principal.getUserPrincipal());
}
+
@Test
public void shouldCreatePrincipalWithUsername() throws Exception {
// given
@@ -64,6 +66,7 @@ public class TestPrincipalGroupCallback
assertEquals(USER_NAME, principal.getName());
}
+
@Test
public void shouldAddGroupsToPrincipal() throws Exception {
// given
@@ -84,6 +87,7 @@ public class TestPrincipalGroupCallback
assertArrayEquals(principal.getRoles(), groups);
}
+
@Test
public void shouldReturnNullIfNoCallbackDefined() throws Exception {
// given
@@ -96,6 +100,7 @@ public class TestPrincipalGroupCallback
assertNull(principal);
}
+
private static class UserPrincipal implements Principal {
private String name;
Copied:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthConfig.java
(from r1685958,
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthConfig.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthConfig.java?p2=tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthConfig.java&p1=tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthConfig.java&r1=1685958&r2=1685968&rev=1685968&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthConfig.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthConfig.java
Wed Jun 17 09:17:49 2015
@@ -26,45 +26,52 @@ import javax.security.auth.message.confi
import javax.security.auth.message.config.ServerAuthContext;
import javax.security.auth.message.module.ServerAuthModule;
-public class TestAuthConfig implements ServerAuthConfig {
+public class TesterAuthConfig implements ServerAuthConfig {
+
private CallbackHandler callbackHandler;
private ServerAuthModule authModule;
- public TestAuthConfig(CallbackHandler callbackHandler, ServerAuthModule
authModule) {
+
+ public TesterAuthConfig(CallbackHandler callbackHandler, ServerAuthModule
authModule) {
this.callbackHandler = callbackHandler;
this.authModule = authModule;
}
+
@Override
public String getMessageLayer() {
return "HttpServlet";
}
+
@Override
public String getAppContext() {
return null;
}
+
@Override
public String getAuthContextID(MessageInfo messageInfo) {
return null;
}
+
@Override
public void refresh() {
}
+
@Override
public boolean isProtected() {
return false;
}
+
@Override
@SuppressWarnings("rawtypes")
public ServerAuthContext getAuthContext(String authContextID, Subject
serviceSubject,
Map properties) throws AuthException {
- return new TestServerAuthContext(callbackHandler, authModule);
+ return new TesterServerAuthContext(callbackHandler, authModule);
}
-
}
\ No newline at end of file
Copied:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthConfigProvider.java
(from r1685958,
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthConfigProvider.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthConfigProvider.java?p2=tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthConfigProvider.java&p1=tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthConfigProvider.java&r1=1685958&r2=1685968&rev=1685968&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthConfigProvider.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthConfigProvider.java
Wed Jun 17 09:17:49 2015
@@ -22,7 +22,7 @@ import javax.security.auth.message.confi
import javax.security.auth.message.config.ClientAuthConfig;
import javax.security.auth.message.config.ServerAuthConfig;
-public class TestAuthConfigProvider implements AuthConfigProvider {
+public class TesterAuthConfigProvider implements AuthConfigProvider {
@Override
public ClientAuthConfig getClientAuthConfig(String layer, String
appContext,
@@ -30,12 +30,14 @@ public class TestAuthConfigProvider impl
return null;
}
+
@Override
public ServerAuthConfig getServerAuthConfig(String layer, String
appContext,
CallbackHandler handler) throws AuthException {
- return new TestAuthConfig(handler, new TestAuthModule());
+ return new TesterAuthConfig(handler, new TesterAuthModule());
}
+
@Override
public void refresh() {
}
Copied:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthModule.java
(from r1685958,
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthModule.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthModule.java?p2=tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthModule.java&p1=tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthModule.java&r1=1685958&r2=1685968&rev=1685968&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestAuthModule.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterAuthModule.java
Wed Jun 17 09:17:49 2015
@@ -34,12 +34,13 @@ import javax.security.auth.message.modul
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-public class TestAuthModule implements ServerAuthModule {
+public class TesterAuthModule implements ServerAuthModule {
private CallbackHandler handler;
private Class<?>[] supportedMessageTypes = new Class[] {
HttpServletRequest.class,
HttpServletResponse.class };
+
@Override
@SuppressWarnings("rawtypes")
public void initialize(MessagePolicy requestPolicy, MessagePolicy
responsePolicy,
@@ -47,6 +48,7 @@ public class TestAuthModule implements S
this.handler = handler;
}
+
@Override
public AuthStatus validateRequest(MessageInfo messageInfo, Subject
clientSubject,
Subject serviceSubject) throws AuthException {
@@ -63,6 +65,7 @@ public class TestAuthModule implements S
return AuthStatus.SUCCESS;
}
+
private Callback[] getAuthenticationCallbacks(Subject clientSubject,
HttpServletRequest request) {
Callback[] callbacks;
@@ -76,20 +79,22 @@ public class TestAuthModule implements S
return callbacks;
}
+
@Override
public AuthStatus secureResponse(MessageInfo messageInfo, Subject
serviceSubject)
throws AuthException {
return AuthStatus.SEND_SUCCESS;
}
+
@Override
public void cleanSubject(MessageInfo messageInfo, Subject subject) throws
AuthException {
}
+
@Override
public Class<?>[] getSupportedMessageTypes() {
return supportedMessageTypes;
}
-
}
Copied:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterServerAuthContext.java
(from r1685958,
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestServerAuthContext.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterServerAuthContext.java?p2=tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterServerAuthContext.java&p1=tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestServerAuthContext.java&r1=1685958&r2=1685968&rev=1685968&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TestServerAuthContext.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/sam/TesterServerAuthContext.java
Wed Jun 17 09:17:49 2015
@@ -26,31 +26,34 @@ import javax.security.auth.message.Messa
import javax.security.auth.message.config.ServerAuthContext;
import javax.security.auth.message.module.ServerAuthModule;
-public class TestServerAuthContext implements ServerAuthContext {
+public class TesterServerAuthContext implements ServerAuthContext {
private final ServerAuthModule authModule;
- public TestServerAuthContext(CallbackHandler handler, ServerAuthModule
authModule)
+
+ public TesterServerAuthContext(CallbackHandler handler, ServerAuthModule
authModule)
throws AuthException {
this.authModule = authModule;
authModule.initialize(null, null, handler, Collections.emptyMap());
}
+
@Override
public AuthStatus validateRequest(MessageInfo messageInfo, Subject
clientSubject,
Subject serviceSubject) throws AuthException {
return authModule.validateRequest(messageInfo, clientSubject,
serviceSubject);
}
+
@Override
public AuthStatus secureResponse(MessageInfo messageInfo, Subject
serviceSubject)
throws AuthException {
return authModule.secureResponse(messageInfo, serviceSubject);
}
+
@Override
public void cleanSubject(MessageInfo messageInfo, Subject subject) throws
AuthException {
authModule.cleanSubject(messageInfo, subject);
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
