HBASE-19914 Refactor TestVisibilityLabelsOnNewVersionBehaviorTable
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cb138c2d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cb138c2d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cb138c2d Branch: refs/heads/HBASE-19397-branch-2 Commit: cb138c2da84079fc639676e465b97b53faa40764 Parents: a323357 Author: zhangduo <zhang...@apache.org> Authored: Sun Feb 4 08:38:46 2018 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Sun Feb 4 13:37:09 2018 +0800 ---------------------------------------------------------------------- .../client/ColumnFamilyDescriptorBuilder.java | 5 + ...sibilityLabelsOnNewVersionBehaviorTable.java | 25 +- ...ibilityLabelsWithDefaultVisLabelService.java | 4 +- .../TestVisibilityLabelsWithDeletes.java | 1478 +++++++----------- .../VisibilityLabelsWithDeletesTestBase.java | 313 ++++ 5 files changed, 887 insertions(+), 938 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/cb138c2d/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java index aaa460b..d7feea6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java @@ -552,6 +552,11 @@ public class ColumnFamilyDescriptorBuilder { return this; } + public ColumnFamilyDescriptorBuilder setNewVersionBehavior(final boolean value) { + desc.setNewVersionBehavior(value); + return this; + } + public ColumnFamilyDescriptorBuilder setValue(final Bytes key, final Bytes value) { desc.setValue(key, value); return this; http://git-wip-us.apache.org/repos/asf/hbase/blob/cb138c2d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java index d3177f9..4093ace 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java @@ -18,30 +18,33 @@ package org.apache.hadoop.hbase.security.visibility; import java.io.IOException; - import org.apache.hadoop.hbase.HBaseClassTestRule; -import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.junit.ClassRule; import org.junit.experimental.categories.Category; -@Category({SecurityTests.class, MediumTests.class}) -public class TestVisibilityLabelsOnNewVersionBehaviorTable extends TestVisibilityLabelsWithDeletes { + +@Category({ SecurityTests.class, MediumTests.class }) +public class TestVisibilityLabelsOnNewVersionBehaviorTable + extends VisibilityLabelsWithDeletesTestBase { + @ClassRule public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestVisibilityLabelsOnNewVersionBehaviorTable.class); @Override - protected Table createTable(HColumnDescriptor fam) throws IOException { - fam.setNewVersionBehavior(true); - TableName tableName = TableName.valueOf(TEST_NAME.getMethodName()); - HTableDescriptor table = new HTableDescriptor(tableName); - table.addFamily(fam); - TEST_UTIL.getHBaseAdmin().createTable(table); + protected Table createTable(byte[] fam) throws IOException { + TableName tableName = TableName.valueOf(testName.getMethodName()); + TEST_UTIL.getAdmin() + .createTable(TableDescriptorBuilder.newBuilder(tableName) + .addColumnFamily( + ColumnFamilyDescriptorBuilder.newBuilder(fam).setNewVersionBehavior(true).build()) + .build()); return TEST_UTIL.getConnection().getTable(tableName); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/cb138c2d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java index fdf665a..9f7df14 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java @@ -114,7 +114,7 @@ public class TestVisibilityLabelsWithDefaultVisLabelService extends TestVisibili SUPERUSER.runAs(action); } - @Test(timeout = 60 * 1000) + @Test public void testAddVisibilityLabelsOnRSRestart() throws Exception { List<RegionServerThread> regionServerThreads = TEST_UTIL.getHBaseCluster() .getRegionServerThreads(); @@ -227,7 +227,7 @@ public class TestVisibilityLabelsWithDefaultVisLabelService extends TestVisibili SUPERUSER.runAs(action); } - @Test(timeout = 60 * 1000) + @Test public void testVisibilityLabelsOnWALReplay() throws Exception { final TableName tableName = TableName.valueOf(TEST_NAME.getMethodName()); try (Table table = createTableAndWriteDataWithLabels(tableName,
