[curator] branch master updated: CURATOR-596. tidy test suite settings

[tison]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5e1f28c4 CURATOR-596. tidy test suite settings
5e1f28c4 is described below

commit 5e1f28c4bfdbcf53640a72aac53ff566d359444a
Author: tison <wander4...@gmail.com>
AuthorDate: Thu Jul 14 13:37:14 2022 +0800

    CURATOR-596. tidy test suite settings
    
    Signed-off-by: tison <wander4...@gmail.com>
---
 curator-test-zk35/pom.xml                                     |  2 +-
 .../java/org/apache/curator/framework/TestCompatibility.java  |  3 +++
 .../src/test/java/org/apache/curator/zk35/TestIs35.java       | 11 ++++++++++-
 .../src/test/java/org/apache/curator/zk36/TestIs36.java       |  1 -
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/curator-test-zk35/pom.xml b/curator-test-zk35/pom.xml
index 8a023d97..2e22ac82 100644
--- a/curator-test-zk35/pom.xml
+++ b/curator-test-zk35/pom.xml
@@ -195,7 +195,7 @@
                         
<dependency>org.apache.curator:curator-recipes</dependency>
                     </dependenciesToScan>
                     <groups>zk35TestCompatibility</groups>
-                    <excludedGroups>zk36</excludedGroups>
+                    <excludedGroups>zk36,zk37</excludedGroups>
                 </configuration>
             </plugin>
         </plugins>
diff --git 
a/curator-test-zk35/src/test/java/org/apache/curator/framework/TestCompatibility.java
 
b/curator-test-zk35/src/test/java/org/apache/curator/framework/TestCompatibility.java
index 89f2d292..2a249e08 100644
--- 
a/curator-test-zk35/src/test/java/org/apache/curator/framework/TestCompatibility.java
+++ 
b/curator-test-zk35/src/test/java/org/apache/curator/framework/TestCompatibility.java
@@ -22,11 +22,13 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.apache.curator.retry.RetryOneTime;
 import org.apache.curator.test.compatibility.CuratorTestBase;
 import org.apache.curator.x.async.AsyncCuratorFramework;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 public class TestCompatibility extends CuratorTestBase
 {
     @Test
+    @Tag(zk35TestCompatibilityGroup)
     public void testPersistentWatchesNotAvailable()
     {
         assertThrows(IllegalStateException.class, ()-> {
@@ -38,6 +40,7 @@ public class TestCompatibility extends CuratorTestBase
     }
 
     @Test
+    @Tag(zk35TestCompatibilityGroup)
     public void testPersistentWatchesNotAvailableAsync()
     {
         assertThrows(IllegalStateException.class, ()->{
diff --git 
a/curator-test-zk35/src/test/java/org/apache/curator/zk35/TestIs35.java 
b/curator-test-zk35/src/test/java/org/apache/curator/zk35/TestIs35.java
index 53bcf1bb..acc1ab0b 100644
--- a/curator-test-zk35/src/test/java/org/apache/curator/zk35/TestIs35.java
+++ b/curator-test-zk35/src/test/java/org/apache/curator/zk35/TestIs35.java
@@ -20,17 +20,26 @@ package org.apache.curator.zk35;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.curator.test.compatibility.CuratorTestBase;
 import org.apache.curator.utils.Compatibility;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-public class TestIs35
+public class TestIs35 extends CuratorTestBase
 {
     @Test
+    @Tag(zk35TestCompatibilityGroup)
     public void testIsZk35()
     {
         assertFalse(Compatibility.hasGetReachableOrOneMethod());
         assertTrue(Compatibility.hasAddrField());
         assertFalse(Compatibility.hasPersistentWatchers());
     }
+
+    @Override
+    protected void createServer()
+    {
+        // NOP
+    }
 }
 
diff --git 
a/curator-test-zk36/src/test/java/org/apache/curator/zk36/TestIs36.java 
b/curator-test-zk36/src/test/java/org/apache/curator/zk36/TestIs36.java
index 51888c05..f5d062f9 100644
--- a/curator-test-zk36/src/test/java/org/apache/curator/zk36/TestIs36.java
+++ b/curator-test-zk36/src/test/java/org/apache/curator/zk36/TestIs36.java
@@ -18,7 +18,6 @@
  */
 package org.apache.curator.zk36;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;