Strings cleaners improvements #OCTranspo #2Locales (Part 2) #37
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| package org.mtransit.commons | ||
|
|
||
| import java.util.Locale | ||
| import kotlin.test.BeforeTest | ||
| import kotlin.test.Test | ||
| import kotlin.test.assertEquals | ||
|
|
@@ -11,6 +12,25 @@ class CleanUtilsKtTests { | |
| CommonsApp.setup(false) | ||
| } | ||
|
|
||
| @Test | ||
| fun test_toLowerCaseUpperCaseWords() { | ||
| "MARY'S".let { | ||
| CleanUtils.toLowerCaseUpperCaseWords(Locale.ENGLISH, it) | ||
| }.let { | ||
| assertEquals("mary's", it) | ||
| } | ||
| "d'AYLMER".let { | ||
| CleanUtils.toLowerCaseUpperCaseWords(Locale.FRENCH, it) | ||
| }.let { | ||
| assertEquals("d'aylmer", it) | ||
| } | ||
| "Fallowfield <> Limebank & CFIA ~ ACIA".let { | ||
| CleanUtils.toLowerCaseUpperCaseWords(Locale.ENGLISH, it) | ||
| }.let { | ||
| assertEquals("Fallowfield <> Limebank & CFIA ~ ACIA", it) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun test_keepOrRemoveVia_keepVia() { | ||
| // Arrange | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -495,5 +495,11 @@ public void testRemoveVia_KeepOnlyVia2() { | |
| public void test_toLowerCaseUpperCaseStrings() { | ||
| String result = CleanUtils.toLowerCaseUpperCaseStrings(Locale.ENGLISH, "YMCA ", "YMCA"); | ||
| assertEquals("YMCA ", result); | ||
|
|
||
| result = CleanUtils.toLowerCaseUpperCaseStrings(Locale.ENGLISH, "1 UPPERCASE, ONLY."); | ||
| assertEquals("1 uppercase, only.", result); | ||
|
|
||
| result = CleanUtils.toLowerCaseUpperCaseStrings(Locale.ENGLISH, "2 Uppercase, Capitalized."); | ||
| assertEquals("2 Uppercase, Capitalized.", result); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,21 @@ class StringsCleanerTests { | |
|
|
||
| @BeforeTest | ||
| fun setUp() { | ||
| CommonsApp.setup(false) | ||
| } | ||
|
|
||
| @Test | ||
| fun test_cleanStopName() { | ||
| "Station Mont-Royal".let { stopName -> | ||
| StringsCleaner.cleanStopName(stopName, languages = listOf(Locale.FRENCH), routeType = 1) // subway | ||
| }.let { result -> | ||
| assertEquals("Mont-Royal", result) | ||
| } | ||
| "Station Édouard-Montpetit".let { stopName -> | ||
| StringsCleaner.cleanStopName(stopName, languages = listOf(Locale.FRENCH), routeType = 1) // subway | ||
| }.let { result -> | ||
| assertEquals("Édouard-Montpetit", result) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -39,17 +53,51 @@ class StringsCleanerTests { | |
| }.let { result -> | ||
| assertEquals("Angora/Gascon/Terrebonne/Cégep Terrebonne", result) | ||
| } | ||
| "Bell H.S".let { tripHeadsign -> | ||
| StringsCleaner.cleanTripHeadsign(tripHeadsign, languages = listOf(Locale.ENGLISH), routeType = 3, lowerUCWords = true) | ||
| }.let { result -> | ||
| assertEquals("Bell HS", result) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun test_cleanRouteLongName() { | ||
| "Tenth Line <> Place D'Orléans".let { | ||
| StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3) | ||
| }.let { result -> | ||
| assertEquals("Tenth Line <> Place D'Orléans", result) | ||
| } | ||
| "Line 10".let { | ||
| StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3) | ||
| }.let { result -> | ||
| assertEquals("10", result) | ||
| } | ||
| " Line 10".let { | ||
| StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3) | ||
| }.let { result -> | ||
| assertEquals("10", result) | ||
| } | ||
| "The Line 10".let { | ||
| StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3) | ||
| }.let { result -> | ||
| assertEquals("The 10", result) | ||
| } | ||
| "Online 10".let { | ||
| StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3) | ||
| }.let { result -> | ||
| assertEquals("Online 10", result) | ||
| } | ||
| "John McCrae H.S <> Half Moon Bay".let { | ||
| StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH, Locale.FRENCH), routeType = 3, lowerUCWords = true) | ||
| }.let { result -> | ||
| assertEquals("John McCrae HS <> Half Moon Bay", result) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun test_cleanRouteLongName_Capitalize() { | ||
| "Tunney's Pasture <> Bridlewood".let { | ||
| StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH), routeType = 3) | ||
| }.let { result -> | ||
| assertEquals("Tunney's Pasture <> Bridlewood", result) | ||
| } | ||
|
|
@@ -61,8 +109,17 @@ class StringsCleanerTests { | |
| "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) | ||
| } | ||
| "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) | ||
| } | ||
| "tunney's pasture <> bridlewood".let { | ||
| StringsCleaner.cleanRouteLongName(it, languages = listOf(Locale.ENGLISH, Locale.FRENCH), routeType = 3) | ||
| }.let { result -> | ||
| assertEquals("Tunney's Pasture <> Bridlewood", result) | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The regular expression
FR_STATION_AND_NAMEand its replacement string are completely identical toSTATION_AND_NAMEandSTATION_AND_NAME_REPLACEMENT. Since "station" is spelled the same way in both English and French, you can remove these duplicate definitions and reuse the English ones to reduce redundancy.