Skip to content

HADOOP-19426. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-azure-datalake Part2. #7757

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
Jul 2, 2025
Merged

HADOOP-19426. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-azure-datalake Part2. #7757

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
0ada4c1
HADOOP-19426. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-azure-datal…
slfan1989 Jun 23, 2025
a970a6e
HADOOP-19426. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-azure-datal…
slfan1989 Jun 23, 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
60 changes: 0 additions & 60 deletions ...ols/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/common/Parallelized.java
View file
Open in desktop

This file was deleted.

41 changes: 23 additions & 18 deletions ...oop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlPermissionLive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.adl.common.Parallelized;
import org.apache.hadoop.fs.permission.FsAction;
import org.apache.hadoop.fs.permission.FsPermission;
import org.junit.*;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

import java.io.IOException;
import java.io.UnsupportedEncodingException;
Expand All @@ -38,22 +37,25 @@
import java.util.Collection;
import java.util.UUID;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

/**
* Test ACL permission on file/folder on Adl file system.
*/
@RunWith(Parallelized.class)
public class TestAdlPermissionLive {

private static Path testRoot = new Path("/test");
private FsPermission permission;
private Path path;
private FileSystem adlStore;

public TestAdlPermissionLive(FsPermission testPermission) {
permission = testPermission;
public void initTestAdlPermissionLive(FsPermission pTestPermission) throws Exception {
permission = pTestPermission;
setUp();
}

@Parameterized.Parameters(name = "{0}")
public static Collection adlCreateNonRecursiveTestData()
Copy link

Copilot AI Jun 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use a parameterized generic return type Collection<FsPermission> for the data provider to avoid raw-type warnings and improve type safety.

Suggested change
public static Collection adlCreateNonRecursiveTestData()
public static Collection<FsPermission[]> adlCreateNonRecursiveTestData()

Copilot uses AI. Check for mistakes.
throws UnsupportedEncodingException {
/*
Expand All @@ -71,22 +73,23 @@ public static Collection adlCreateNonRecursiveTestData()
return datas;
}

@AfterClass
@AfterAll
public static void cleanUp() throws IOException, URISyntaxException {
if (AdlStorageConfiguration.isContractTestEnabled()) {
Assert.assertTrue(AdlStorageConfiguration.createStorageConnector()
assertTrue(AdlStorageConfiguration.createStorageConnector()
.delete(testRoot, true));
Copy link

Copilot AI Jun 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Add a descriptive message to this assertion to clarify failure context, e.g., assertTrue(..., "Failed to clean up testRoot directory").

Suggested change
.delete(testRoot, true));
.delete(testRoot, true), "Failed to clean up testRoot directory during cleanup.");

Copilot uses AI. Check for mistakes.
}
}

@Before
Copy link
Contributor

@anujmodi2021 anujmodi2021 Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need @beforeeach here after removing @before?

Copy link
Contributor Author

@slfan1989 slfan1989 Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anujmodi2021 Thank you for your question! ParameterizedTest in JUnit 5 is a special type of unit test. Unlike JUnit 4, ParameterizedTest requires the initialization of certain parameters directly in the test method, so the setup function is executed at that point. If we add @BeforeEach, the variables in setup would not be initialized yet. Therefore, we don't need to add @BeforeEach; instead, we should call setup within initTestAdlPermissionLive.

public void setUp() throws Exception {
Assume.assumeTrue(AdlStorageConfiguration.isContractTestEnabled());
assumeTrue(AdlStorageConfiguration.isContractTestEnabled());
adlStore = AdlStorageConfiguration.createStorageConnector();
}

@Test
public void testFilePermission() throws IOException {
@ParameterizedTest(name = "{0}")
@MethodSource("adlCreateNonRecursiveTestData")
public void testFilePermission(FsPermission pTestPermission) throws Exception {
initTestAdlPermissionLive(pTestPermission);
path = new Path(testRoot, UUID.randomUUID().toString());
adlStore.getConf()
.set(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY, "000");
Expand All @@ -97,11 +100,13 @@ public void testFilePermission() throws IOException {

adlStore.create(path, permission, true, 1024, (short) 1, 1023, null);
FileStatus status = adlStore.getFileStatus(path);
Assert.assertEquals(permission, status.getPermission());
assertEquals(permission, status.getPermission());
}

@Test
public void testFolderPermission() throws IOException {
@ParameterizedTest(name = "{0}")
@MethodSource("adlCreateNonRecursiveTestData")
public void testFolderPermission(FsPermission pTestPermission) throws Exception {
initTestAdlPermissionLive(pTestPermission);
path = new Path(testRoot, UUID.randomUUID().toString());
adlStore.getConf()
.set(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY, "000");
Expand All @@ -111,6 +116,6 @@ public void testFolderPermission() throws IOException {

adlStore.mkdirs(path, permission);
FileStatus status = adlStore.getFileStatus(path);
Assert.assertEquals(permission, status.getPermission());
assertEquals(permission, status.getPermission());
}
}