You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/04/24 23:13:49 UTC
(commons-lang) 01/02: Camel-case package-private methods
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 dfe80aaca3a686047b832e321dafe141954a983f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Apr 24 18:21:56 2024 -0400
Camel-case package-private methods
---
.../java/org/apache/commons/lang3/SystemUtils.java | 12 ++--
.../org/apache/commons/lang3/SystemUtilsTest.java | 68 +++++++++++-----------
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/SystemUtils.java b/src/main/java/org/apache/commons/lang3/SystemUtils.java
index 9844b0615..8ce72a1c1 100644
--- a/src/main/java/org/apache/commons/lang3/SystemUtils.java
+++ b/src/main/java/org/apache/commons/lang3/SystemUtils.java
@@ -1973,7 +1973,7 @@ public class SystemUtils {
* @return true if matches, or false if not or can't determine
*/
private static boolean getOsMatches(final String osNamePrefix, final String osVersionPrefix) {
- return isOSMatch(OS_NAME, OS_VERSION, osNamePrefix, osVersionPrefix);
+ return isOsMatch(OS_NAME, OS_VERSION, osNamePrefix, osVersionPrefix);
}
/**
@@ -1983,7 +1983,7 @@ public class SystemUtils {
* @return true if matches, or false if not or can't determine
*/
private static boolean getOsMatchesName(final String osNamePrefix) {
- return isOSNameMatch(OS_NAME, osNamePrefix);
+ return isOsNameMatch(OS_NAME, osNamePrefix);
}
/**
@@ -2108,11 +2108,11 @@ public class SystemUtils {
* @param osVersionPrefix the prefix for the expected OS version
* @return true if matches, or false if not or can't determine
*/
- static boolean isOSMatch(final String osName, final String osVersion, final String osNamePrefix, final String osVersionPrefix) {
+ static boolean isOsMatch(final String osName, final String osVersion, final String osNamePrefix, final String osVersionPrefix) {
if (osName == null || osVersion == null) {
return false;
}
- return isOSNameMatch(osName, osNamePrefix) && isOSVersionMatch(osVersion, osVersionPrefix);
+ return isOsNameMatch(osName, osNamePrefix) && isOsVersionMatch(osVersion, osVersionPrefix);
}
/**
@@ -2125,7 +2125,7 @@ public class SystemUtils {
* @param osNamePrefix the prefix for the expected OS name
* @return true if matches, or false if not or can't determine
*/
- static boolean isOSNameMatch(final String osName, final String osNamePrefix) {
+ static boolean isOsNameMatch(final String osName, final String osNamePrefix) {
if (osName == null) {
return false;
}
@@ -2142,7 +2142,7 @@ public class SystemUtils {
* @param osVersionPrefix the prefix for the expected OS version
* @return true if matches, or false if not or can't determine
*/
- static boolean isOSVersionMatch(final String osVersion, final String osVersionPrefix) {
+ static boolean isOsVersionMatch(final String osVersion, final String osVersionPrefix) {
if (StringUtils.isEmpty(osVersion)) {
return false;
}
diff --git a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
index d269222dd..a27c7c3ca 100644
--- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
@@ -1278,78 +1278,78 @@ public class SystemUtilsTest extends AbstractLangTest {
@Test
public void testOSMatchesName() {
String osName = null;
- assertFalse(SystemUtils.isOSNameMatch(osName, "Windows"));
+ assertFalse(SystemUtils.isOsNameMatch(osName, "Windows"));
osName = "";
- assertFalse(SystemUtils.isOSNameMatch(osName, "Windows"));
+ assertFalse(SystemUtils.isOsNameMatch(osName, "Windows"));
osName = "Windows 95";
- assertTrue(SystemUtils.isOSNameMatch(osName, "Windows"));
+ assertTrue(SystemUtils.isOsNameMatch(osName, "Windows"));
osName = "Windows NT";
- assertTrue(SystemUtils.isOSNameMatch(osName, "Windows"));
+ assertTrue(SystemUtils.isOsNameMatch(osName, "Windows"));
osName = "OS/2";
- assertFalse(SystemUtils.isOSNameMatch(osName, "Windows"));
+ assertFalse(SystemUtils.isOsNameMatch(osName, "Windows"));
}
@Test
public void testOSMatchesNameAndVersion() {
String osName = null;
String osVersion = null;
- assertFalse(SystemUtils.isOSMatch(osName, osVersion, "Windows 9", "4.1"));
+ assertFalse(SystemUtils.isOsMatch(osName, osVersion, "Windows 9", "4.1"));
osName = "";
osVersion = "";
- assertFalse(SystemUtils.isOSMatch(osName, osVersion, "Windows 9", "4.1"));
+ assertFalse(SystemUtils.isOsMatch(osName, osVersion, "Windows 9", "4.1"));
osName = "Windows 95";
osVersion = "4.0";
- assertFalse(SystemUtils.isOSMatch(osName, osVersion, "Windows 9", "4.1"));
+ assertFalse(SystemUtils.isOsMatch(osName, osVersion, "Windows 9", "4.1"));
osName = "Windows 95";
osVersion = "4.1";
- assertTrue(SystemUtils.isOSMatch(osName, osVersion, "Windows 9", "4.1"));
+ assertTrue(SystemUtils.isOsMatch(osName, osVersion, "Windows 9", "4.1"));
osName = "Windows 98";
osVersion = "4.1";
- assertTrue(SystemUtils.isOSMatch(osName, osVersion, "Windows 9", "4.1"));
+ assertTrue(SystemUtils.isOsMatch(osName, osVersion, "Windows 9", "4.1"));
osName = "Windows NT";
osVersion = "4.0";
- assertFalse(SystemUtils.isOSMatch(osName, osVersion, "Windows 9", "4.1"));
+ assertFalse(SystemUtils.isOsMatch(osName, osVersion, "Windows 9", "4.1"));
osName = "OS/2";
osVersion = "4.0";
- assertFalse(SystemUtils.isOSMatch(osName, osVersion, "Windows 9", "4.1"));
+ assertFalse(SystemUtils.isOsMatch(osName, osVersion, "Windows 9", "4.1"));
}
@Test
public void testOsVersionMatches() {
String osVersion = null;
- assertFalse(SystemUtils.isOSVersionMatch(osVersion, "10.1"));
+ assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
osVersion = "";
- assertFalse(SystemUtils.isOSVersionMatch(osVersion, "10.1"));
+ assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
osVersion = "10";
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.1"));
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.1.1"));
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.10"));
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.10.1"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1.1"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.10"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.10.1"));
osVersion = "10.1";
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.1"));
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.1.1"));
- assertFalse(SystemUtils.isOSVersionMatch(osVersion, "10.10"));
- assertFalse(SystemUtils.isOSVersionMatch(osVersion, "10.10.1"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1.1"));
+ assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.10"));
+ assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.10.1"));
osVersion = "10.1.1";
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.1"));
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.1.1"));
- assertFalse(SystemUtils.isOSVersionMatch(osVersion, "10.10"));
- assertFalse(SystemUtils.isOSVersionMatch(osVersion, "10.10.1"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.1.1"));
+ assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.10"));
+ assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.10.1"));
osVersion = "10.10";
- assertFalse(SystemUtils.isOSVersionMatch(osVersion, "10.1"));
- assertFalse(SystemUtils.isOSVersionMatch(osVersion, "10.1.1"));
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.10"));
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.10.1"));
+ assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
+ assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1.1"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.10"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.10.1"));
osVersion = "10.10.1";
- assertFalse(SystemUtils.isOSVersionMatch(osVersion, "10.1"));
- assertFalse(SystemUtils.isOSVersionMatch(osVersion, "10.1.1"));
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.10"));
- assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.10.1"));
+ assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1"));
+ assertFalse(SystemUtils.isOsVersionMatch(osVersion, "10.1.1"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.10"));
+ assertTrue(SystemUtils.isOsVersionMatch(osVersion, "10.10.1"));
}
}