Repository: struts Updated Branches: refs/heads/master 6e07a6379 -> d06689120
Cleans up test Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fb92c67d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fb92c67d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fb92c67d Branch: refs/heads/master Commit: fb92c67d131b58ed05e3a23c50f7d4b897d34dd7 Parents: 6e07a63 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Sun Jun 26 22:04:23 2016 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Wed Jun 29 20:34:03 2016 +0200 ---------------------------------------------------------------------- .../xwork2/ognl/SecurityMemberAccessTest.java | 32 +++----------------- 1 file changed, 4 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/fb92c67d/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java index b719432..8f98c25 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java @@ -119,24 +119,6 @@ public class SecurityMemberAccessTest extends TestCase { assertTrue("fooLogic() from FooInterface isn't accessible!!!", accessible); } - public void testMiddleOfInheritanceExclusion2() throws Exception { - // given - SecurityMemberAccess sma = new SecurityMemberAccess(false); - - String propertyName = "barLogic"; - Member member = BarInterface.class.getMethod(propertyName); - - Set<Class<?>> excluded = new HashSet<Class<?>>(); - excluded.add(BarInterface.class); - sma.setExcludedClasses(excluded); - - // when - boolean accessible = sma.isAccessible(context, target, member, propertyName); - - // then - assertFalse("barLogic() from BarInterface is accessible!!!", accessible); - } - public void testMiddleOfInheritanceExclusion3() throws Exception { // given SecurityMemberAccess sma = new SecurityMemberAccess(false); @@ -144,12 +126,6 @@ public class SecurityMemberAccessTest extends TestCase { String propertyName = "barLogic"; Member member = BarInterface.class.getMethod(propertyName); -/* - Set<Class<?>> excluded = new HashSet<Class<?>>(); - excluded.add(BarInterface.class); - sma.setExcludedClasses(excluded); -*/ - // when boolean accessible = sma.isAccessible(context, target, member, propertyName); @@ -256,7 +232,7 @@ public class SecurityMemberAccessTest extends TestCase { public void testAccessStatic() throws Exception { // given SecurityMemberAccess sma = new SecurityMemberAccess(true); - sma.setExcludedClasses(new HashSet<Class<?>>(Arrays.<Class<?>>asList(Class.class))); + sma.setExcludedClasses(new HashSet<Class<?>>(Collections.singletonList(Class.class))); // when Member method = StaticTester.class.getMethod("sayHello"); @@ -269,7 +245,7 @@ public class SecurityMemberAccessTest extends TestCase { public void testBlockStaticAccess() throws Exception { // given SecurityMemberAccess sma = new SecurityMemberAccess(false); - sma.setExcludedClasses(new HashSet<Class<?>>(Arrays.<Class<?>>asList(Class.class))); + sma.setExcludedClasses(new HashSet<Class<?>>(Collections.singletonList(Class.class))); // when Member method = StaticTester.class.getMethod("sayHello"); @@ -282,7 +258,7 @@ public class SecurityMemberAccessTest extends TestCase { public void testBlockStaticAccessIfClassIsExcluded() throws Exception { // given SecurityMemberAccess sma = new SecurityMemberAccess(false); - sma.setExcludedClasses(new HashSet<Class<?>>(Arrays.<Class<?>>asList(Class.class))); + sma.setExcludedClasses(new HashSet<Class<?>>(Collections.singletonList(Class.class))); // when Member method = Class.class.getMethod("getClassLoader"); @@ -295,7 +271,7 @@ public class SecurityMemberAccessTest extends TestCase { public void testAllowStaticAccessIfClassIsNotExcluded() throws Exception { // given SecurityMemberAccess sma = new SecurityMemberAccess(true); - sma.setExcludedClasses(new HashSet<Class<?>>(Arrays.<Class<?>>asList(ClassLoader.class))); + sma.setExcludedClasses(new HashSet<Class<?>>(Collections.singletonList(ClassLoader.class))); // when Member method = Class.class.getMethod("getClassLoader");
