This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit f68ca3cadd5766f579f4020868ea6febfada1db2 Author: Gary Gregory <[email protected]> AuthorDate: Mon Dec 2 08:29:32 2024 -0500 Sort members --- .../org/apache/commons/lang3/RuntimeEnvironment.java | 8 ++++---- .../org/apache/commons/lang3/RuntimeEnvironmentTest.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/RuntimeEnvironment.java b/src/main/java/org/apache/commons/lang3/RuntimeEnvironment.java index 3ee8f723c..1c252caff 100644 --- a/src/main/java/org/apache/commons/lang3/RuntimeEnvironment.java +++ b/src/main/java/org/apache/commons/lang3/RuntimeEnvironment.java @@ -30,6 +30,10 @@ import java.util.Arrays; */ public class RuntimeEnvironment { + private static boolean fileExists(String path) { + return Files.exists(Paths.get(path)); + } + /** * Tests whether the /proc/N/environ file at the given path string contains a specific line prefix. * @@ -86,10 +90,6 @@ public class RuntimeEnvironment { return fileExists(dirPrefix + "/.dockerenv") || fileExists(dirPrefix + "/run/.containerenv"); } - private static boolean fileExists(String path) { - return Files.exists(Paths.get(path)); - } - /** * Constructs a new instance. * diff --git a/src/test/java/org/apache/commons/lang3/RuntimeEnvironmentTest.java b/src/test/java/org/apache/commons/lang3/RuntimeEnvironmentTest.java index dc3be2ba7..9b5a68f11 100644 --- a/src/test/java/org/apache/commons/lang3/RuntimeEnvironmentTest.java +++ b/src/test/java/org/apache/commons/lang3/RuntimeEnvironmentTest.java @@ -45,9 +45,6 @@ public class RuntimeEnvironmentTest { private static final String emptyContainer = "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\u0000" + "HOSTNAME=d62718b69f37\u0000TERM=xterm\u0000container=\u0000HOME=/root\u0000"; - @TempDir - private Path tempDir; - private static Arguments[] testIsContainer() { return new Arguments[]{ Arguments.of("in docker no file", simpleEnviron, null, false), @@ -63,11 +60,8 @@ public class RuntimeEnvironmentTest { }; } - @ParameterizedTest - @MethodSource - public void testIsContainer(String label, String environ, String fileToCreate, boolean expected) throws IOException { - assertEquals(expected, doTestInContainer(environ, fileToCreate), label); - } + @TempDir + private Path tempDir; private boolean doTestInContainer(String environ, String fileToCreate) throws IOException { Path testDir = tempDir.resolve(UUID.randomUUID().toString()); @@ -86,4 +80,10 @@ public class RuntimeEnvironmentTest { return RuntimeEnvironment.inContainer(testDir.toString()); } + + @ParameterizedTest + @MethodSource + public void testIsContainer(String label, String environ, String fileToCreate, boolean expected) throws IOException { + assertEquals(expected, doTestInContainer(environ, fileToCreate), label); + } }
