Skip to content

HDDS-12381. Fix spotbugs warnings in TestHddsUtils #7955

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
adoroszlai merged 4 commits into from
Feb 23, 2025
Merged

HDDS-12381. Fix spotbugs warnings in TestHddsUtils #7955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f003270
HDDS-12381. Fix spotbugs warnings in TestHddsUtils
peterxcli Feb 23, 2025
2bb19a3
Remove FindBugs exclusion for TestHddsUtils
peterxcli Feb 23, 2025
c814c55
paramerize path validation in TestHddsUtils
peterxcli Feb 23, 2025
d3db54e
remove fixed findbugs bypass rules
peterxcli Feb 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
14 changes: 0 additions & 14 deletions hadoop-hdds/common/dev-support/findbugsExcludeFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,4 @@
<Method name="update" />
<Bug pattern="SF_SWITCH_FALLTHROUGH,SF_SWITCH_NO_DEFAULT" />
</Match>

<!-- Test -->
<Match>
<Class name="org.apache.hadoop.hdds.TestHddsUtils"></Class>
<Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME" />
</Match>
<Match>
<Class name="~org\.apache\.hadoop\.hdds\.scm\.net\.TestNodeSchemaLoader\$.*"></Class>
<Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" />
</Match>
<Match>
<Class name="org.apache.hadoop.hdds.utils.db.Proto2CodecTestBase"/>
<Bug pattern="NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS" />
</Match>
</FindBugsFilter>
48 changes: 33 additions & 15 deletions hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestHddsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.net.InetSocketAddress;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
Expand All @@ -43,6 +44,9 @@
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.ozone.ha.ConfUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

/**
* Testing HddsUtils.
Expand All @@ -66,23 +70,37 @@ void testGetHostName() {
HddsUtils.getHostName(":1234"));
}

@Test
void validatePath() {
HddsUtils.validatePath(Paths.get("/"), Paths.get("/"));
HddsUtils.validatePath(Paths.get("/a"), Paths.get("/"));
HddsUtils.validatePath(Paths.get("/a"), Paths.get("/a"));
HddsUtils.validatePath(Paths.get("/a/b"), Paths.get("/a"));
HddsUtils.validatePath(Paths.get("/a/b/c"), Paths.get("/a"));
HddsUtils.validatePath(Paths.get("/a/../a/b"), Paths.get("/a"));
static List<Arguments> validPaths() {
return Arrays.asList(
Arguments.of("/", "/"),
Arguments.of("/a", "/"),
Arguments.of("/a", "/a"),
Arguments.of("/a/b", "/a"),
Arguments.of("/a/b/c", "/a"),
Arguments.of("/a/../a/b", "/a")
);
}

@ParameterizedTest
@MethodSource("validPaths")
void validatePathAcceptsValidPath(String path, String ancestor) {
HddsUtils.validatePath(Paths.get(path), Paths.get(ancestor));
}

static List<Arguments> invalidPaths() {
return Arrays.asList(
Arguments.of("/b/c", "/a"),
Arguments.of("/", "/a"),
Arguments.of("/a/..", "/a"),
Arguments.of("/a/../b", "/a")
);
}

@ParameterizedTest
@MethodSource("invalidPaths")
void validatePathRejectsInvalidPath(String path, String ancestor) {
assertThrows(IllegalArgumentException.class,
() -> HddsUtils.validatePath(Paths.get("/b/c"), Paths.get("/a")));
assertThrows(IllegalArgumentException.class,
() -> HddsUtils.validatePath(Paths.get("/"), Paths.get("/a")));
assertThrows(IllegalArgumentException.class,
() -> HddsUtils.validatePath(Paths.get("/a/.."), Paths.get("/a")));
assertThrows(IllegalArgumentException.class,
() -> HddsUtils.validatePath(Paths.get("/a/../b"), Paths.get("/a")));
() -> HddsUtils.validatePath(Paths.get(path), Paths.get(ancestor)));
}

@Test
Expand Down