You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/05/04 16:16:07 UTC
svn commit: r1830923 - in
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr:
CopyTest.java security/authorization/ReadNodeTypeTest.java
security/authorization/VersionManagementTest.java
Author: reschke
Date: Fri May 4 16:16:07 2018
New Revision: 1830923
URL: http://svn.apache.org/viewvc?rev=1830923&view=rev
Log:
OAK-7472: tests should pass with locking disabled
reverted, as it requires unreleased version of jackrabbit
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java?rev=1830923&r1=1830922&r2=1830923&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java Fri May 4 16:16:07 2018
@@ -20,12 +20,10 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.PropertyType;
-import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.version.Version;
@@ -194,9 +192,6 @@ public class CopyTest extends AbstractRe
@Test
public void testCopyLockedNode() throws Exception {
-
- assumeTrue(getRepository().getDescriptorValue(Repository.OPTION_LOCKING_SUPPORTED).getBoolean());
-
Session session = getAdminSession();
Node toCopy = session.getNode(TEST_PATH + "/source/node");
toCopy.addMixin(JcrConstants.MIX_LOCKABLE);
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java?rev=1830923&r1=1830922&r2=1830923&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java Fri May 4 16:16:07 2018
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.jcr.security.authorization;
import javax.jcr.Node;
-import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NodeType;
@@ -47,7 +46,7 @@ public class ReadNodeTypeTest extends Ab
* @see <a href="https://issues.apache.org/jira/browse/OAK-2441">OAK-2441</a>
*/
public void testNodeGetMixinTypes() throws Exception {
- superuser.getNode(path).addMixin(JcrConstants.MIX_REFERENCEABLE);
+ superuser.getNode(path).addMixin(JcrConstants.MIX_LOCKABLE);
superuser.save();
assertTrue(testSession.propertyExists(path + '/' + JcrConstants.JCR_MIXINTYPES));
@@ -103,7 +102,7 @@ public class ReadNodeTypeTest extends Ab
* @see <a href="https://issues.apache.org/jira/browse/OAK-2488">OAK-2488</a>
*/
public void testGetMixinFromNewNode() throws Exception {
- superuser.getNode(path).addMixin(JcrConstants.MIX_REFERENCEABLE);
+ superuser.getNode(path).addMixin(JcrConstants.MIX_LOCKABLE);
superuser.save();
deny(path, privilegesFromName(PrivilegeConstants.REP_READ_PROPERTIES));
@@ -120,7 +119,7 @@ public class ReadNodeTypeTest extends Ab
* @see <a href="https://issues.apache.org/jira/browse/OAK-3775">OAK-3775</a>
*/
public void testIsNodeType() throws Exception {
- superuser.getNode(path).addMixin(JcrConstants.MIX_REFERENCEABLE);
+ superuser.getNode(path).addMixin(JcrConstants.MIX_LOCKABLE);
superuser.save();
deny(path, privilegesFromName(PrivilegeConstants.REP_READ_PROPERTIES));
@@ -129,14 +128,14 @@ public class ReadNodeTypeTest extends Ab
assertFalse(n.hasProperty(JcrConstants.JCR_PRIMARYTYPE));
assertTrue(n.isNodeType(superuser.getNode(path).getPrimaryNodeType().getName()));
- assertTrue(n.isNodeType(JcrConstants.MIX_REFERENCEABLE));
+ assertTrue(n.isNodeType(JcrConstants.MIX_LOCKABLE));
}
/**
* @see <a href="https://issues.apache.org/jira/browse/OAK-3775">OAK-3775</a>
*/
public void testIsNodeTypeNewNode() throws Exception {
- superuser.getNode(path).addMixin(JcrConstants.MIX_REFERENCEABLE);
+ superuser.getNode(path).addMixin(JcrConstants.MIX_LOCKABLE);
superuser.save();
deny(path, privilegesFromName(PrivilegeConstants.REP_READ_PROPERTIES));
@@ -145,7 +144,7 @@ public class ReadNodeTypeTest extends Ab
assertTrue(newNode.isNodeType(superuser.getNode(path).getPrimaryNodeType().getName()));
assertTrue(newNode.isNodeType(testNodeType));
- assertFalse(newNode.isNodeType(JcrConstants.MIX_REFERENCEABLE));
+ assertFalse(newNode.isNodeType(JcrConstants.MIX_LOCKABLE));
}
/**
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java?rev=1830923&r1=1830922&r2=1830923&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java Fri May 4 16:16:07 2018
@@ -404,12 +404,10 @@ public class VersionManagementTest exten
Property versionablePath = vh.getProperty(superuser.getWorkspace().getName());
assertEquals(testNode.getPath(), versionablePath.getString());
}
-
+
@Test
public void testCheckInCheckoutLocked() throws Exception {
-
- ensureLockingSupported();
-
+
LockManager lockManager = superuser.getWorkspace().getLockManager();
VersionManager versionManager = superuser.getWorkspace().getVersionManager();
@@ -417,14 +415,14 @@ public class VersionManagementTest exten
Node n = createVersionableNode(superuser.getNode(path));
n.addMixin(mixLockable);
superuser.save();
-
+
String nodePath = n.getPath();
-
+
// lock
lockManager.lock(nodePath, true, false, 0, superuser.getUserID());
// create version
versionManager.checkin(nodePath);
versionManager.checkout(nodePath);
- }
+ }
}