From 93c4ec418ea23647c6d88cd5d7899915cadc2cc0 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 1 Jul 2026 10:05:51 -0400 Subject: [PATCH] Os.getOsFamily: return empty string instead of null --- src/main/java/org/apache/maven/shared/utils/Os.java | 2 +- src/test/java/org/apache/maven/shared/utils/OsTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/shared/utils/Os.java b/src/main/java/org/apache/maven/shared/utils/Os.java index 179e110d..121ec0f6 100644 --- a/src/main/java/org/apache/maven/shared/utils/Os.java +++ b/src/main/java/org/apache/maven/shared/utils/Os.java @@ -365,7 +365,7 @@ private static String getOsFamily() { return fam; } } - return null; + return ""; } /** diff --git a/src/test/java/org/apache/maven/shared/utils/OsTest.java b/src/test/java/org/apache/maven/shared/utils/OsTest.java index e524191e..297db7f3 100644 --- a/src/test/java/org/apache/maven/shared/utils/OsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/OsTest.java @@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -112,6 +113,11 @@ public void testGetValidFamilies() { assertTrue(osFamilies.contains(Os.FAMILY_ZOS)); } + @Test + public void testOsFamilyNotNull() { + assertNotNull(Os.OS_FAMILY); + } + @Test public void testIsArch() { assertTrue(Os.isArch("i386"), "Arch is i386");