Strings cleaner > only capitalize if string was lower-case before

Author: mmathieum

src/main/java/org/mtransit/commons/CleanUtils.java

@@ -91,13 +91,20 @@ public static String cleanLabel(@NotNull String label) {
 
 	@NotNull
 	public static String cleanLabel(@NotNull Locale locale, @NotNull String label) {
+		return cleanLabel(locale, label, true);
+	}
+
+	@NotNull
+	public static String cleanLabel(@NotNull Locale locale, @NotNull String label, boolean capitalize) {
 		label = CLEAN_SPACES.matcher(label).replaceAll(SPACE);
 		label = CLEAN_P1.matcher(label).replaceAll(CLEAN_P1_REPLACEMENT);
 		label = CLEAN_P2.matcher(label).replaceAll(CLEAN_P2_REPLACEMENT);
-		if (locale.getLanguage().equals(Locale.FRENCH.getLanguage())) {
-			label = WordUtils.capitalize(label, CAPITALIZE_CHARS_FR);
-		} else {
-			label = WordUtils.capitalize(label, CAPITALIZE_CHARS_EN);
+		if (capitalize) {
+			if (locale.getLanguage().equals(Locale.FRENCH.getLanguage())) {
+				label = WordUtils.capitalize(label, CAPITALIZE_CHARS_FR);
+			} else {
+				label = WordUtils.capitalize(label, CAPITALIZE_CHARS_EN);
+			}
 		}
 		label = removePointsI(label); // after capitalize
 		return label.trim();

src/main/java/org/mtransit/commons/StringsCleaner.kt

@@ -149,11 +149,12 @@ object StringsCleaner {
                 string = CleanUtils.ALL_CHARS_REGEX.replace(string, CleanUtils.ALL_CHARS_REGEX_REPLACEMENT)
             }
         }
+        val capitalize = lowerUCStrings || lowerUCWords // only capitalize if lower case was called
         languages?.forEach { language ->
             if (short && string.length > shortMaxLength) {
                 string = CleanUtils.cleanBounds(language, string)
             }
-            string = CleanUtils.cleanLabel(language, string)
+            string = CleanUtils.cleanLabel(language, string, capitalize)
         }
         return string
     }

src/test/java/org/mtransit/commons/StringsCleanerTests.kt

@@ -1,5 +1,6 @@
 package org.mtransit.commons
 
+import java.util.Locale
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -39,4 +40,29 @@ class StringsCleanerTests {
             assertEquals("Angora/Gascon/Terrebonne/Cégep Terrebonne", result)
         }
     }
+
+    @Test
+    fun test_cleanRouteLongName() {
+        "Tunney's Pasture <> Bridlewood".let {
+            StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3)
+        }.let { result ->
+            assertEquals("Tunney's Pasture <> Bridlewood", result)
+        }
+        "Tunney's Pasture <> Bridlewood".let {
+            StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.FRENCH, Locale.ENGLISH), routeType = 3)
+        }.let { result ->
+            assertEquals("Tunney's Pasture <> Bridlewood", result)
+        }
+        "Tunney's Pasture <> Bridlewood".let {
+            StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH, Locale.FRENCH), routeType = 3)
+        }.let { result ->
+            assertEquals("Tunney's Pasture <> Bridlewood", result)
+        }
+        "Tunney's Pasture <> Bridlewood".let {
+            StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH, Locale.FRENCH), routeType = 3, lowerUCWords = true)
+        }.let { result ->
+            assertEquals("Tunney'S Pasture <> Bridlewood", result) // too bad
+        }
+
+    }
 }