Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Michael Stack 2018-01-31 14:18:20 -08:00
parent 4b3b627abe
commit 60827fc1ea
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/MajorCompactionRequestTest.java → hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactionRequest.java
View File

@ -1,4 +1,4 @@
/** /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information * distributed with this work for additional information
@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.hadoop.hbase.util.compaction; package org.apache.hadoop.hbase.util.compaction;
import java.io.IOException; 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.FileStatus;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Connection; 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.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Before; import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
@ -58,7 +59,10 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@Category({SmallTests.class}) @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 HBaseTestingUtility UTILITY = new HBaseTestingUtility();
private static final String FAMILY = "a"; private static final String FAMILY = "a";
@ -66,7 +70,7 @@ public class MajorCompactionRequestTest {
private Path regionStoreDir; private Path regionStoreDir;
@Before public void setUp() throws Exception { @Before public void setUp() throws Exception {
rootRegionDir = UTILITY.getDataTestDirOnTestFS("MajorCompactionRequestTest"); rootRegionDir = UTILITY.getDataTestDirOnTestFS("TestMajorCompactionRequest");
regionStoreDir = new Path(rootRegionDir, FAMILY); regionStoreDir = new Path(rootRegionDir, FAMILY);
} }
@ -88,7 +92,7 @@ public class MajorCompactionRequestTest {
@Test public void testIfWeHaveNewReferenceFilesButOldStoreFiles() throws Exception { @Test public void testIfWeHaveNewReferenceFilesButOldStoreFiles() throws Exception {
// this tests that reference files that are new, but have older timestamps for the files // this tests that reference files that are new, but have older timestamps for the files
// they reference still will get compacted. // they reference still will get compacted.
TableName table = TableName.valueOf("MajorCompactorTest"); TableName table = TableName.valueOf("TestMajorCompactor");
TableDescriptor htd = UTILITY.createTableDescriptor(table, Bytes.toBytes(FAMILY)); TableDescriptor htd = UTILITY.createTableDescriptor(table, Bytes.toBytes(FAMILY));
RegionInfo hri = RegionInfoBuilder.newBuilder(htd.getTableName()).build(); RegionInfo hri = RegionInfoBuilder.newBuilder(htd.getTableName()).build();
HRegion region = HRegion region =

11
hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/MajorCompactorTest.java → hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactor.java
View File

@ -1,4 +1,4 @@
/** /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information * distributed with this work for additional information
@ -17,6 +17,7 @@
*/ */
package org.apache.hadoop.hbase.util.compaction; package org.apache.hadoop.hbase.util.compaction;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Connection; 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.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Before; import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@Category({ MiscTests.class, MediumTests.class }) @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"); public static final byte[] FAMILY = Bytes.toBytes("a");
private HBaseTestingUtility utility; private HBaseTestingUtility utility;
@ -50,7 +55,7 @@ public class MajorCompactorTest {
} }
@Test public void testCompactingATable() throws Exception { @Test public void testCompactingATable() throws Exception {
TableName tableName = TableName.valueOf("MajorCompactorTest"); TableName tableName = TableName.valueOf("TestMajorCompactor");
utility.createMultiRegionTable(tableName, FAMILY, 5); utility.createMultiRegionTable(tableName, FAMILY, 5);
utility.waitTableAvailable(tableName); utility.waitTableAvailable(tableName);
Connection connection = utility.getConnection(); Connection connection = utility.getConnection();