Author: angela
Date: Fri Sep 22 15:45:11 2017
New Revision: 1809323
URL: http://svn.apache.org/viewvc?rev=1809323&view=rev
Log:
OAK-6705: Replace usage of RootFactory and TreeFactory in spi.security test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProviderTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/OpenPermissionProviderTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java?rev=1809323&r1=1809322&r2=1809323&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
Fri Sep 22 15:45:11 2017
@@ -41,8 +41,6 @@ import org.apache.jackrabbit.oak.api.Con
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Descriptors;
import org.apache.jackrabbit.oak.api.Root;
-import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
-import org.apache.jackrabbit.oak.plugins.tree.RootFactory;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import
org.apache.jackrabbit.oak.spi.security.authentication.callback.CredentialsCallback;
@@ -588,7 +586,8 @@ public class AbstractLoginModuleTest {
@Override
public ContentSession login(@Nullable Credentials credentials,
@Nullable String workspaceName) {
ContentSession cs = Mockito.mock(ContentSession.class);
-
Mockito.when(cs.getLatestRoot()).thenReturn(RootFactory.createReadOnlyRoot(EmptyNodeState.EMPTY_NODE));
+ Root root = Mockito.mock(Root.class);
+ Mockito.when(cs.getLatestRoot()).thenReturn(root);
return cs;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProviderTest.java?rev=1809323&r1=1809322&r2=1809323&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProviderTest.java
Fri Sep 22 15:45:11 2017
@@ -19,11 +19,10 @@ package org.apache.jackrabbit.oak.spi.se
import javax.jcr.Session;
import org.apache.jackrabbit.oak.api.Tree;
-import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
-import org.apache.jackrabbit.oak.plugins.tree.TreeFactory;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.junit.Test;
+import org.mockito.Mockito;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
@@ -33,7 +32,7 @@ public class EmptyPermissionProviderTest
private final PermissionProvider emptyProvider =
EmptyPermissionProvider.getInstance();
- private final Tree tree =
TreeFactory.createReadOnlyTree(EmptyNodeState.EMPTY_NODE);
+ private final Tree tree = Mockito.mock(Tree.class);
@Test
public void testGetPrivileges() {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/OpenPermissionProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/OpenPermissionProviderTest.java?rev=1809323&r1=1809322&r2=1809323&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/OpenPermissionProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/OpenPermissionProviderTest.java
Fri Sep 22 15:45:11 2017
@@ -20,12 +20,11 @@ import java.util.Set;
import javax.jcr.Session;
import org.apache.jackrabbit.oak.api.Tree;
-import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
-import org.apache.jackrabbit.oak.plugins.tree.TreeFactory;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.util.Text;
import org.junit.Test;
+import org.mockito.Mockito;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
@@ -35,7 +34,7 @@ public class OpenPermissionProviderTest
private final PermissionProvider openProvider =
OpenPermissionProvider.getInstance();
- private final Tree tree =
TreeFactory.createReadOnlyTree(EmptyNodeState.EMPTY_NODE);
+ private final Tree tree = Mockito.mock(Tree.class);
@Test
public void testGetPrivileges() {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java?rev=1809323&r1=1809322&r2=1809323&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java
Fri Sep 22 15:45:11 2017
@@ -23,10 +23,9 @@ import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
-import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
-import org.apache.jackrabbit.oak.plugins.tree.TreeFactory;
import org.junit.Test;
+import org.mockito.Mockito;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
@@ -73,7 +72,7 @@ public class CompositePatternTest {
@Test
public void testMatchesTree() {
- Tree tree = TreeFactory.createReadOnlyTree(EmptyNodeState.EMPTY_NODE);
+ Tree tree = Mockito.mock(Tree.class);
assertTrue(alwaysMatching.matches(tree, null));
assertFalse(neverMatching.matches(tree, null));
@@ -81,7 +80,7 @@ public class CompositePatternTest {
@Test
public void testMatchesTreeProperty() {
- Tree tree = TreeFactory.createReadOnlyTree(EmptyNodeState.EMPTY_NODE);
+ Tree tree = Mockito.mock(Tree.class);
PropertyState property = PropertyStates.createProperty("prop",
"value");
assertTrue(alwaysMatching.matches(tree, property));
