You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2016/06/09 05:51:36 UTC

[2/6] hbase git commit: HBASE-15975 logic in TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)

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/13d06a2c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/13d06a2c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/13d06a2c

Branch: refs/heads/branch-1
Commit: 13d06a2cc838835b8010804a931e3629cf76bc3a
Parents: 8671503
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Wed Jun 8 22:42:07 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Wed Jun 8 22:44:16 2016 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/TestHTableDescriptor.java       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/13d06a2c/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
index 4d9caae..c09e41b 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
@@ -54,35 +54,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