[hbase] branch branch-2.1 updated: HBASE-22382 Refactor tests in TestFromClientSide; ADDENDUM to fix tests

[st...@apache.org]

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

stack pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new fd26716  HBASE-22382 Refactor tests in TestFromClientSide; ADDENDUM to fix tests
fd26716 is described below

commit fd267168d83477e18a3628c4ab460979c22b2c59
Author: stack <st...@apache.org>
AuthorDate: Fri Jul 26 13:27:34 2019 -0700

    HBASE-22382 Refactor tests in TestFromClientSide; ADDENDUM to fix tests
---
 .../test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index fd60da4..599c6cf 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -1162,14 +1162,14 @@ public class TestFromClientSide {
     }
   }
 
-  @Test(expected = IOException.class)
+  @Test(expected = NullPointerException.class)
   public void testNullTableName() throws IOException {
     // Null table name (should NOT work)
     TEST_UTIL.createTable((TableName)null, FAMILY);
     fail("Creating a table with null name passed, should have failed");
   }
 
-  @Test(expected = IOException.class)
+  @Test(expected = IllegalArgumentException.class)
   public void testNullFamilyName() throws IOException {
     final TableName tableName = TableName.valueOf(name.getMethodName());