You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/05/16 15:19:08 UTC
svn commit: r1831734 - in /jackrabbit/branches/2.16: ./
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/MixinTest.java
Author: reschke
Date: Wed May 16 15:19:08 2018
New Revision: 1831734
URL: http://svn.apache.org/viewvc?rev=1831734&view=rev
Log:
JCR-4293: jackrabbit-core: observation tests should not rely on mix:lockable mixin type (ported to 2.16)
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/MixinTest.java
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 16 15:19:08 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753
+/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814
Modified: jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/MixinTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/MixinTest.java?rev=1831734&r1=1831733&r2=1831734&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/MixinTest.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/MixinTest.java Wed May 16 15:19:08 2018
@@ -59,12 +59,12 @@ public class MixinTest extends AbstractO
*/
public void testMultipleMixin() throws RepositoryException {
testRootNode.addNode(nodeName1, testNodeType).addMixin(mixReferenceable);
- testRootNode.addNode(nodeName2, testNodeType).addMixin(mixLockable);
+ testRootNode.addNode(nodeName2, testNodeType).addMixin(mixTitle);
testRootNode.addNode(nodeName3, testNodeType).addMixin(mixReferenceable);
testRootNode.save();
EventResult propertyAddedListener = new EventResult(log);
- addEventListener(propertyAddedListener, new String[]{mixReferenceable, mixLockable}, Event.PROPERTY_ADDED);
+ addEventListener(propertyAddedListener, new String[]{mixReferenceable, mixTitle}, Event.PROPERTY_ADDED);
try {
testRootNode.getNode(nodeName1).setProperty(propertyName1, "test");
testRootNode.getNode(nodeName2).setProperty(propertyName1, "test");
@@ -86,10 +86,10 @@ public class MixinTest extends AbstractO
public void testMultipleMixinOnNode() throws RepositoryException {
Node node1 = testRootNode.addNode(nodeName1, testNodeType);
node1.addMixin(mixReferenceable);
- node1.addMixin(mixLockable);
+ node1.addMixin(mixTitle);
Node node2 = testRootNode.addNode(nodeName2, testNodeType);
Node node3 = testRootNode.addNode(nodeName3, testNodeType);
- node3.addMixin(mixLockable);
+ node3.addMixin(mixTitle);
node3.addMixin(mixReferenceable);
testRootNode.save();