Skip to content

HADOOP-19412. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-huaweicloud. #7639

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

Merged
slfan1989 merged 2 commits into from
Apr 23, 2025
Merged

HADOOP-19412. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-huaweicloud. #7639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16ab57d
HADOOP-19412. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-huaweicloud.
slfan1989 Apr 21, 2025
c2d2a6c
HADOOP-19412. Fix CheckStyle.
slfan1989 Apr 21, 2025
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
21 changes: 11 additions & 10 deletions ...ct/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFSMainOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@

package org.apache.hadoop.fs.obs;

import static org.junit.jupiter.api.Assumptions.assumeTrue;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.TestFSMainOperationsLocalFileSystem;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;

/**
* <p>
Expand All @@ -46,7 +47,7 @@ public class TestOBSFSMainOperations extends
TestFSMainOperationsLocalFileSystem {

@Override
@Before
@BeforeEach
public void setUp() throws Exception {
skipTestCheck();
Configuration conf = new Configuration();
Expand All @@ -56,17 +57,17 @@ public void setUp() throws Exception {

@Override
public void testWorkingDirectory() {
Assume.assumeTrue("unspport.", false);
assumeTrue(false, "unspport.");
}

@Override
public void testListStatusThrowsExceptionForUnreadableDir() {
Assume.assumeTrue("unspport.", false);
assumeTrue(false, "unspport.");
}

@Override
public void testRenameDirectoryToItself() {
Assume.assumeTrue("unspport.", false);
assumeTrue(false, "unspport.");
}

@Override
Expand All @@ -76,18 +77,18 @@ public void testGlobStatusThrowsExceptionForUnreadableDir() {

@Override
public void testRenameFileToItself() {
Assume.assumeTrue("unspport.", false);
assumeTrue(false, "unspport.");
}

@Override
@After
@AfterEach
public void tearDown() throws Exception {
if(fSys != null) {
super.tearDown();
}
}

public void skipTestCheck() {
Assume.assumeTrue(OBSContract.isContractTestEnabled());
assumeTrue(OBSContract.isContractTestEnabled());
}
}
11 changes: 6 additions & 5 deletions ...oop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextCreateMkdir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,30 @@

package org.apache.hadoop.fs.obs;

import static org.junit.jupiter.api.Assumptions.assumeTrue;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.DelegateToFileSystem;
import org.apache.hadoop.fs.FileContext;
import org.apache.hadoop.fs.FileContextCreateMkdirBaseTest;
import org.apache.hadoop.fs.FileContextTestHelper;
import org.apache.hadoop.fs.FileSystem;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.jupiter.api.BeforeAll;

import java.net.URI;
import java.util.UUID;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import edu.umd.cs.findbugs.annotation.SuppressFBWarnings;

/**
* File context create mkdir test cases on obs file system.
*/
public class TestOBSFileContextCreateMkdir extends
FileContextCreateMkdirBaseTest {

@BeforeClass
@BeforeAll
public static void skipTestCheck() {
Assume.assumeTrue(OBSContract.isContractTestEnabled());
assumeTrue(OBSContract.isContractTestEnabled());
}


Expand Down
15 changes: 8 additions & 7 deletions ...-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextMainOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@

package org.apache.hadoop.fs.obs;

import static org.junit.jupiter.api.Assumptions.assumeTrue;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.DelegateToFileSystem;
import org.apache.hadoop.fs.FileContext;
import org.apache.hadoop.fs.FileContextMainOperationsBaseTest;
import org.apache.hadoop.fs.FileSystem;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import java.net.URI;

Expand All @@ -35,9 +36,9 @@
public class TestOBSFileContextMainOperations extends
FileContextMainOperationsBaseTest {

@BeforeClass
@BeforeAll
public static void skipTestCheck() {
Assume.assumeTrue(OBSContract.isContractTestEnabled());
assumeTrue(OBSContract.isContractTestEnabled());
}

@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
Expand Down Expand Up @@ -67,11 +68,11 @@ protected boolean listCorruptedBlocksSupported() {
@Override
@Test
public void testSetVerifyChecksum() {
Assume.assumeTrue("unsupport.", false);
assumeTrue(false, "unsupport.");
}

@Override
public void testMkdirsFailsForSubdirectoryOfExistingFile() {
Assume.assumeTrue("unsupport.", false);
assumeTrue(false, "unsupport.");
}
}
13 changes: 7 additions & 6 deletions ...ject/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextURI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@

package org.apache.hadoop.fs.obs;

import static org.junit.jupiter.api.Assumptions.assumeTrue;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.DelegateToFileSystem;
import org.apache.hadoop.fs.FileContext;
import org.apache.hadoop.fs.FileContextURIBase;
import org.apache.hadoop.fs.FileSystem;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.jupiter.api.BeforeAll;

import java.net.URI;

Expand All @@ -49,9 +50,9 @@
*/
public class TestOBSFileContextURI extends FileContextURIBase {

@BeforeClass
@BeforeAll
public static void skipTestCheck() {
Assume.assumeTrue(OBSContract.isContractTestEnabled());
assumeTrue(OBSContract.isContractTestEnabled());
}

@Override
Expand All @@ -77,12 +78,12 @@ public void setUp() throws Exception {

@Override
public void testMkdirsFailsForSubdirectoryOfExistingFile() {
Assume.assumeTrue("unsupport.", false);
assumeTrue(false, "unsupport.");
}

@Override
public void testFileStatus() {
Assume.assumeTrue("unsupport.", false);
assumeTrue(false, "unsupport.");
}

}
9 changes: 5 additions & 4 deletions ...ect/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@

package org.apache.hadoop.fs.obs;

import static org.junit.jupiter.api.Assumptions.assumeTrue;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.DelegateToFileSystem;
import org.apache.hadoop.fs.FileContext;
import org.apache.hadoop.fs.FileContextUtilBase;
import org.apache.hadoop.fs.FileSystem;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.jupiter.api.BeforeAll;

import java.net.URI;

Expand All @@ -44,9 +45,9 @@
*/
public class TestOBSFileContextUtil extends FileContextUtilBase {

@BeforeClass
@BeforeAll
public static void skipTestCheck() {
Assume.assumeTrue(OBSContract.isContractTestEnabled());
assumeTrue(OBSContract.isContractTestEnabled());
}

@Override
Expand Down
13 changes: 7 additions & 6 deletions .../hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileSystemContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@

package org.apache.hadoop.fs.obs;

import static org.junit.jupiter.api.Assumptions.assumeTrue;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystemContractBaseTest;
import org.junit.Assume;
import org.junit.Before;
import org.junit.jupiter.api.BeforeEach;


/**
Expand All @@ -35,7 +36,7 @@
**/
public class TestOBSFileSystemContract extends FileSystemContractBaseTest {

@Before
@BeforeEach
public void setUp() throws Exception {
skipTestCheck();
Configuration conf = new Configuration();
Expand All @@ -45,15 +46,15 @@ public void setUp() throws Exception {

@Override
public void testMkdirsWithUmask() {
Assume.assumeTrue("unspport.", false);
assumeTrue(false, "unspport.");
}

@Override
public void testRenameRootDirForbidden() {
Assume.assumeTrue("unspport.", false);
assumeTrue(false, "unspport.");
}

public void skipTestCheck() {
Assume.assumeTrue(OBSContract.isContractTestEnabled());
assumeTrue(OBSContract.isContractTestEnabled());
}
}