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/09/07 10:22:23 UTC
svn commit: r1840283 - in /jackrabbit/oak/branches/1.8: ./ oak-jcr/
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/
Author: reschke
Date: Fri Sep 7 10:22:23 2018
New Revision: 1840283
URL: http://svn.apache.org/viewvc?rev=1840283&view=rev
Log:
OAK-7472: tests should pass with locking disabled (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-jcr/ (props changed)
jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java
jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java
jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 7 10:22:23 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1831157-1831158,1831163,1831190
,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834336,1834428,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158
,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834336,1834428,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024
/jackrabbit/trunk:1345480
Propchange: jackrabbit/oak/branches/1.8/oak-jcr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 7 10:22:23 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0/oak-jcr:1665962
-/jackrabbit/oak/trunk/oak-jcr:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1821979,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829987,1830019,1830160,1830170,1833347
+/jackrabbit/oak/trunk/oak-jcr:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1821979,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829987,1830019,1830160,1830170,1830911,1830923,1831689,1833347
/jackrabbit/trunk/oak-jcr:1345480
Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java?rev=1840283&r1=1840282&r2=1840283&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java Fri Sep 7 10:22:23 2018
@@ -20,10 +20,12 @@ 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;
@@ -192,6 +194,9 @@ 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/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java?rev=1840283&r1=1840282&r2=1840283&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java Fri Sep 7 10:22:23 2018
@@ -17,6 +17,7 @@
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;
@@ -46,7 +47,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_LOCKABLE);
+ superuser.getNode(path).addMixin(JcrConstants.MIX_REFERENCEABLE);
superuser.save();
assertTrue(testSession.propertyExists(path + '/' + JcrConstants.JCR_MIXINTYPES));
@@ -102,7 +103,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_LOCKABLE);
+ superuser.getNode(path).addMixin(JcrConstants.MIX_REFERENCEABLE);
superuser.save();
deny(path, privilegesFromName(PrivilegeConstants.REP_READ_PROPERTIES));
@@ -119,7 +120,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_LOCKABLE);
+ superuser.getNode(path).addMixin(JcrConstants.MIX_REFERENCEABLE);
superuser.save();
deny(path, privilegesFromName(PrivilegeConstants.REP_READ_PROPERTIES));
@@ -128,14 +129,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_LOCKABLE));
+ assertTrue(n.isNodeType(JcrConstants.MIX_REFERENCEABLE));
}
/**
* @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_LOCKABLE);
+ superuser.getNode(path).addMixin(JcrConstants.MIX_REFERENCEABLE);
superuser.save();
deny(path, privilegesFromName(PrivilegeConstants.REP_READ_PROPERTIES));
@@ -144,7 +145,7 @@ public class ReadNodeTypeTest extends Ab
assertTrue(newNode.isNodeType(superuser.getNode(path).getPrimaryNodeType().getName()));
assertTrue(newNode.isNodeType(testNodeType));
- assertFalse(newNode.isNodeType(JcrConstants.MIX_LOCKABLE));
+ assertFalse(newNode.isNodeType(JcrConstants.MIX_REFERENCEABLE));
}
/**
Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java?rev=1840283&r1=1840282&r2=1840283&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java Fri Sep 7 10:22:23 2018
@@ -404,10 +404,12 @@ 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();
@@ -415,14 +417,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);
- }
+ }
}