Move null-safe trim from (test) StringHelper to (main) StringUtils

FirebirdSQL · Mar 15, 2024 · 1ae5b96 · 1ae5b96
1 parent 09305d9
commit 1ae5b96
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 55 deletions.
diff --git a/src/main/org/firebirdsql/jaybird/util/StringUtils.java b/src/main/org/firebirdsql/jaybird/util/StringUtils.java
@@ -60,5 +60,17 @@ public static String trimToNull(String value) {
     public static boolean isNullOrEmpty(String value) {
         return value == null || value.isEmpty();
     }
+
+    /**
+     * Null-safe trim.
+     *
+     * @param stringToTrim
+     *         String to trim
+     * @return result of {@code stringToTrim.trim()} (or {@code null} if {@code stringToTrim} was null
+     * @since 6
+     */
+    public static String trim(String stringToTrim) {
+        return stringToTrim == null ? null : stringToTrim.trim();
+    }
 
 }
diff --git a/src/test/org/firebirdsql/common/StringHelper.java b/src/test/org/firebirdsql/common/StringHelper.java
diff --git a/src/test/org/firebirdsql/jaybird/util/StringUtilsTest.java b/src/test/org/firebirdsql/jaybird/util/StringUtilsTest.java
@@ -20,6 +20,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.EmptySource;
 import org.junit.jupiter.params.provider.NullSource;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -79,4 +80,18 @@ void testIsNullOrEmpty_nonEmptyYieldsFalse(String value) {
         assertFalse(StringUtils.isNullOrEmpty(value));
     }
 
+    @ParameterizedTest
+    @CsvSource(useHeadersInDisplayName = true, textBlock = """
+            input, expectedOutput
+            ,
+            '',    ''
+            ' ',   ''
+            'a ',  a
+            ' a',  a
+            ' a ', a
+            """)
+    void testTrim(String input, String expectedOutput) {
+        assertEquals(expectedOutput, StringUtils.trim(input));
+    }
+
 }
diff --git a/src/test/org/firebirdsql/management/FBManagerTest.java b/src/test/org/firebirdsql/management/FBManagerTest.java
@@ -18,9 +18,9 @@
  */
 package org.firebirdsql.management;
 
-import org.firebirdsql.common.StringHelper;
 import org.firebirdsql.gds.ISCConstants;
 import org.firebirdsql.gds.ng.FbDatabase;
+import org.firebirdsql.jaybird.util.StringUtils;
 import org.firebirdsql.jdbc.FBConnection;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -205,7 +205,7 @@ void testCreate_withDefaultCharacterSet() throws Exception {
                      ResultSet rs = stmt.executeQuery("select RDB$CHARACTER_SET_NAME from rdb$database")) {
 
                     assertTrue(rs.next(), "expected a row");
-                    assertEquals("UTF8", StringHelper.trim(rs.getString(1)), "Unexpected default character set");
+                    assertEquals("UTF8", StringUtils.trim(rs.getString(1)), "Unexpected default character set");
                 }
             } finally {
                 m.dropDatabase(databasePath, DB_USER, DB_PASSWORD);