Author: catholicon
Date: Thu Sep 13 10:15:57 2018
New Revision: 1840797
URL: http://svn.apache.org/viewvc?rev=1840797&view=rev
Log:
OAK-7710: CompositeNodeStore does not dispatch external events to observers
Added another test
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreClusterObservationTest.java
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreClusterObservationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreClusterObservationTest.java?rev=1840797&r1=1840796&r2=1840797&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreClusterObservationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreClusterObservationTest.java
Thu Sep 13 10:15:57 2018
@@ -92,7 +92,37 @@ public class CompositeNodeStoreClusterOb
remote.runBackgroundOperations();
globalStore.runBackgroundOperations();
- assertTrue("Node added event not observed for local change",
observer.added.containsKey("/test"));
+ assertTrue("Node added event not observed for remote change",
observer.added.containsKey("/test"));
+ }
+
+ @Test
+ public void mixedObservation() throws CommitFailedException {
+ store.addObserver(observer);
+
+ NodeBuilder builder = store.getRoot().builder();
+ builder.child("test").child("test1").setProperty("foo", "bar");
+ merge(store, builder);
+
+ // public local changes
+ globalStore.runBackgroundOperations();
+ remote.runBackgroundOperations();
+
+ builder = remote.getRoot().builder();
+ builder.getChildNode("test").child("test2").setProperty("foo", "bar");
+ merge(remote, builder);
+
+ // read in remote changes
+ remote.runBackgroundOperations();
+ globalStore.runBackgroundOperations();
+
+ builder = store.getRoot().builder();
+ builder.getChildNode("test").child("test3").setProperty("foo", "bar");
+ merge(store, builder);
+
+ assertTrue("Node added event not observed for local change before
remote change", observer.added.containsKey("/test"));
+ assertTrue("Node added event not observed for local change before
remote change", observer.added.containsKey("/test/test1"));
+ assertTrue("Node added event not observed for remote change",
observer.added.containsKey("/test/test2"));
+ assertTrue("Node added event not observed for local change after
remote change", observer.added.containsKey("/test/test3"));
}
private static void merge(NodeStore store, NodeBuilder builder)
