From 6c7d63930e8383428c1ff30974d594fcca01754c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Tue, 16 Jun 2026 10:54:27 -0400 Subject: [PATCH 1/3] `JSON` > fix `use_route_long_name_for_missing_route_short_name` --- .../java/org/mtransit/parser/DefaultAgencyTools.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/mtransit/parser/DefaultAgencyTools.java b/src/main/java/org/mtransit/parser/DefaultAgencyTools.java index 86de091..d237769 100644 --- a/src/main/java/org/mtransit/parser/DefaultAgencyTools.java +++ b/src/main/java/org/mtransit/parser/DefaultAgencyTools.java @@ -601,9 +601,15 @@ public String getRouteShortName(@NotNull GRoute gRoute) { return gRoute.getRouteLongNameOrDefault(); } //noinspection DiscouragedApi - final String routeShortName = + String routeShortName = useRouteIdForRouteShortName() ? gRoute.getRouteId() + // : useRouteLongNameForRouteShortName() ? gRoute.getRouteLongNameOrDefault() : gRoute.getRouteShortName(); + if (org.mtransit.commons.StringUtils.isEmpty(routeShortName)) { + if (Configs.getRouteConfig().getUseRouteLongNameForMissingRouteShortName()) { + routeShortName = gRoute.getRouteLongNameOrDefault(); + } + } if (org.mtransit.commons.StringUtils.isEmpty(routeShortName)) { return provideMissingRouteShortName(gRoute); } @@ -628,9 +634,6 @@ public String provideMissingRouteShortName(@NotNull GRoute gRoute) { if (routeShortNameFromConfig != null) { return routeShortNameFromConfig; } - if (Configs.getRouteConfig().getUseRouteLongNameForMissingRouteShortName()) { - return gRoute.getRouteLongNameOrDefault(); - } throw new MTLog.Fatal("No default route short name for %s!", gRoute.toStringPlus()); } From 88ad81f8351e725d9f4d92aff5efbe6e51b27c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Tue, 16 Jun 2026 10:57:13 -0400 Subject: [PATCH 2/3] PR comments --- src/main/java/org/mtransit/parser/DefaultAgencyTools.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/mtransit/parser/DefaultAgencyTools.java b/src/main/java/org/mtransit/parser/DefaultAgencyTools.java index d237769..f9ce518 100644 --- a/src/main/java/org/mtransit/parser/DefaultAgencyTools.java +++ b/src/main/java/org/mtransit/parser/DefaultAgencyTools.java @@ -603,12 +603,10 @@ public String getRouteShortName(@NotNull GRoute gRoute) { //noinspection DiscouragedApi String routeShortName = useRouteIdForRouteShortName() ? gRoute.getRouteId() - // : useRouteLongNameForRouteShortName() ? gRoute.getRouteLongNameOrDefault() : gRoute.getRouteShortName(); - if (org.mtransit.commons.StringUtils.isEmpty(routeShortName)) { - if (Configs.getRouteConfig().getUseRouteLongNameForMissingRouteShortName()) { - routeShortName = gRoute.getRouteLongNameOrDefault(); - } + if (org.mtransit.commons.StringUtils.isEmpty(routeShortName) + && Configs.getRouteConfig().getUseRouteLongNameForMissingRouteShortName()) { + routeShortName = gRoute.getRouteLongNameOrDefault(); } if (org.mtransit.commons.StringUtils.isEmpty(routeShortName)) { return provideMissingRouteShortName(gRoute); From cdea7c1cd3ee60d25dde956003a94454f3f630cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Tue, 16 Jun 2026 11:08:54 -0400 Subject: [PATCH 3/3] fix TimeZone in test --- .../java/org/mtransit/commons/DateUtils.kt | 2 +- .../java/org/mtransit/commons/DateUtilsTest.kt | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mtransit/commons/DateUtils.kt b/src/main/java/org/mtransit/commons/DateUtils.kt index e59c016..df0dd62 100644 --- a/src/main/java/org/mtransit/commons/DateUtils.kt +++ b/src/main/java/org/mtransit/commons/DateUtils.kt @@ -6,7 +6,7 @@ import java.util.Date object DateUtils { @JvmStatic - fun addYears(date: Date, years: Int) = + fun addYears(date: Date, years: Int): Date = Calendar.getInstance().apply { time = date add(Calendar.YEAR, years) diff --git a/src/test/java/org/mtransit/commons/DateUtilsTest.kt b/src/test/java/org/mtransit/commons/DateUtilsTest.kt index d99824b..ee3692e 100644 --- a/src/test/java/org/mtransit/commons/DateUtilsTest.kt +++ b/src/test/java/org/mtransit/commons/DateUtilsTest.kt @@ -1,17 +1,33 @@ package org.mtransit.commons import java.util.Date +import java.util.TimeZone +import kotlin.test.AfterTest +import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertEquals class DateUtilsTest { + private var originalTimeZone: TimeZone = TimeZone.getDefault() + + @BeforeTest + fun setUp() { + originalTimeZone = TimeZone.getDefault() + TimeZone.setDefault(TimeZone.getTimeZone("UTC")) + } + + @AfterTest + fun tearDown() { + TimeZone.setDefault(originalTimeZone) + } + @Test fun test_getEndOfYear() { Date(1781570388_000L).let { // Monday, June 15, 2026 at 20:39:48 UTC-04:00 DST DateUtils.getEndOfYear(it) }.let { result -> - assertEquals(1798779599_999L, result.time) + assertEquals(1798761599_999L, result.time) } } }