From d1e9e598c9bcbf91afa174fa9b6c2ef30bbc8157 Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Sun, 28 Mar 2021 08:47:59 -0400
Subject: [PATCH] Add test for SystemUtils.USER_NAME.

---
 .../apache/commons/lang3/SystemUtilsTest.java | 182 +++++++++---------
 1 file changed, 95 insertions(+), 87 deletions(-)

diff --git a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
index 4e18625bc..38f917bff 100644
--- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
@@ -52,93 +52,9 @@ import org.junit.jupiter.api.Test;
  */
 public class SystemUtilsTest {
 
-    @Test
-    public void testConstructor() {
-        assertNotNull(new SystemUtils());
-        final Constructor<?>[] cons = SystemUtils.class.getDeclaredConstructors();
-        assertEquals(1, cons.length);
-        assertTrue(Modifier.isPublic(cons[0].getModifiers()));
-        assertTrue(Modifier.isPublic(SystemUtils.class.getModifiers()));
-        assertFalse(Modifier.isFinal(SystemUtils.class.getModifiers()));
-    }
-
-    @Test
-    public void testGetEnvironmentVariableAbsent() {
-        final String name = "THIS_ENV_VAR_SHOULD_NOT_EXIST_FOR_THIS_TEST_TO_PASS";
-        final String expected = System.getenv(name);
-        assertNull(expected);
-        final String value = SystemUtils.getEnvironmentVariable(name, "DEFAULT");
-        assertEquals("DEFAULT", value);
-    }
-
-    @Test
-    public void testGetEnvironmentVariablePresent() {
-        final String name = "PATH";
-        final String expected = System.getenv(name);
-        final String value = SystemUtils.getEnvironmentVariable(name, null);
-        assertEquals(expected, value);
-    }
-
-    @Test
-    public void testGetHostName() {
-        final String hostName = SystemUtils.getHostName();
-        final String expected = SystemUtils.IS_OS_WINDOWS ? System.getenv("COMPUTERNAME") : System.getenv("HOSTNAME");
-        assertEquals(expected, hostName);
-    }
-
-    /**
-     * Assumes no security manager exists.
-     */
-    @Test
-    public void testGetJavaHome() {
-        final File dir = SystemUtils.getJavaHome();
-        assertNotNull(dir);
-        assertTrue(dir.exists());
-    }
-
-    /**
-     * Assumes no security manager exists.
-     */
-    @Test
-    public void testGetJavaIoTmpDir() {
-        final File dir = SystemUtils.getJavaIoTmpDir();
-        assertNotNull(dir);
-        assertTrue(dir.exists());
-    }
-
-    /**
-     * Assumes no security manager exists.
-     */
-    @Test
-    public void testGetUserDir() {
-        final File dir = SystemUtils.getUserDir();
-        assertNotNull(dir);
-        assertTrue(dir.exists());
-    }
-
-    /**
-     * Assumes no security manager exists.
-     */
-    @Test
-    public void testGetUserHome() {
-        final File dir = SystemUtils.getUserHome();
-        assertNotNull(dir);
-        assertTrue(dir.exists());
-    }
-
-    /**
-     * Assumes no security manager exists.
-     */
-    @Test
-    public void testGetUserName() {
-        assertEquals(System.getProperty("user.name"), SystemUtils.getUserName());
-        // Don't overwrite the system property in this test in case something goes awfully wrong.
-        assertEquals(System.getProperty("user.name", "foo"), SystemUtils.getUserName("foo"));
-    }
-
     @Test
     @SuppressWarnings("deprecation")
-    public void testIS_JAVA() {
+    public void test_IS_JAVA() {
         final String javaVersion = SystemUtils.JAVA_VERSION;
         if (javaVersion == null) {
             assertFalse(SystemUtils.IS_JAVA_1_1);
@@ -297,7 +213,7 @@ public class SystemUtilsTest {
     }
 
     @Test
-    public void testIS_OS() {
+    public void test_IS_OS() {
         final String osName = System.getProperty("os.name");
         if (osName == null) {
             assertFalse(SystemUtils.IS_OS_WINDOWS);
@@ -338,7 +254,7 @@ public class SystemUtilsTest {
     }
 
     @Test
-    public void testIS_zOS() {
+    public void test_IS_zOS() {
         final String osName = System.getProperty("os.name");
         if (osName == null) {
             assertFalse(SystemUtils.IS_OS_ZOS);
@@ -348,6 +264,98 @@ public class SystemUtilsTest {
         }
     }
 
+    /**
+     * Assumes no security manager exists.
+     */
+    @Test
+    public void test_USER_NAME() {
+        assertEquals(System.getProperty("user.name"), SystemUtils.USER_NAME);
+    }
+
+    @Test
+    public void testConstructor() {
+        assertNotNull(new SystemUtils());
+        final Constructor<?>[] cons = SystemUtils.class.getDeclaredConstructors();
+        assertEquals(1, cons.length);
+        assertTrue(Modifier.isPublic(cons[0].getModifiers()));
+        assertTrue(Modifier.isPublic(SystemUtils.class.getModifiers()));
+        assertFalse(Modifier.isFinal(SystemUtils.class.getModifiers()));
+    }
+
+    @Test
+    public void testGetEnvironmentVariableAbsent() {
+        final String name = "THIS_ENV_VAR_SHOULD_NOT_EXIST_FOR_THIS_TEST_TO_PASS";
+        final String expected = System.getenv(name);
+        assertNull(expected);
+        final String value = SystemUtils.getEnvironmentVariable(name, "DEFAULT");
+        assertEquals("DEFAULT", value);
+    }
+
+    @Test
+    public void testGetEnvironmentVariablePresent() {
+        final String name = "PATH";
+        final String expected = System.getenv(name);
+        final String value = SystemUtils.getEnvironmentVariable(name, null);
+        assertEquals(expected, value);
+    }
+
+    @Test
+    public void testGetHostName() {
+        final String hostName = SystemUtils.getHostName();
+        final String expected = SystemUtils.IS_OS_WINDOWS ? System.getenv("COMPUTERNAME") : System.getenv("HOSTNAME");
+        assertEquals(expected, hostName);
+    }
+
+    /**
+     * Assumes no security manager exists.
+     */
+    @Test
+    public void testGetJavaHome() {
+        final File dir = SystemUtils.getJavaHome();
+        assertNotNull(dir);
+        assertTrue(dir.exists());
+    }
+
+    /**
+     * Assumes no security manager exists.
+     */
+    @Test
+    public void testGetJavaIoTmpDir() {
+        final File dir = SystemUtils.getJavaIoTmpDir();
+        assertNotNull(dir);
+        assertTrue(dir.exists());
+    }
+
+    /**
+     * Assumes no security manager exists.
+     */
+    @Test
+    public void testGetUserDir() {
+        final File dir = SystemUtils.getUserDir();
+        assertNotNull(dir);
+        assertTrue(dir.exists());
+    }
+
+    /**
+     * Assumes no security manager exists.
+     */
+    @Test
+    public void testGetUserHome() {
+        final File dir = SystemUtils.getUserHome();
+        assertNotNull(dir);
+        assertTrue(dir.exists());
+    }
+
+    /**
+     * Assumes no security manager exists.
+     */
+    @Test
+    public void testGetUserName() {
+        assertEquals(System.getProperty("user.name"), SystemUtils.getUserName());
+        // Don't overwrite the system property in this test in case something goes awfully wrong.
+        assertEquals(System.getProperty("user.name", "foo"), SystemUtils.getUserName("foo"));
+    }
+
     @Test
     public void testIsJavaVersionAtLeast() {
         if (SystemUtils.IS_JAVA_1_8) {