Skip to content

Commit 1301818

Browse files
pixeebotmarcphilipp
authored andcommitted
Switch order of literals to prevent NullPointerException
1 parent 3f8f075 commit 1301818

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static CloseablePath create(URI uri, FileSystemProvider fileSystemProvider) thro
5959
return createForJarFileSystem(new URI(jarUri), fileSystem -> fileSystem.getPath(jarEntry),
6060
fileSystemProvider);
6161
}
62-
if (uri.getScheme().equals(FILE_URI_SCHEME) && uri.getPath().endsWith(JAR_FILE_EXTENSION)) {
62+
if (FILE_URI_SCHEME.equals(uri.getScheme()) && uri.getPath().endsWith(JAR_FILE_EXTENSION)) {
6363
return createForJarFileSystem(new URI(JAR_URI_SCHEME + ':' + uri),
6464
fileSystem -> fileSystem.getRootDirectories().iterator().next(), fileSystemProvider);
6565
}

junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ final Optional<Segment> getRoot() {
118118
* @see #forEngine(String)
119119
*/
120120
public final Optional<String> getEngineId() {
121-
return getRoot().filter(segment -> segment.getType().equals(ENGINE_SEGMENT_TYPE)).map(Segment::getValue);
121+
return getRoot().filter(segment -> ENGINE_SEGMENT_TYPE.equals(segment.getType())).map(Segment::getValue);
122122
}
123123

124124
/**

junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ private static boolean validateReservedIds(TestEngine testEngine) {
5656
if (!engineId.startsWith("junit-")) {
5757
return true;
5858
}
59-
if (engineId.equals("junit-jupiter")) {
59+
if ("junit-jupiter".equals(engineId)) {
6060
validateWellKnownClassName(testEngine, "org.junit.jupiter.engine.JupiterTestEngine");
6161
return true;
6262
}
63-
if (engineId.equals("junit-vintage")) {
63+
if ("junit-vintage".equals(engineId)) {
6464
validateWellKnownClassName(testEngine, "org.junit.vintage.engine.VintageTestEngine");
6565
return true;
6666
}
67-
if (engineId.equals("junit-platform-suite")) {
67+
if ("junit-platform-suite".equals(engineId)) {
6868
validateWellKnownClassName(testEngine, "org.junit.platform.suite.engine.SuiteTestEngine");
6969
return true;
7070
}

0 commit comments

Comments
 (0)