You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ka...@apache.org on 2015/03/16 20:57:57 UTC
svn commit: r1667116 - in /shiro/branches/1.2.x/support: cas/
guice/src/test/java/org/apache/shiro/guice/BeanTypeListenerTest.java
guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainResolverTest.java
Author: kaosko
Date: Mon Mar 16 19:57:57 2015
New Revision: 1667116
URL: http://svn.apache.org/r1667116
Log:
Make tests using generics compile on newer (1.5+) jdks
Modified:
shiro/branches/1.2.x/support/cas/ (props changed)
shiro/branches/1.2.x/support/guice/src/test/java/org/apache/shiro/guice/BeanTypeListenerTest.java
shiro/branches/1.2.x/support/guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainResolverTest.java
Propchange: shiro/branches/1.2.x/support/cas/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 16 19:57:57 2015
@@ -1,2 +1,4 @@
*.iml
target
+.classpath
+.project
Modified: shiro/branches/1.2.x/support/guice/src/test/java/org/apache/shiro/guice/BeanTypeListenerTest.java
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/guice/src/test/java/org/apache/shiro/guice/BeanTypeListenerTest.java?rev=1667116&r1=1667115&r2=1667116&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/guice/src/test/java/org/apache/shiro/guice/BeanTypeListenerTest.java (original)
+++ shiro/branches/1.2.x/support/guice/src/test/java/org/apache/shiro/guice/BeanTypeListenerTest.java Mon Mar 16 19:57:57 2015
@@ -18,23 +18,37 @@
*/
package org.apache.shiro.guice;
-import com.google.inject.*;
-import com.google.inject.name.Names;
-import com.google.inject.spi.Message;
-import com.google.inject.spi.TypeEncounter;
-import org.apache.shiro.guice.aop.ShiroAopModule;
-import org.apache.shiro.guice.web.ShiroWebModule;
+import static org.easymock.EasyMock.and;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.createControl;
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.Map;
+
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.aop.DefaultAnnotationResolver;
import org.apache.shiro.crypto.BlowfishCipherService;
+import org.apache.shiro.guice.aop.ShiroAopModule;
+import org.apache.shiro.guice.web.ShiroWebModule;
import org.easymock.Capture;
import org.easymock.IMocksControl;
import org.junit.Test;
-import java.util.Collections;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+import com.google.inject.ConfigurationException;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.MembersInjector;
+import com.google.inject.Provider;
+import com.google.inject.TypeLiteral;
+import com.google.inject.name.Names;
+import com.google.inject.spi.Message;
+import com.google.inject.spi.TypeEncounter;
/**
* Test Cases::
@@ -83,7 +97,7 @@ public class BeanTypeListenerTest {
expect(injector.getInstance(Key.get(String.class, Names.named("shiro.myProperty")))).andReturn(property);
expect(injector.getInstance(Key.get(String.class, Names.named("shiro.unavailableProperty"))))
.andThrow(new ConfigurationException(Collections.singleton(new Message("Not Available!"))));
- expect(injector.getInstance(BeanTypeListener.MAP_KEY)).andReturn(Collections.EMPTY_MAP).anyTimes();
+ expect((Map)injector.getInstance(BeanTypeListener.MAP_KEY)).andReturn(Collections.EMPTY_MAP).anyTimes();
control.replay();
Modified: shiro/branches/1.2.x/support/guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainResolverTest.java
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/support/guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainResolverTest.java?rev=1667116&r1=1667115&r2=1667116&view=diff
==============================================================================
--- shiro/branches/1.2.x/support/guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainResolverTest.java (original)
+++ shiro/branches/1.2.x/support/guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainResolverTest.java Mon Mar 16 19:57:57 2015
@@ -18,13 +18,14 @@
*/
package org.apache.shiro.guice.web;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.name.Names;
-import org.apache.shiro.util.PatternMatcher;
-import org.apache.shiro.web.util.WebUtils;
-import org.easymock.IMocksControl;
-import org.junit.Test;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createStrictControl;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.same;
+import static org.junit.Assert.assertNull;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -32,11 +33,15 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertNull;
+import org.apache.shiro.util.PatternMatcher;
+import org.apache.shiro.web.util.WebUtils;
+import org.easymock.IMocksControl;
+import org.junit.Test;
+
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.name.Names;
/**
@@ -88,9 +93,9 @@ public class SimpleFilterChainResolverTe
Filter filter2a = ctrl.createMock(Filter.class);
Filter filter2b = ctrl.createMock(Filter.class);
- expect(injector.getInstance(key2a)).andReturn(filter2a);
+ expect((Filter)injector.getInstance(key2a)).andReturn(filter2a);
filter2a.doFilter(same(request), same(response), anyObject(FilterChain.class));
- expect(injector.getInstance(key2b)).andReturn(filter2b);
+ expect((Filter)injector.getInstance(key2b)).andReturn(filter2b);
filter2b.doFilter(same(request), same(response), anyObject(FilterChain.class));
originalChain.doFilter(request, response);