(empire-db) branch master updated: EMPIREDB-431 StringUtils: fix for unit test

[doebele]

This is an automated email from the ASF dual-hosted git repository.

doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new 8823d7f0 EMPIREDB-431 StringUtils: fix for unit test
8823d7f0 is described below

commit 8823d7f01fef7fe44d4919376257226d76faca58
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Mon Oct 14 10:17:59 2024 +0200

    EMPIREDB-431
    StringUtils: fix for unit test
---
 .../java/org/apache/empire/commons/StringUtils.java    |  2 +-
 .../org/apache/empire/commons/StringUtilsTest.java     | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java 
b/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java
index 37448422..2e4a6cd7 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java
@@ -950,7 +950,7 @@ public class StringUtils
             // assemble
             if (end>beg)
             {
-                if (beg==0 && !firstCharUpper)
+                if (b.length()==0 && !firstCharUpper)
                 {   // begin with all lower cases
                     b.append(text.substring(beg, end).toLowerCase());
                 }
diff --git 
a/empire-db/src/test/java/org/apache/empire/commons/StringUtilsTest.java 
b/empire-db/src/test/java/org/apache/empire/commons/StringUtilsTest.java
index be924eec..7a5a2d74 100644
--- a/empire-db/src/test/java/org/apache/empire/commons/StringUtilsTest.java
+++ b/empire-db/src/test/java/org/apache/empire/commons/StringUtilsTest.java
@@ -125,6 +125,7 @@ public class StringUtilsTest
        public void testCoalesce()
        {
                assertEquals("ok",StringUtils.coalesce("ok", "fail"));
+        assertEquals("ok",StringUtils.coalesce(" ", "ok"));
                assertEquals("ok",StringUtils.coalesce("   \r \n \t  ", "ok"));
                assertEquals("ok",StringUtils.coalesce(null, "ok"));
                assertEquals(null,StringUtils.coalesce(null, null));
@@ -135,8 +136,9 @@ public class StringUtilsTest
        {
                assertEquals(null, StringUtils.nullIfEmpty(null));
                assertEquals(null, StringUtils.nullIfEmpty(""));
-               assertEquals(" ", StringUtils.nullIfEmpty(" "));
-               assertEquals("\r\n\t", StringUtils.nullIfEmpty("\r\n\t"));
+               assertEquals(null, StringUtils.nullIfEmpty("   "));
+               assertEquals(null, StringUtils.nullIfEmpty("\r\n\t"));
+        assertEquals("\r\nOk\t", StringUtils.nullIfEmpty("\r\nOk\t"));
                assertEquals(" value ", StringUtils.nullIfEmpty(" value "));
        }
 
@@ -214,4 +216,16 @@ public class StringUtilsTest
                assertEquals("1-two-3", StringUtils.replaceAll("1 2 3", " 2 ", 
"-two-"));
        }
 
+    @Test
+    public void testCamelCase()
+    {
+        assertEquals("helloWorld", StringUtils.toCamelCase("HELLO_WORLD", 
false));
+        assertEquals("helloWorld", StringUtils.toCamelCase(" HELLO WORLD ", 
false));
+        assertEquals("HelloWorld", StringUtils.toCamelCase(" HELLO WORLD ", 
true));
+        assertEquals("123Hello456", StringUtils.toCamelCase("123_hello_456", 
true));
+        assertEquals("", StringUtils.toCamelCase(" _ _ _ ", true));
+        assertEquals("ABC", StringUtils.toCamelCase(" _a_ _b_ _c_ ", true));
+        assertEquals("aBC", StringUtils.toCamelCase(" _a_ _b_ _c_ ", false));
+    }
+
 }