You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ad...@apache.org on 2009/03/11 18:35:32 UTC
svn commit: r752540 -
/incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java
Author: adc
Date: Wed Mar 11 17:35:32 2009
New Revision: 752540
URL: http://svn.apache.org/viewvc?rev=752540&view=rev
Log:
KI-66 intermediate changes
Modified:
incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java
Modified: incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java?rev=752540&r1=752539&r2=752540&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java (original)
+++ incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java Wed Mar 11 17:35:32 2009
@@ -24,16 +24,16 @@
import static org.easymock.EasyMock.*;
import org.junit.Test;
-import org.apache.ki.web.servlet.Apache KiFilter;
+import org.apache.ki.web.servlet.KiFilter;
/**
* @author Les Hazlewood
* @since 0.9
*/
-public class Apache KiFilterTest {
+public class JSecurityFilterTest {
- private Apache KiFilter filter;
+ private KiFilter filter;
private FilterConfig mockFilterConfig;
private ServletContext mockServletContext;
@@ -42,9 +42,9 @@
mockServletContext = createMock(ServletContext.class);
expect(mockFilterConfig.getServletContext()).andReturn(mockServletContext);
- expect(mockFilterConfig.getInitParameter(Apache KiFilter.CONFIG_CLASS_NAME_INIT_PARAM_NAME)).andReturn(null).once();
- expect(mockFilterConfig.getInitParameter(Apache KiFilter.CONFIG_INIT_PARAM_NAME)).andReturn(config).once();
- expect(mockFilterConfig.getInitParameter(Apache KiFilter.CONFIG_URL_INIT_PARAM_NAME)).andReturn(null).once();
+ expect(mockFilterConfig.getInitParameter(KiFilter.CONFIG_CLASS_NAME_INIT_PARAM_NAME)).andReturn(null).once();
+ expect(mockFilterConfig.getInitParameter(KiFilter.CONFIG_INIT_PARAM_NAME)).andReturn(config).once();
+ expect(mockFilterConfig.getInitParameter(KiFilter.CONFIG_URL_INIT_PARAM_NAME)).andReturn(null).once();
}
public void tearDown() throws Exception {
@@ -63,10 +63,9 @@
replay(mockServletContext);
replay(mockFilterConfig);
- this.filter = new Apache KiFilter();
+ this.filter = new KiFilter();
this.filter.init(mockFilterConfig);
-
verify(mockFilterConfig);
verify(mockServletContext);
}
@@ -80,8 +79,7 @@
@Test
public void testSimpleConfig() throws Exception {
- setUp("[filters]\n" +
- "authc.successUrl = /index.jsp");
+ setUp("[filters]\nauthc.successUrl = /index.jsp");
replayAndVerify();
}
}