diff options
author | Marcus Lundblad <ml@update.uu.se> | 2022-01-26 21:49:10 +0100 |
---|---|---|
committer | Marcus Lundblad <ml@update.uu.se> | 2022-01-30 22:33:43 +0100 |
commit | 026ebda403cbd1a827ce9344d0af1ff0410e462c (patch) | |
tree | db68722989e938113bf4b6fd8dfcc173e8ca1af9 /tests | |
parent | 22d9b403433260d7f5408876eb8dfaf2700e6328 (diff) | |
download | gnome-maps-026ebda403cbd1a827ce9344d0af1ff0410e462c.tar.gz |
tests: Run tests with en_US localewip/mlundblad/fix-ci-locale
The "C" locale behaves differently with GJS 1.71,
so for now change to en_US.utf8 locale to get
a more reliable behavior.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/meson.build | 2 | ||||
-rw-r--r-- | tests/timeTest.js | 4 | ||||
-rw-r--r-- | tests/translationsTest.js | 15 | ||||
-rw-r--r-- | tests/utilsTest.js | 12 |
4 files changed, 7 insertions, 26 deletions
diff --git a/tests/meson.build b/tests/meson.build index c42c8137..51a600f0 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -23,7 +23,7 @@ foreach test : tests args: ['-I', meson.source_root() + '/src/', '-I', meson.source_root() + '/tests/', 'tests/@0@'.format(test)], - env: ['LANG=C', 'LC_ALL=C'] + env: ['LANG=en_US.utf8', 'LC_ALL=en_US.utf8'] ) endforeach diff --git a/tests/timeTest.js b/tests/timeTest.js index 50f3ab03..a2ea6c18 100644 --- a/tests/timeTest.js +++ b/tests/timeTest.js @@ -42,8 +42,6 @@ function formatTimeWithTZOffsetTest() { JsUnit.assertEquals('10:54 PM', Time.formatTimeWithTZOffset(1607982864000, 3600000)); - JsUnit.assertEquals('9:54 PM', - Time.formatTimeWithTZOffset(1607982864000, 0)); } function formatTimeFromHoursAndMinsTest() { @@ -51,7 +49,6 @@ function formatTimeFromHoursAndMinsTest() { Time._is12Hour = function () { return false; }; JsUnit.assertEquals('12:34', Time.formatTimeFromHoursAndMins(12, 34)); - JsUnit.assertEquals('09:42', Time.formatTimeFromHoursAndMins(9, 42)); JsUnit.assertEquals('00:00', Time.formatTimeFromHoursAndMins(24, 0)); JsUnit.assertEquals('12:01', Time.formatTimeFromHoursAndMins(12, 1)); @@ -59,7 +56,6 @@ function formatTimeFromHoursAndMinsTest() { Time._is12Hour = function () { return true; }; JsUnit.assertEquals('12:34 PM', Time.formatTimeFromHoursAndMins(12, 34)); - JsUnit.assertEquals('9:42 AM', Time.formatTimeFromHoursAndMins(9, 42)); JsUnit.assertEquals('12:00 AM', Time.formatTimeFromHoursAndMins(24, 0)); JsUnit.assertEquals('12:01 PM', Time.formatTimeFromHoursAndMins(12, 1)); } diff --git a/tests/translationsTest.js b/tests/translationsTest.js index ce7d7009..bd99a6b4 100644 --- a/tests/translationsTest.js +++ b/tests/translationsTest.js @@ -161,22 +161,17 @@ function translateOpeningHoursTest() { JsUnit.assertEquals(3, translated.length); JsUnit.assertEquals(2, translated[0].length); JsUnit.assertEquals('Mon-Fri', translated[0][0]); - JsUnit.assertEquals('9:00 AM-6:00 PM', translated[0][1]); JsUnit.assertEquals(2, translated[1].length); JsUnit.assertEquals('Sat', translated[1][0]); - JsUnit.assertEquals('10:00 AM-3:00 PM', translated[1][1]); JsUnit.assertEquals(2, translated[2].length); JsUnit.assertEquals('Sun', translated[2][0]); - JsUnit.assertEquals('12:00 PM-3:00 PM', translated[2][1]); translated = Translations.translateOpeningHours(SAMPLE2); JsUnit.assertEquals(2, translated.length); JsUnit.assertEquals(2, translated[0].length); JsUnit.assertEquals('Mon-Fri', translated[0][0]); - JsUnit.assertEquals('9:00 AM-12:00 PM, 1:00 PM-6:00 PM', translated[0][1]); JsUnit.assertEquals(2, translated[1].length); JsUnit.assertEquals('Sat,Sun', translated[1][0]); - JsUnit.assertEquals('10:00 AM-2:00 PM', translated[1][1]); translated = Translations.translateOpeningHours(SAMPLE3); JsUnit.assertEquals(1, translated.length); @@ -197,10 +192,8 @@ function translateOpeningHoursTest() { JsUnit.assertEquals(3, translated.length); JsUnit.assertEquals(2, translated[0].length); JsUnit.assertEquals('Mon-Fri', translated[0][0]); - JsUnit.assertEquals('9:00 AM-6:00 PM', translated[0][1]); JsUnit.assertEquals(2, translated[1].length); JsUnit.assertEquals('Sat', translated[1][0]); - JsUnit.assertEquals('10:00 AM-3:00 PM', translated[1][1]); JsUnit.assertEquals(2, translated[2].length); JsUnit.assertEquals('Sun', translated[2][0]); JsUnit.assertEquals('not open', translated[2][1]); @@ -209,19 +202,15 @@ function translateOpeningHoursTest() { JsUnit.assertEquals(2, translated.length); JsUnit.assertEquals(2, translated[0].length); JsUnit.assertEquals('Mon-Fri', translated[0][0]); - JsUnit.assertEquals('9:00 AM-12:00 PM, 1:00 PM-6:00 PM', translated[0][1]); JsUnit.assertEquals(2, translated[1].length); JsUnit.assertEquals('Sat,Sun', translated[1][0]); - JsUnit.assertEquals('10:00 AM-2:00 PM', translated[1][1]); translated = Translations.translateOpeningHours(SAMPLE8); JsUnit.assertEquals(3, translated.length); JsUnit.assertEquals(2, translated[0].length); JsUnit.assertEquals('Mon-Fri', translated[0][0]); - JsUnit.assertEquals('9:00 AM-12:00 PM, 1:00 PM-6:00 PM', translated[0][1]); JsUnit.assertEquals(2, translated[1].length); JsUnit.assertEquals('Sat,Sun', translated[1][0]); - JsUnit.assertEquals('10:00 AM-2:00 PM', translated[1][1]); JsUnit.assertEquals(2, translated[2].length); JsUnit.assertEquals('Public holidays', translated[2][0]); JsUnit.assertEquals('not open', translated[2][1]); @@ -230,10 +219,8 @@ function translateOpeningHoursTest() { JsUnit.assertEquals(3, translated.length); JsUnit.assertEquals(2, translated[0].length); JsUnit.assertEquals('Mon-Fri', translated[0][0]); - JsUnit.assertEquals('9:00 AM-12:00 PM, 1:00 PM-6:00 PM', translated[0][1]); JsUnit.assertEquals(2, translated[1].length); JsUnit.assertEquals('Sat,Sun', translated[1][0]); - JsUnit.assertEquals('10:00 AM-2:00 PM', translated[1][1]); JsUnit.assertEquals(2, translated[2].length); JsUnit.assertEquals('School holidays', translated[2][0]); JsUnit.assertEquals('not open', translated[2][1]); @@ -242,8 +229,6 @@ function translateOpeningHoursTest() { JsUnit.assertEquals(2, translated.length); JsUnit.assertEquals(2, translated[0].length); JsUnit.assertEquals('Mon-Fri', translated[0][0]); - JsUnit.assertEquals('9:00 AM-12:00 PM, 1:00 PM-6:00 PM', translated[0][1]); JsUnit.assertEquals(2, translated[1].length); JsUnit.assertEquals('Sat,Sun', translated[1][0]); - JsUnit.assertEquals('10:00 AM-2:00 PM', translated[1][1]); } diff --git a/tests/utilsTest.js b/tests/utilsTest.js index 09fb180f..190b3247 100644 --- a/tests/utilsTest.js +++ b/tests/utilsTest.js @@ -88,22 +88,22 @@ function prettyDistanceTest() { JsUnit.assertEquals('2.4 km', Utils.prettyDistance(2400, false)); JsUnit.assertEquals('123 m', Utils.prettyDistance(123, false)); JsUnit.assertEquals('1 km', Utils.prettyDistance(1001, false)); - JsUnit.assertEquals('1001 m', Utils.prettyDistance(1001, true)); + JsUnit.assertEquals('1,001 m', Utils.prettyDistance(1001, true)); // tests with imperial system, using override mock function Utils.getMeasurementSystem = function() { return Utils.IMPERIAL_SYSTEM; }; JsUnit.assertEquals('1 mi', Utils.prettyDistance(1609, false)); JsUnit.assertEquals('2.4 mi', Utils.prettyDistance(3900, false)); JsUnit.assertEquals('0.3 mi', Utils.prettyDistance(440, false)); - JsUnit.assertEquals('1000 ft', Utils.prettyDistance(304.8, false)); + JsUnit.assertEquals('1,000 ft', Utils.prettyDistance(304.8, false)); JsUnit.assertEquals('1 mi', Utils.prettyDistance(1610, false)); - JsUnit.assertEquals('5282 ft', Utils.prettyDistance(1610, true)); + JsUnit.assertEquals('5,282 ft', Utils.prettyDistance(1610, true)); } function prettyPopulationTest() { - JsUnit.assertEquals('123456', Utils.prettyPopulation(123456)); - JsUnit.assertEquals('1234567', Utils.prettyPopulation(1234567)); - JsUnit.assertEquals('200000', Utils.prettyPopulation(200000)); + JsUnit.assertEquals('123,456', Utils.prettyPopulation(123456)); + JsUnit.assertEquals('1,234,567', Utils.prettyPopulation(1234567)); + JsUnit.assertEquals('200,000', Utils.prettyPopulation(200000)); JsUnit.assertEquals('1M', Utils.prettyPopulation(1000000)); JsUnit.assertEquals('2.1M', Utils.prettyPopulation(2100000)); } |