Author: reschke
Date: Fri Jul 12 07:26:53 2019
New Revision: 1862954
URL: http://svn.apache.org/viewvc?rev=1862954&view=rev
Log:
OAK-7472: tests should pass with locking disabled (merged r1831689 into 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-jcr/ (props changed)
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 12 07:26:53 2019
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.8:1844835
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790417,1790502-1790503,1790549,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800609,1800613,1800749,1800756
,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808053,1808125,1808128,1808142,1808240,1808246,1808731,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1810084,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814052,1814189,1814332,1814397,1814475,1815115,1815201,1815438-1815439,1815449,1815458,1815926,1816019,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1819930,1820555,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822642,1822850,1823172,1823655,1824896,1825471,1825654,1826216,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1828529,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830
197,1830239,1830748,1831157,1831190,1831374,1832379,1832535,1833308,1833347,1833702,1833833,1834291,1834312,1834428,1834648-1834649,1834681,1835060,1835521,1835780,1836082,1837057,1837296,1837475,1837547,1837998,1838637,1839570,1839746,1840019,1840024,1840031,1840226,1842677,1843175,1843222,1843231,1843618,1843621,1843905,1843911,1844110,1844549,1844642,1844728,1845135,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846162,1846396,1846617,1847096,1848181-1848182,1848191,1848217,1848822-1848823,1850343,1850837,1853429,1853866,1853870,1854044,1854461,1855032,1855993,1856538,1856818,1857000,1859609,1859612,1859772,1860120,1860548,1861626,1862881
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790417,1790502-1790503,1790549,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800609,1800613,1800749,1800756
,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808053,1808125,1808128,1808142,1808240,1808246,1808731,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1810084,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814052,1814189,1814332,1814397,1814475,1815115,1815201,1815438-1815439,1815449,1815458,1815926,1816019,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1819930,1820555,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822642,1822850,1823172,1823655,1824896,1825471,1825654,1826216,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1828529,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830
197,1830239,1830748,1831157,1831190,1831374,1831689,1832379,1832535,1833308,1833347,1833702,1833833,1834291,1834312,1834428,1834648-1834649,1834681,1835060,1835521,1835780,1836082,1837057,1837296,1837475,1837547,1837998,1838637,1839570,1839746,1840019,1840024,1840031,1840226,1842677,1843175,1843222,1843231,1843618,1843621,1843905,1843911,1844110,1844549,1844642,1844728,1845135,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846162,1846396,1846617,1847096,1848181-1848182,1848191,1848217,1848822-1848823,1850343,1850837,1853429,1853866,1853870,1854044,1854461,1855032,1855993,1856538,1856818,1857000,1859609,1859612,1859772,1860120,1860548,1861626,1862881
/jackrabbit/trunk:1345480
Propchange: jackrabbit/oak/branches/1.6/oak-jcr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 12 07:26:53 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0/oak-jcr:1665962
-/jackrabbit/oak/trunk/oak-jcr:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,1790502-1790503,1792049,1792463,1792483,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249
,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1814189,1814332,1814397,1815201,1815426,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818554,1818576,1818645,1819048,1819050,1821325,1821358,1821495,1821516,1822850,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829987,1830019,1830160,1830170,1833347
+/jackrabbit/oak/trunk/oak-jcr:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,1790502-1790503,1792049,1792463,1792483,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249
,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1814189,1814332,1814397,1815201,1815426,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818554,1818576,1818645,1819048,1819050,1821325,1821358,1821495,1821516,1822850,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829987,1830019,1830160,1830170,1831689,1833347
/jackrabbit/trunk/oak-jcr:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java?rev=1862954&r1=1862953&r2=1862954&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CopyTest.java
Fri Jul 12 07:26:53 2019
@@ -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.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java?rev=1862954&r1=1862953&r2=1862954&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadNodeTypeTest.java
Fri Jul 12 07:26:53 2019
@@ -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.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java?rev=1862954&r1=1862953&r2=1862954&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
Fri Jul 12 07:26:53 2019
@@ -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);
- }
+ }
}
