Fixed mock conflict in SecuredItemImplTest. part of the fix for JENA-990
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b67d5af1 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b67d5af1 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b67d5af1 Branch: refs/heads/master Commit: b67d5af1dc84baa6c4b093394e92cebbe5198273 Parents: 68d0072 Author: Claude Warren <[email protected]> Authored: Sun Jul 19 11:29:43 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Tue Jul 21 21:33:40 2015 +0100 ---------------------------------------------------------------------- .../jena/permissions/impl/SecuredItemImplTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/b67d5af1/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java index 22c992d..8e18555 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java @@ -53,7 +53,7 @@ public class SecuredItemImplTest { { // Triple.ANY when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL ); - when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE); + when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE); assertTrue( securedItemImpl.canRead( Triple.ANY ) ); verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture()); @@ -75,7 +75,7 @@ public class SecuredItemImplTest { // FUTURE ANY Variable when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL ); - when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE); + when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE); Triple target = new Triple( SecurityEvaluator.FUTURE, Node.ANY, Var.alloc( "var")); assertTrue( securedItemImpl.canRead( target ) ); verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture()); @@ -100,7 +100,7 @@ public class SecuredItemImplTest { { // Triple.ANY when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL ); - when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE); + when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE); assertTrue( securedItemImpl.canCreate( Triple.ANY ) ); verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture()); @@ -122,7 +122,7 @@ public class SecuredItemImplTest { // FUTURE ANY Variable when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL ); - when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE); + when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE); Triple target = new Triple( SecurityEvaluator.FUTURE, Node.ANY, Var.alloc( "var")); assertTrue( securedItemImpl.canCreate( target ) ); verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture()); @@ -147,7 +147,7 @@ public class SecuredItemImplTest { { // Triple.ANY when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL ); - when( evaluator.evaluateUpdate( any(), any(), any(), any())).thenReturn( Boolean.TRUE); + when( evaluator.evaluateUpdate( anyObject(), any(Node.class), any(Triple.class), any(Triple.class))).thenReturn( Boolean.TRUE); assertTrue( securedItemImpl.canUpdate( Triple.ANY, Triple.ANY ) ); verify( evaluator ).evaluateUpdate( principal.capture(), modelNode.capture(), triple.capture(), any()); @@ -166,7 +166,7 @@ public class SecuredItemImplTest { // FUTURE ANY Variable when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL ); - when( evaluator.evaluateUpdate( any(), any(), any(), any())).thenReturn( Boolean.TRUE); + when( evaluator.evaluateUpdate( anyObject(), any(Node.class), any(Triple.class), any(Triple.class))).thenReturn( Boolean.TRUE); Triple target = new Triple( SecurityEvaluator.FUTURE, Node.ANY, Var.alloc( "var")); assertTrue( securedItemImpl.canUpdate( target, Triple.ANY ) ); verify( evaluator ).evaluateUpdate( principal.capture(), modelNode.capture(), triple.capture(), any()); @@ -188,7 +188,7 @@ public class SecuredItemImplTest { { // Triple.ANY when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL ); - when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE); + when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE); assertTrue( securedItemImpl.canDelete( Triple.ANY ) ); verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture()); @@ -210,7 +210,7 @@ public class SecuredItemImplTest { // FUTURE ANY Variable when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL ); - when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE); + when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE); Triple target = new Triple( SecurityEvaluator.FUTURE, Node.ANY, Var.alloc( "var")); assertTrue( securedItemImpl.canDelete( target ) ); verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture());
