HBASE-15975 logic in TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c8208994 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c8208994 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c8208994 Branch: refs/heads/0.98 Commit: c8208994b3d796f70ed05d43187994ed98e61ac3 Parents: 9624f3a Author: Matteo Bertozzi <matteo.berto...@cloudera.com> Authored: Wed Jun 8 22:42:07 2016 -0700 Committer: Matteo Bertozzi <matteo.berto...@cloudera.com> Committed: Wed Jun 8 22:50:23 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/TestHTableDescriptor.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c8208994/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java index 80b34b5..778b28e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java @@ -55,35 +55,36 @@ public class TestHTableDescriptor { public void testAddCoprocessorWithSpecStr() throws IOException { HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME); String cpName = "a.b.c.d"; - boolean expected = false; try { htd.addCoprocessorWithSpec(cpName); + fail(); } catch (IllegalArgumentException iae) { - expected = true; + // Expected as cpName is invalid } - if (!expected) fail(); + // Try minimal spec. try { htd.addCoprocessorWithSpec("file:///some/path" + "|" + cpName); + fail(); } catch (IllegalArgumentException iae) { - expected = false; + // Expected to be invalid } - if (expected) fail(); + // Try more spec. String spec = "hdfs:///foo.jar|com.foo.FooRegionObserver|1001|arg1=1,arg2=2"; try { htd.addCoprocessorWithSpec(spec); } catch (IllegalArgumentException iae) { - expected = false; + fail(); } - if (expected) fail(); + // Try double add of same coprocessor try { htd.addCoprocessorWithSpec(spec); + fail(); } catch (IOException ioe) { - expected = true; + // Expect that the coprocessor already exists } - if (!expected) fail(); } @Test
