From 60827fc1ea93ce3c93ea9b86e618e419babed42f Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Wed, 31 Jan 2018 14:18:20 -0800 Subject: [PATCH] HBASE-19528 Major Compaction Tool; ADDENDUM Add @ClassRule to new tests and rename those added here so they align w/ how we name other Test classes. --- ...ionRequestTest.java => TestMajorCompactionRequest.java} | 14 +++++++++----- .../{MajorCompactorTest.java => TestMajorCompactor.java} | 11 ++++++++--- 2 files changed, 17 insertions(+), 8 deletions(-) rename hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/{MajorCompactionRequestTest.java => TestMajorCompactionRequest.java} (95%) rename hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/{MajorCompactorTest.java => TestMajorCompactor.java} (91%) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/MajorCompactionRequestTest.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactionRequest.java similarity index 95% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/MajorCompactionRequestTest.java rename to hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactionRequest.java index c5ce4e3733..b62648189a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/MajorCompactionRequestTest.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactionRequest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.util.compaction; import java.io.IOException; @@ -28,6 +27,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Connection; @@ -46,6 +46,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import static org.mockito.ArgumentMatchers.any; @@ -58,7 +59,10 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @Category({SmallTests.class}) -public class MajorCompactionRequestTest { +public class TestMajorCompactionRequest { + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestMajorCompactionRequest.class); private static final HBaseTestingUtility UTILITY = new HBaseTestingUtility(); private static final String FAMILY = "a"; @@ -66,7 +70,7 @@ public class MajorCompactionRequestTest { private Path regionStoreDir; @Before public void setUp() throws Exception { - rootRegionDir = UTILITY.getDataTestDirOnTestFS("MajorCompactionRequestTest"); + rootRegionDir = UTILITY.getDataTestDirOnTestFS("TestMajorCompactionRequest"); regionStoreDir = new Path(rootRegionDir, FAMILY); } @@ -88,7 +92,7 @@ public class MajorCompactionRequestTest { @Test public void testIfWeHaveNewReferenceFilesButOldStoreFiles() throws Exception { // this tests that reference files that are new, but have older timestamps for the files // they reference still will get compacted. - TableName table = TableName.valueOf("MajorCompactorTest"); + TableName table = TableName.valueOf("TestMajorCompactor"); TableDescriptor htd = UTILITY.createTableDescriptor(table, Bytes.toBytes(FAMILY)); RegionInfo hri = RegionInfoBuilder.newBuilder(htd.getTableName()).build(); HRegion region = diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/MajorCompactorTest.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactor.java similarity index 91% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/MajorCompactorTest.java rename to hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactor.java index 3fb37ec852..ccf01462bd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/MajorCompactorTest.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hbase.util.compaction; +import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Connection; @@ -29,12 +30,16 @@ import org.junit.After; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; @Category({ MiscTests.class, MediumTests.class }) -public class MajorCompactorTest { +public class TestMajorCompactor { + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestMajorCompactor.class); public static final byte[] FAMILY = Bytes.toBytes("a"); private HBaseTestingUtility utility; @@ -50,7 +55,7 @@ public class MajorCompactorTest { } @Test public void testCompactingATable() throws Exception { - TableName tableName = TableName.valueOf("MajorCompactorTest"); + TableName tableName = TableName.valueOf("TestMajorCompactor"); utility.createMultiRegionTable(tableName, FAMILY, 5); utility.waitTableAvailable(tableName); Connection connection = utility.getConnection(); -- 2.11.0 (Apple Git-81)