You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/07/19 12:30:23 UTC
jena git commit: Fixed mock conflict in SecuredItemImplTest. part of
the fix for JENA-990
Repository: jena
Updated Branches:
refs/heads/master 232951d91 -> 4723a8a72
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/4723a8a7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4723a8a7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4723a8a7
Branch: refs/heads/master
Commit: 4723a8a72cec322ee414dfee4b3d0cd027a8550e
Parents: 232951d
Author: Claude Warren <cl...@apache.org>
Authored: Sun Jul 19 11:29:43 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Sun Jul 19 11:29:43 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/4723a8a7/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());