From d88d7968e7ad40d56cb7d6a9d414ce0ab21d86f7 Mon Sep 17 00:00:00 2001 From: Matteo Coni Date: Tue, 20 Feb 2024 21:38:17 +0100 Subject: [PATCH] Final Clean --- .../zookeeper/common/PathUtilsTest.java | 2 -- .../server/CreateNodeDataTreeTest.java | 8 ++--- .../server/CreateNodeInvalidPathTest.java | 33 ------------------- .../server/DeleteNodeDataTreeTest.java | 2 +- 4 files changed, 3 insertions(+), 42 deletions(-) diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/common/PathUtilsTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/common/PathUtilsTest.java index bd310fe5381..6f39361a72a 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/common/PathUtilsTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/common/PathUtilsTest.java @@ -83,8 +83,6 @@ public void ValidPathTest(){ Assert.assertNotNull(error); } - //Assert.assertNull(error); - } } \ No newline at end of file diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateNodeDataTreeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateNodeDataTreeTest.java index 2486ab3ae90..824f90951d4 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateNodeDataTreeTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateNodeDataTreeTest.java @@ -3,15 +3,11 @@ import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.data.ACL; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.jupiter.api.BeforeAll; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -121,7 +117,7 @@ public void createNodeTest(){ } catch (KeeperException.NoNodeException | KeeperException.NodeExistsException e) { - //throw new RuntimeException(e); + e.printStackTrace(); error = e; Assert.assertNotNull(error); @@ -140,7 +136,7 @@ public void createNodeExistingTest(){ try{ System.out.println("\n"+ this.path + "\n"); - //gia esiste + //gia esistente this.dataTree.createNode(this.path, this.data, this.acl, this.ephemeralOwner, this.parentCVersion, this.zxid, this.time); this.dataTree.createNode(this.path, this.data, this.acl, this.ephemeralOwner, this.parentCVersion, this.zxid, this.time); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateNodeInvalidPathTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateNodeInvalidPathTest.java index b0766c1a177..f40b99edd86 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateNodeInvalidPathTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateNodeInvalidPathTest.java @@ -4,16 +4,12 @@ import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.data.ACL; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - import java.util.Arrays; import java.util.Collection; import java.util.List; - -import static org.junit.Assert.*; @RunWith(Parameterized.class) public class CreateNodeInvalidPathTest { @@ -41,35 +37,6 @@ public CreateNodeInvalidPathTest(String path, byte[] data, List acl, long e //l'inizializzazione del dataTree manca per realizzare il path invalido } - /*@Before - public void setUpTree() { - - if(path != null) { - - try { - - String[] pathElements = path.split("/"); - - System.out.println(Arrays.toString(pathElements)); - String oldPath = ""; - int i = 1; - for (String elem : pathElements) { - System.out.println(pathElements.length + " i: " + i); - if (!(pathElements.length == i || i == 1)) { - - System.out.println(oldPath + "/" + pathElements[i - 1]); - this.dataTree.createNode(oldPath + "/" + pathElements[i - 1], new byte[10], ZooDefs.Ids.CREATOR_ALL_ACL, 0, dataTree.getNode(oldPath).stat.getCversion(), 0, 1); - oldPath = oldPath + "/" + pathElements[i - 1]; - - } - i++; - } - } catch (Exception e) { - e.printStackTrace(); - - } - } - }*/ @Parameterized.Parameters public static Collection getParameters() { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/DeleteNodeDataTreeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/DeleteNodeDataTreeTest.java index a91f9ab47b3..4320de4f24e 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/DeleteNodeDataTreeTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/DeleteNodeDataTreeTest.java @@ -182,7 +182,7 @@ public void deleteNodeTest(){ } - @Test //prova miglioramento Container + @Test // miglioramento Container public void deleteNodeContTest(){ Exception error;