HBASE-22382 Refactor tests in TestFromClientSide; ADDENDUM to fix tests

saintstack · Apache9 · commit a76855f0206c · 2019-08-10T09:35:29.000+08:00
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
@@ -1162,14 +1162,14 @@ public void testSingleRowMultipleFamily() throws Exception {
 
   }
 
-  @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());
 

Original file line number	Diff line number	Diff line change
`@@ -1162,14 +1162,14 @@ public void testSingleRowMultipleFamily() throws Exception {`
`1162`	`1162`
`1163`	`1163`	`}`
`1164`	`1164`
`1165`		`- @Test(expected = IOException.class)`
	`1165`	`+ @Test(expected = NullPointerException.class)`
`1166`	`1166`	`public void testNullTableName() throws IOException {`
`1167`	`1167`	`// Null table name (should NOT work)`
`1168`	`1168`	`TEST_UTIL.createTable((TableName)null, FAMILY);`
`1169`	`1169`	`fail("Creating a table with null name passed, should have failed");`
`1170`	`1170`	`}`
`1171`	`1171`
`1172`		`- @Test(expected = IOException.class)`
	`1172`	`+ @Test(expected = IllegalArgumentException.class)`
`1173`	`1173`	`public void testNullFamilyName() throws IOException {`
`1174`	`1174`	`final TableName tableName = TableName.valueOf(name.getMethodName());`
`1175`	`1175`