Author: mreutegg
Date: Wed Apr 13 07:41:21 2016
New Revision: 1738903
URL: http://svn.apache.org/viewvc?rev=1738903&view=rev
Log:
OAK-3858: Review slow running tests
Fix and speed up ObservationTest
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ObservationTest.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ObservationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ObservationTest.java?rev=1738903&r1=1738902&r2=1738903&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ObservationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ObservationTest.java
Wed Apr 13 07:41:21 2016
@@ -38,16 +38,16 @@ public class ObservationTest extends Abs
ObservationManager obsMgr =
testSession.getWorkspace().getObservationManager();
EventResult listener = new EventResult(this.log);
try {
- obsMgr.addEventListener(listener, Event.NODE_REMOVED, path, true,
new String[0], new String[0], true);
+ obsMgr.addEventListener(listener, Event.NODE_REMOVED, testRoot,
true, null, null, true);
- // superuser removes the node with childNPath in order to provoke
- // events being generated
+ // superuser removes the node with childNPath & siblingPath in
+ // order to provoke events being generated
superuser.getItem(childNPath).remove();
+ superuser.getItem(siblingPath).remove();
superuser.save();
- obsMgr.removeEventListener(listener);
// since the testUser does not have read-permission on the removed
- // node, no corresponding event must be generated.
+ // childNPath, no corresponding event must be generated.
Event[] evts = listener.getEvents(DEFAULT_WAIT_TIMEOUT);
for (Event evt : evts) {
if (evt.getType() == Event.NODE_REMOVED &&
