[zookeeper] branch master updated: hotfix: Fix testSamePathWithDifferentWatchModes compilation failure (#2012)

[andor]

This is an automated email from the ASF dual-hosted git repository.

andor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new ca892861f hotfix: Fix testSamePathWithDifferentWatchModes compilation 
failure (#2012)
ca892861f is described below

commit ca892861fc2d13d1ccdfba7b19f65e7b87e1bf71
Author: Kezhu Wang <kez...@gmail.com>
AuthorDate: Fri Jun 16 21:59:26 2023 +0800

    hotfix: Fix testSamePathWithDifferentWatchModes compilation failure (#2012)
    
    PR #1950(ZOOKEEPER-4655) was created before #1859(ZOOKEEPER-4466) merged.
    It changes `assertEvent`'s signature which is depended by #1859.
---
 .../test/PersistentRecursiveWatcherTest.java       | 43 ++++++++++++----------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git 
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/PersistentRecursiveWatcherTest.java
 
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/PersistentRecursiveWatcherTest.java
index 440485e66..be8b90e61 100644
--- 
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/PersistentRecursiveWatcherTest.java
+++ 
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/PersistentRecursiveWatcherTest.java
@@ -194,38 +194,41 @@ public class PersistentRecursiveWatcherTest extends 
ClientBase {
             zk.addWatch("/a", recursiveEvents::add, PERSISTENT_RECURSIVE);
             zk.exists("/a", dataEvents::add);
 
-            zk.create("/a", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, 
CreateMode.PERSISTENT);
-            assertEvent(dataEvents, Watcher.Event.EventType.NodeCreated, "/a");
-            assertEvent(persistentEvents, Watcher.Event.EventType.NodeCreated, 
"/a");
-            assertEvent(recursiveEvents, Watcher.Event.EventType.NodeCreated, 
"/a");
+            Stat stat = new Stat();
+            zk.create("/a", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, 
CreateMode.PERSISTENT, stat);
+            assertEvent(dataEvents, Watcher.Event.EventType.NodeCreated, "/a", 
stat);
+            assertEvent(persistentEvents, Watcher.Event.EventType.NodeCreated, 
"/a", stat);
+            assertEvent(recursiveEvents, Watcher.Event.EventType.NodeCreated, 
"/a", stat);
 
             zk.getData("/a", dataEvents::add, null);
-            zk.setData("/a", new byte[0], -1);
-            assertEvent(dataEvents, Watcher.Event.EventType.NodeDataChanged, 
"/a");
-            assertEvent(persistentEvents, 
Watcher.Event.EventType.NodeDataChanged, "/a");
-            assertEvent(recursiveEvents, 
Watcher.Event.EventType.NodeDataChanged, "/a");
+            stat = zk.setData("/a", new byte[0], -1);
+            assertEvent(dataEvents, Watcher.Event.EventType.NodeDataChanged, 
"/a", stat);
+            assertEvent(persistentEvents, 
Watcher.Event.EventType.NodeDataChanged, "/a", stat);
+            assertEvent(recursiveEvents, 
Watcher.Event.EventType.NodeDataChanged, "/a", stat);
 
             zk.getChildren("/a", childEvents::add);
-            zk.create("/a/b", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, 
CreateMode.PERSISTENT);
-            assertEvent(childEvents, 
Watcher.Event.EventType.NodeChildrenChanged, "/a");
-            assertEvent(persistentEvents, 
Watcher.Event.EventType.NodeChildrenChanged, "/a");
-            assertEvent(recursiveEvents, Watcher.Event.EventType.NodeCreated, 
"/a/b");
+            zk.create("/a/b", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, 
CreateMode.PERSISTENT, stat);
+            assertEvent(childEvents, 
Watcher.Event.EventType.NodeChildrenChanged, "/a", stat);
+            assertEvent(persistentEvents, 
Watcher.Event.EventType.NodeChildrenChanged, "/a", stat);
+            assertEvent(recursiveEvents, Watcher.Event.EventType.NodeCreated, 
"/a/b", stat);
 
             zk.getChildren("/a", childEvents::add);
             zk.delete("/a/b", -1);
-            assertEvent(childEvents, 
Watcher.Event.EventType.NodeChildrenChanged, "/a");
-            assertEvent(persistentEvents, 
Watcher.Event.EventType.NodeChildrenChanged, "/a");
-            assertEvent(recursiveEvents, Watcher.Event.EventType.NodeDeleted, 
"/a/b");
+            stat = zk.exists("/a", false);
+            assertEvent(childEvents, 
Watcher.Event.EventType.NodeChildrenChanged, "/a", stat.getPzxid());
+            assertEvent(persistentEvents, 
Watcher.Event.EventType.NodeChildrenChanged, "/a", stat.getPzxid());
+            assertEvent(recursiveEvents, Watcher.Event.EventType.NodeDeleted, 
"/a/b", stat.getPzxid());
 
             zk.getChildren("/a", childEvents::add);
             zk.getData("/a", dataEvents::add, null);
             zk.exists("/a", dataEvents::add);
             zk.delete("/a", -1);
-            assertEvent(childEvents, Watcher.Event.EventType.NodeDeleted, 
"/a");
-            assertEvent(dataEvents, Watcher.Event.EventType.NodeDeleted, "/a");
-            assertEvent(dataEvents, Watcher.Event.EventType.NodeDeleted, "/a");
-            assertEvent(persistentEvents, Watcher.Event.EventType.NodeDeleted, 
"/a");
-            assertEvent(recursiveEvents, Watcher.Event.EventType.NodeDeleted, 
"/a");
+            stat = zk.exists("/", false);
+            assertEvent(childEvents, Watcher.Event.EventType.NodeDeleted, 
"/a", stat.getPzxid());
+            assertEvent(dataEvents, Watcher.Event.EventType.NodeDeleted, "/a", 
stat.getPzxid());
+            assertEvent(dataEvents, Watcher.Event.EventType.NodeDeleted, "/a", 
stat.getPzxid());
+            assertEvent(persistentEvents, Watcher.Event.EventType.NodeDeleted, 
"/a", stat.getPzxid());
+            assertEvent(recursiveEvents, Watcher.Event.EventType.NodeDeleted, 
"/a", stat.getPzxid());
         }
     }