Skip to content

HBASE-30123 Upgrade hbase-server to use junit5 Part13 (#8153) (#8176) #8224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Apache9 wants to merge 1 commit into
base: branch-2.6
Choose a base branch
from
+1,477 −1,868
Open

HBASE-30123 Upgrade hbase-server to use junit5 Part13 (#8153) (#8176) #8224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ tmp
**/.flattened-pom.xml
.vscode/
**/__pycache__
.opencode
4 changes: 4 additions & 0 deletions hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseParameterizedParameterResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ public boolean supportsParameter(ParameterContext pc, ExtensionContext ec)
// test with wrapper type, otherwise it will always return false
return Primitives.wrap(expectedType).isAssignableFrom(value.getClass());
}
// non-primitive type can accept null value
if (value == null) {
return true;
}
return expectedType.isAssignableFrom(value.getClass());
}

Expand Down
16 changes: 6 additions & 10 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestByteBufferOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,20 @@
*/
package org.apache.hadoop.hbase.io;

import static org.junit.Assert.*;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

@Category(SmallTests.class)
@Tag(SmallTests.TAG)
@Tag(MiscTests.TAG)
public class TestByteBufferOutputStream {

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestByteBufferOutputStream.class);

@Test
public void testByteBufferReuse() throws IOException {
byte[] someBytes = Bytes.toBytes("some bytes");
Expand Down
16 changes: 6 additions & 10 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestFSDataInputStreamWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hbase.io;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -33,20 +33,16 @@
import org.apache.hadoop.fs.HasEnhancedByteBufferAccess;
import org.apache.hadoop.fs.ReadOption;
import org.apache.hadoop.fs.StreamCapabilities;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.io.ByteBufferPool;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.Tag;

@Category(SmallTests.class)
@Tag(SmallTests.TAG)
@Tag(MiscTests.TAG)
public class TestFSDataInputStreamWrapper {

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestFSDataInputStreamWrapper.class);

@Test
public void testUnbuffer() throws Exception {
InputStream pc = new ParentClass();
Expand Down
28 changes: 13 additions & 15 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestFileLink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
*/
package org.apache.hadoop.hbase.io;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.FileNotFoundException;
import java.io.IOException;
Expand All @@ -31,7 +32,6 @@
import org.apache.hadoop.fs.FSDataOutputStream;
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.testclassification.IOTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
Expand All @@ -40,21 +40,17 @@
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.client.HdfsDataInputStream;
import org.apache.hadoop.ipc.RemoteException;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

/**
* Test that FileLink switches between alternate locations when the current location moves or gets
* deleted.
*/
@Category({ IOTests.class, MediumTests.class })
@Tag(IOTests.TAG)
@Tag(MediumTests.TAG)
public class TestFileLink {

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestFileLink.class);

@Test
public void testEquals() {
Path p1 = new Path("/p1");
Expand Down Expand Up @@ -160,7 +156,7 @@ public Configuration getConf() {
}
}

@Test(expected = FileNotFoundException.class)
@Test
public void testLinkReadWithMissingFile() throws Exception {
HBaseTestingUtility testUtil = new HBaseTestingUtility();
FileSystem fs = new MyDistributedFileSystem();
Expand All @@ -173,7 +169,9 @@ public void testLinkReadWithMissingFile() throws Exception {
files.add(archivedPath);

FileLink link = new FileLink(files);
link.open(fs);
assertThrows(FileNotFoundException.class, () -> {
link.open(fs);
});
}

/**
Expand Down
76 changes: 32 additions & 44 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,88 +17,78 @@
*/
package org.apache.hadoop.hbase.io;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.regex.Matcher;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.testclassification.IOTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.CommonFSUtils;
import org.apache.hadoop.hbase.util.Pair;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;

/**
* Test that FileLink switches between alternate locations when the current location moves or gets
* deleted.
*/
@Category({ IOTests.class, SmallTests.class })
@Tag(IOTests.TAG)
@Tag(SmallTests.TAG)
public class TestHFileLink {

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestHFileLink.class);

@Rule
public TestName name = new TestName();

@Test
public void testValidLinkNames() {
public void testValidLinkNames(TestInfo testInfo) {
String validLinkNames[] = { "foo=fefefe-0123456", "ns=foo=abababa-fefefefe" };

for (String name : validLinkNames) {
Assert.assertTrue("Failed validating:" + name, name.matches(HFileLink.LINK_NAME_REGEX));
assertTrue(name.matches(HFileLink.LINK_NAME_REGEX), "Failed validating:" + name);
}

for (String name : validLinkNames) {
Assert.assertTrue("Failed validating:" + name, HFileLink.isHFileLink(name));
assertTrue(HFileLink.isHFileLink(name), "Failed validating:" + name);
}

String testName = name.getMethodName() + "=fefefe-0123456";
Assert.assertEquals(TableName.valueOf(name.getMethodName()),
String testName = testInfo.getTestMethod().get().getName() + "=fefefe-0123456";
assertEquals(TableName.valueOf(testInfo.getTestMethod().get().getName()),
HFileLink.getReferencedTableName(testName));
Assert.assertEquals("fefefe", HFileLink.getReferencedRegionName(testName));
Assert.assertEquals("0123456", HFileLink.getReferencedHFileName(testName));
Assert.assertEquals(testName,
HFileLink.createHFileLinkName(TableName.valueOf(name.getMethodName()), "fefefe", "0123456"));
assertEquals("fefefe", HFileLink.getReferencedRegionName(testName));
assertEquals("0123456", HFileLink.getReferencedHFileName(testName));
assertEquals(testName, HFileLink.createHFileLinkName(
TableName.valueOf(testInfo.getTestMethod().get().getName()), "fefefe", "0123456"));

testName = "ns=" + name.getMethodName() + "=fefefe-0123456";
Assert.assertEquals(TableName.valueOf("ns", name.getMethodName()),
testName = "ns=" + testInfo.getTestMethod().get().getName() + "=fefefe-0123456";
assertEquals(TableName.valueOf("ns", testInfo.getTestMethod().get().getName()),
HFileLink.getReferencedTableName(testName));
Assert.assertEquals("fefefe", HFileLink.getReferencedRegionName(testName));
Assert.assertEquals("0123456", HFileLink.getReferencedHFileName(testName));
Assert.assertEquals(testName, HFileLink
.createHFileLinkName(TableName.valueOf("ns", name.getMethodName()), "fefefe", "0123456"));
assertEquals("fefefe", HFileLink.getReferencedRegionName(testName));
assertEquals("0123456", HFileLink.getReferencedHFileName(testName));
assertEquals(testName, HFileLink.createHFileLinkName(
TableName.valueOf("ns", testInfo.getTestMethod().get().getName()), "fefefe", "0123456"));

for (String name : validLinkNames) {
Matcher m = HFileLink.LINK_NAME_PATTERN.matcher(name);
assertTrue(m.matches());
Assert.assertEquals(HFileLink.getReferencedTableName(name),
assertEquals(HFileLink.getReferencedTableName(name),
TableName.valueOf(m.group(1), m.group(2)));
Assert.assertEquals(HFileLink.getReferencedRegionName(name), m.group(3));
Assert.assertEquals(HFileLink.getReferencedHFileName(name), m.group(4));
assertEquals(HFileLink.getReferencedRegionName(name), m.group(3));
assertEquals(HFileLink.getReferencedHFileName(name), m.group(4));
}
}

@Test
public void testBackReference() {
public void testBackReference(TestInfo testInfo) {
Path rootDir = new Path("/root");
Path archiveDir = new Path(rootDir, ".archive");
String storeFileName = "121212";
String linkDir = FileLink.BACK_REFERENCES_DIRECTORY_PREFIX + storeFileName;
String encodedRegion = "FEFE";
String cf = "cf1";

TableName refTables[] =
{ TableName.valueOf(name.getMethodName()), TableName.valueOf("ns", name.getMethodName()) };
TableName refTables[] = { TableName.valueOf(testInfo.getTestMethod().get().getName()),
TableName.valueOf("ns", testInfo.getTestMethod().get().getName()) };

for (TableName refTable : refTables) {
Path refTableDir = CommonFSUtils.getTableDir(archiveDir, refTable);
Expand All @@ -108,28 +98,26 @@ public void testBackReference() {
String refStoreFileName = refTable.getNameAsString().replace(TableName.NAMESPACE_DELIM, '=')
+ "=" + encodedRegion + "-" + storeFileName;

TableName tableNames[] = { TableName.valueOf(name.getMethodName() + "1"),
TableName.valueOf("ns", name.getMethodName() + "2"),
TableName.valueOf(name.getMethodName() + ":" + name.getMethodName()) };
TableName tableNames[] = { TableName.valueOf(testInfo.getTestMethod().get().getName() + "1"),
TableName.valueOf("ns", testInfo.getTestMethod().get().getName() + "2"),
TableName.valueOf(testInfo.getTestMethod().get().getName() + ":"
+ testInfo.getTestMethod().get().getName()) };

for (TableName tableName : tableNames) {
Path tableDir = CommonFSUtils.getTableDir(rootDir, tableName);
Path regionDir = HRegion.getRegionDir(tableDir, encodedRegion);
Path cfDir = new Path(regionDir, cf);

// Verify back reference creation
assertEquals(
encodedRegion + "." + tableName.getNameAsString().replace(TableName.NAMESPACE_DELIM, '='),
HFileLink.createBackReferenceName(CommonFSUtils.getTableName(tableDir).getNameAsString(),
encodedRegion));

// verify parsing back reference
Pair<TableName, String> parsedRef = HFileLink.parseBackReferenceName(encodedRegion + "."
+ tableName.getNameAsString().replace(TableName.NAMESPACE_DELIM, '='));
assertEquals(parsedRef.getFirst(), tableName);
assertEquals(encodedRegion, parsedRef.getSecond());

// verify resolving back reference
Path storeFileDir = new Path(refLinkDir, encodedRegion + "."
+ tableName.getNameAsString().replace(TableName.NAMESPACE_DELIM, '='));
Path linkPath = new Path(cfDir, refStoreFileName);
Expand Down
Loading
Loading