HBASE-22382 Refactor tests in TestFromClientSide (#385)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
Andor Molnár 2019-07-24 08:08:45 +02:00 committed by Duo Zhang
parent 7ebf80fe1d
commit 542ae47797
1 changed files with 32 additions and 15 deletions

View File

@ -1155,21 +1155,25 @@ public class TestFromClientSide {
}
}
@Test
public void testNull() throws Exception {
@Test(expected = IOException.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)
public void testNullFamilyName() throws IOException {
final TableName tableName = TableName.valueOf(name.getMethodName());
// Null table name (should NOT work)
try {
TEST_UTIL.createTable((TableName)null, FAMILY);
fail("Creating a table with null name passed, should have failed");
} catch(Exception e) {}
// Null family (should NOT work)
try {
TEST_UTIL.createTable(tableName, new byte[][]{null});
fail("Creating a table with a null family passed, should fail");
} catch(Exception e) {}
TEST_UTIL.createTable(tableName, new byte[][]{null});
fail("Creating a table with a null family passed, should fail");
}
@Test
public void testNullRowAndQualifier() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
try (Table ht = TEST_UTIL.createTable(tableName, FAMILY)) {
@ -1201,9 +1205,13 @@ public class TestFromClientSide {
assertEmptyResult(result);
}
}
}
// Use a new table
try (Table ht = TEST_UTIL.createTable(TableName.valueOf(name.getMethodName() + "2"), FAMILY)) {
@Test
public void testNullEmptyQualifier() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
try (Table ht = TEST_UTIL.createTable(tableName, FAMILY)) {
// Empty qualifier, byte[0] instead of null (should work)
try {
@ -1232,9 +1240,16 @@ public class TestFromClientSide {
assertEmptyResult(result);
} catch (Exception e) {
throw new IOException("Using a row with null qualifier threw exception, should ");
throw new IOException("Using a row with null qualifier should not throw exception");
}
}
}
@Test
public void testNullValue() throws IOException {
final TableName tableName = TableName.valueOf(name.getMethodName());
try (Table ht = TEST_UTIL.createTable(tableName, FAMILY)) {
// Null value
try {
Put put = new Put(ROW);
@ -1550,6 +1565,7 @@ public class TestFromClientSide {
}
@Test
@SuppressWarnings("checkstyle:MethodLength")
public void testVersionLimits() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
byte [][] FAMILIES = makeNAscii(FAMILY, 3);
@ -5965,6 +5981,7 @@ public class TestFromClientSide {
}
@Test
@SuppressWarnings("checkstyle:MethodLength")
public void testDeletesWithReverseScan() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
byte[][] ROWS = makeNAscii(ROW, 6);