From 8b8971e94db61fb346598a2402d65c8ddb196d6b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 03 十月 2026 20:23:30 +0800
Subject: [PATCH] fix(holiday): 快报民航累计同比只与往年已覆盖日期比较
---
traffic-audit-server/src/test/java/com/trafficaudit/holiday/service/HolidayBulletinServiceTest.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/traffic-audit-server/src/test/java/com/trafficaudit/holiday/service/HolidayBulletinServiceTest.java b/traffic-audit-server/src/test/java/com/trafficaudit/holiday/service/HolidayBulletinServiceTest.java
index 4830de8..7f585b3 100644
--- a/traffic-audit-server/src/test/java/com/trafficaudit/holiday/service/HolidayBulletinServiceTest.java
+++ b/traffic-audit-server/src/test/java/com/trafficaudit/holiday/service/HolidayBulletinServiceTest.java
@@ -1,11 +1,19 @@
package com.trafficaudit.holiday.service;
+import com.trafficaudit.holiday.service.HolidayStatService.DailyMetrics;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
import java.math.BigDecimal;
+import java.util.function.Function;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
class HolidayBulletinServiceTest {
@@ -21,6 +29,63 @@
assertEquals("鈥�", ratio(service, "100", "0"));
}
+ @Test
+ void comparesCivilAviationOnlyThroughCoveredDay() throws Exception {
+ HolidayStatService stat = mock(HolidayStatService.class);
+ HolidayBulletinService service = new HolidayBulletinService(stat);
+
+ DailyMetrics current = new DailyMetrics();
+ current.setYear(2026);
+ current.setHolidayType("NATIONAL_DAY");
+ current.setDayIndex(2);
+
+ DailyMetrics coveredDay = new DailyMetrics();
+ coveredDay.setCivilAviation(new BigDecimal("6.7482"));
+ DailyMetrics missingDay = new DailyMetrics();
+
+ when(stat.dailyMetrics(2026, "NATIONAL_DAY", 2)).thenReturn(missingDay);
+ when(stat.dailyMetrics(2026, "NATIONAL_DAY", 1)).thenReturn(coveredDay);
+
+ DailyMetrics previousYear = new DailyMetrics();
+ previousYear.setYear(2025);
+ DailyMetrics previousYearThroughDay1 = new DailyMetrics();
+ previousYearThroughDay1.setCivilAviation(new BigDecimal("7.5003"));
+ when(stat.cumulativeMetrics(2025, "NATIONAL_DAY", 1)).thenReturn(previousYearThroughDay1);
+
+ Object result = comparableCumulative(service, current, previousYear, DailyMetrics::getCivilAviation);
+
+ assertSame(previousYearThroughDay1, result);
+ verify(stat).cumulativeMetrics(2025, "NATIONAL_DAY", 1);
+ verify(stat, never()).cumulativeMetrics(2025, "NATIONAL_DAY", 2);
+ }
+
+ @Test
+ void comparableCumulativeIsNullWhenCurrentYearHasNoMetricData() throws Exception {
+ HolidayStatService stat = mock(HolidayStatService.class);
+ HolidayBulletinService service = new HolidayBulletinService(stat);
+
+ DailyMetrics current = new DailyMetrics();
+ current.setYear(2026);
+ current.setHolidayType("NATIONAL_DAY");
+ current.setDayIndex(2);
+ when(stat.dailyMetrics(2026, "NATIONAL_DAY", 2)).thenReturn(new DailyMetrics());
+ when(stat.dailyMetrics(2026, "NATIONAL_DAY", 1)).thenReturn(new DailyMetrics());
+
+ Object result = comparableCumulative(service, current, new DailyMetrics(), DailyMetrics::getCivilAviation);
+
+ assertNull(result);
+ verify(stat, never()).cumulativeMetrics(0, "NATIONAL_DAY", 1);
+ }
+
+ private Object comparableCumulative(HolidayBulletinService service, DailyMetrics current,
+ DailyMetrics comparisonYear,
+ Function<DailyMetrics, BigDecimal> selector) throws Exception {
+ Method method = HolidayBulletinService.class.getDeclaredMethod(
+ "comparableCumulative", DailyMetrics.class, DailyMetrics.class, Function.class);
+ method.setAccessible(true);
+ return method.invoke(service, current, comparisonYear, selector);
+ }
+
private String ratio(HolidayBulletinService service, String current, String base) throws Exception {
Method method = HolidayBulletinService.class.getDeclaredMethod("ratio", BigDecimal.class, BigDecimal.class);
method.setAccessible(true);
--
Gitblit v1.9.1