Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22791 Fixed order of asserts in TestZKMulti 

Signed-off-by: stack <stack@apache.org>
Signed-off-by: Peter Somogyi <psomogyi@apache.org>
This commit is contained in:
Jan Hentschel 2019-08-05 11:36:32 +02:00 committed by GitHub
parent 32434d1200
commit 773414ff53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java
View File

@ -112,7 +112,7 @@ public class TestZKMulti {
LinkedList<ZKUtilOp> singleDelete = new LinkedList<>(); LinkedList<ZKUtilOp> singleDelete = new LinkedList<>();
singleDelete.add(ZKUtilOp.deleteNodeFailSilent(path)); singleDelete.add(ZKUtilOp.deleteNodeFailSilent(path));
ZKUtil.multiOrSequential(zkw, singleDelete, false); ZKUtil.multiOrSequential(zkw, singleDelete, false);
assertEquals(ZKUtil.checkExists(zkw, path), -1); assertEquals(-1, ZKUtil.checkExists(zkw, path));
} }
@Test @Test
@ -151,8 +151,8 @@ public class TestZKMulti {
Bytes.add(Bytes.toBytes(path1), Bytes.toBytes(path1)))); Bytes.add(Bytes.toBytes(path1), Bytes.toBytes(path1))));
assertTrue(Bytes.equals(ZKUtil.getData(zkw, path2), assertTrue(Bytes.equals(ZKUtil.getData(zkw, path2),
Bytes.add(Bytes.toBytes(path2), Bytes.toBytes(path2)))); Bytes.add(Bytes.toBytes(path2), Bytes.toBytes(path2))));
assertEquals(ZKUtil.checkExists(zkw, path3), -1); assertEquals(-1, ZKUtil.checkExists(zkw, path3));
assertEquals(ZKUtil.checkExists(zkw, path4), -1); assertEquals(-1, ZKUtil.checkExists(zkw, path4));
assertTrue(Bytes.equals(ZKUtil.getData(zkw, path5), Bytes.toBytes(path5))); assertTrue(Bytes.equals(ZKUtil.getData(zkw, path5), Bytes.toBytes(path5)));
assertTrue(Bytes.equals(ZKUtil.getData(zkw, path6), Bytes.toBytes(path6))); assertTrue(Bytes.equals(ZKUtil.getData(zkw, path6), Bytes.toBytes(path6)));
} }
@ -213,9 +213,9 @@ public class TestZKMulti {
} }
assertTrue(caughtNoNode); assertTrue(caughtNoNode);
// assert that none of the operations succeeded // assert that none of the operations succeeded
assertEquals(ZKUtil.checkExists(zkw, pathA), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathA));
assertEquals(ZKUtil.checkExists(zkw, pathB), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathB));
assertEquals(ZKUtil.checkExists(zkw, pathC), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathC));
} }
@Test @Test
@ -246,11 +246,11 @@ public class TestZKMulti {
} }
assertTrue(caughtNodeExists); assertTrue(caughtNodeExists);
// check that no modifications were made // check that no modifications were made
assertNotEquals(ZKUtil.checkExists(zkw, pathX), -1); assertNotEquals(-1, ZKUtil.checkExists(zkw, pathX));
assertEquals(ZKUtil.checkExists(zkw, pathY), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathY));
assertEquals(ZKUtil.checkExists(zkw, pathZ), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathZ));
assertEquals(ZKUtil.checkExists(zkw, pathW), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathW));
assertEquals(ZKUtil.checkExists(zkw, pathV), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathV));
// test that with multiple failures, throws an exception corresponding to first failure in list // test that with multiple failures, throws an exception corresponding to first failure in list
ops = new LinkedList<>(); ops = new LinkedList<>();
@ -265,11 +265,11 @@ public class TestZKMulti {
} }
assertTrue(caughtNoNode); assertTrue(caughtNoNode);
// check that no modifications were made // check that no modifications were made
assertNotEquals(ZKUtil.checkExists(zkw, pathX), -1); assertNotEquals(-1, ZKUtil.checkExists(zkw, pathX));
assertEquals(ZKUtil.checkExists(zkw, pathY), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathY));
assertEquals(ZKUtil.checkExists(zkw, pathZ), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathZ));
assertEquals(ZKUtil.checkExists(zkw, pathW), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathW));
assertEquals(ZKUtil.checkExists(zkw, pathV), -1); assertEquals(-1, ZKUtil.checkExists(zkw, pathV));
} }
@Test @Test
@ -296,9 +296,9 @@ public class TestZKMulti {
ZKUtil.multiOrSequential(zkw, ops, true); ZKUtil.multiOrSequential(zkw, ops, true);
assertTrue(Bytes.equals(ZKUtil.getData(zkw, path1), assertTrue(Bytes.equals(ZKUtil.getData(zkw, path1),
Bytes.add(Bytes.toBytes(path1), Bytes.toBytes(path1)))); Bytes.add(Bytes.toBytes(path1), Bytes.toBytes(path1))));
assertEquals(ZKUtil.checkExists(zkw, path2), -1); assertEquals(-1, ZKUtil.checkExists(zkw, path2));
assertEquals(ZKUtil.checkExists(zkw, path3), -1); assertEquals(-1, ZKUtil.checkExists(zkw, path3));
assertNotEquals(ZKUtil.checkExists(zkw, path4), -1); assertNotEquals(-1, ZKUtil.checkExists(zkw, path4));
} }
/** /**
@ -329,7 +329,7 @@ public class TestZKMulti {
createZNodeTree(parentZNode); createZNodeTree(parentZNode);
ZKUtil.deleteNodeRecursively(zkw, parentZNode); ZKUtil.deleteNodeRecursively(zkw, parentZNode);
assertEquals("Parent znode should be deleted.", ZKUtil.checkExists(zkw, parentZNode), -1); assertEquals("Parent znode should be deleted.", -1, ZKUtil.checkExists(zkw, parentZNode));
} }
@Test @Test
@ -343,9 +343,9 @@ public class TestZKMulti {
ZKUtil.deleteNodeRecursivelyMultiOrSequential(zkw, false, parentZNode1, parentZNode2, ZKUtil.deleteNodeRecursivelyMultiOrSequential(zkw, false, parentZNode1, parentZNode2,
parentZNode3); parentZNode3);
assertEquals("Parent znode 1 should be deleted.", ZKUtil.checkExists(zkw, parentZNode1), -1); assertEquals("Parent znode 1 should be deleted.", -1, ZKUtil.checkExists(zkw, parentZNode1));
assertEquals("Parent znode 2 should be deleted.", ZKUtil.checkExists(zkw, parentZNode2), -1); assertEquals("Parent znode 2 should be deleted.", -1, ZKUtil.checkExists(zkw, parentZNode2));
assertEquals("Parent znode 3 should be deleted.", ZKUtil.checkExists(zkw, parentZNode3), -1); assertEquals("Parent znode 3 should be deleted.", -1, ZKUtil.checkExists(zkw, parentZNode3));
} }
@Test @Test