zhouxy108/plusone-commons
1
0
Fork 0
forked from plusone/plusone-commons
Code Pull Requests Activity

重构部分代码；修改 API

Browse Source
This commit is contained in:
ZhouXY108
2024-08-26 10:24:07 +08:00
parent c92f4fbd5c
commit fd1126be9b
4 changed files with 101 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/test/java/xyz/zhouxy/plusone/commons/base/QuarterTests.java
View File

@@ -17,21 +17,21 @@ class QuarterTests {
void testQ1() {
Quarter quarter = Quarter.of(1);
assertSame(Quarter.Q1, quarter);
assertSame(quarter, Quarter.of("Q1"));
assertSame(quarter, Quarter.valueOf("Q1"));
assertEquals(1, quarter.getValue());
assertEquals("Q1", quarter.getDisplayName());
assertEquals("Q1", quarter.name());
assertThrows(EnumConstantNotPresentException.class, () -> {
assertThrows(IllegalArgumentException.class, () -> {
Quarter.of(0);
});
// ==========
int startMonthValue = quarter.getStartMonthValue();
int startMonthValue = quarter.firstMonthValue();
log.info("startMonthValue: {}", startMonthValue);
assertEquals(1, startMonthValue);
Month startMonth = quarter.getStartMonth();
Month startMonth = quarter.firstMonth();
log.info("startMonth: {}", startMonth);
assertEquals(Month.JANUARY, startMonth);
@@ -39,11 +39,11 @@ class QuarterTests {
// ==========
int lastMonthValue = quarter.getLastMonthValue();
int lastMonthValue = quarter.lastMonthValue();
log.info("lastMonthValue: {}", lastMonthValue);
assertEquals(3, lastMonthValue);
Month lastMonth = quarter.getLastMonth();
Month lastMonth = quarter.lastMonth();
log.info("lastMonth: {}", lastMonth);
assertEquals(Month.MARCH, lastMonth);
@@ -51,11 +51,11 @@ class QuarterTests {
// ==========
MonthDay startMonthDay = quarter.getStartMonthDay();
MonthDay startMonthDay = quarter.firstMonthDay();
log.info("startMonthDay: {}", startMonthDay);
assertEquals(startMonthDay, MonthDay.of(1, 1));
MonthDay lastMonthDay = quarter.getLastMonthDay();
MonthDay lastMonthDay = quarter.lastMonthDay();
log.info("lastMonthDay: {}", lastMonthDay);
assertEquals(lastMonthDay, MonthDay.of(3, 31));
}
@@ -64,21 +64,21 @@ class QuarterTests {
void testQ2() {
Quarter quarter = Quarter.of(2);
assertSame(Quarter.Q2, quarter);
assertSame(quarter, Quarter.of("Q2"));
assertSame(quarter, Quarter.valueOf("Q2"));
assertEquals(2, quarter.getValue());
assertEquals("Q2", quarter.getDisplayName());
assertEquals("Q2", quarter.name());
assertThrows(EnumConstantNotPresentException.class, () -> {
assertThrows(IllegalArgumentException.class, () -> {
Quarter.of(5);
});
// ==========
int startMonthValue = quarter.getStartMonthValue();
int startMonthValue = quarter.firstMonthValue();
log.info("startMonthValue: {}", startMonthValue);
assertEquals(4, startMonthValue);
Month startMonth = quarter.getStartMonth();
Month startMonth = quarter.firstMonth();
log.info("startMonth: {}", startMonth);
assertEquals(Month.APRIL, startMonth);
@@ -86,11 +86,11 @@ class QuarterTests {
// ==========
int lastMonthValue = quarter.getLastMonthValue();
int lastMonthValue = quarter.lastMonthValue();
log.info("lastMonthValue: {}", lastMonthValue);
assertEquals(6, lastMonthValue);
Month lastMonth = quarter.getLastMonth();
Month lastMonth = quarter.lastMonth();
log.info("lastMonth: {}", lastMonth);
assertEquals(Month.JUNE, lastMonth);
@@ -98,11 +98,11 @@ class QuarterTests {
// ==========
MonthDay startMonthDay = quarter.getStartMonthDay();
MonthDay startMonthDay = quarter.firstMonthDay();
log.info("startMonthDay: {}", startMonthDay);
assertEquals(startMonthDay, MonthDay.of(4, 1));
MonthDay lastMonthDay = quarter.getLastMonthDay();
MonthDay lastMonthDay = quarter.lastMonthDay();
log.info("lastMonthDay: {}", lastMonthDay);
assertEquals(lastMonthDay, MonthDay.of(6, 30));
}
@@ -111,21 +111,21 @@ class QuarterTests {
void testQ3() {
Quarter quarter = Quarter.of(3);
assertSame(Quarter.Q3, quarter);
assertSame(quarter, Quarter.of("Q3"));
assertSame(quarter, Quarter.valueOf("Q3"));
assertEquals(3, quarter.getValue());
assertEquals("Q3", quarter.getDisplayName());
assertEquals("Q3", quarter.name());
assertThrows(EnumConstantNotPresentException.class, () -> {
Quarter.of("Abc");
assertThrows(IllegalArgumentException.class, () -> {
Quarter.valueOf("Abc");
});
// ==========
int startMonthValue = quarter.getStartMonthValue();
int startMonthValue = quarter.firstMonthValue();
log.info("startMonthValue: {}", startMonthValue);
assertEquals(7, startMonthValue);
Month startMonth = quarter.getStartMonth();
Month startMonth = quarter.firstMonth();
log.info("startMonth: {}", startMonth);
assertEquals(Month.JULY, startMonth);
@@ -133,11 +133,11 @@ class QuarterTests {
// ==========
int lastMonthValue = quarter.getLastMonthValue();
int lastMonthValue = quarter.lastMonthValue();
log.info("lastMonthValue: {}", lastMonthValue);
assertEquals(9, lastMonthValue);
Month lastMonth = quarter.getLastMonth();
Month lastMonth = quarter.lastMonth();
log.info("lastMonth: {}", lastMonth);
assertEquals(Month.SEPTEMBER, lastMonth);
@@ -145,11 +145,11 @@ class QuarterTests {
// ==========
MonthDay startMonthDay = quarter.getStartMonthDay();
MonthDay startMonthDay = quarter.firstMonthDay();
log.info("startMonthDay: {}", startMonthDay);
assertEquals(startMonthDay, MonthDay.of(7, 1));
MonthDay lastMonthDay = quarter.getLastMonthDay();
MonthDay lastMonthDay = quarter.lastMonthDay();
log.info("lastMonthDay: {}", lastMonthDay);
assertEquals(lastMonthDay, MonthDay.of(9, 30));
}
@@ -158,21 +158,21 @@ class QuarterTests {
void testQ4() {
Quarter quarter = Quarter.of(4);
assertSame(Quarter.Q4, quarter);
assertSame(quarter, Quarter.of("Q4"));
assertSame(quarter, Quarter.valueOf("Q4"));
assertEquals(4, quarter.getValue());
assertEquals("Q4", quarter.getDisplayName());
assertEquals("Q4", quarter.name());
assertThrows(EnumConstantNotPresentException.class, () -> {
Quarter.of("Q5");
assertThrows(IllegalArgumentException.class, () -> {
Quarter.valueOf("Q5");
});
// ==========
int startMonthValue = quarter.getStartMonthValue();
int startMonthValue = quarter.firstMonthValue();
log.info("startMonthValue: {}", startMonthValue);
assertEquals(10, startMonthValue);
Month startMonth = quarter.getStartMonth();
Month startMonth = quarter.firstMonth();
log.info("startMonth: {}", startMonth);
assertEquals(Month.OCTOBER, startMonth);
@@ -180,10 +180,10 @@ class QuarterTests {
// ==========
int lastMonthValue = quarter.getLastMonthValue();
int lastMonthValue = quarter.lastMonthValue();
log.info("lastMonthValue: {}", lastMonthValue);
assertEquals(12, lastMonthValue);
Month lastMonth = quarter.getLastMonth();
Month lastMonth = quarter.lastMonth();
log.info("lastMonth: {}", lastMonth);
assertEquals(Month.DECEMBER, lastMonth);
@@ -191,11 +191,11 @@ class QuarterTests {
// ==========
MonthDay startMonthDay = quarter.getStartMonthDay();
MonthDay startMonthDay = quarter.firstMonthDay();
log.info("startMonthDay: {}", startMonthDay);
assertEquals(startMonthDay, MonthDay.of(10, 1));
MonthDay lastMonthDay = quarter.getLastMonthDay();
MonthDay lastMonthDay = quarter.lastMonthDay();
log.info("lastMonthDay: {}", lastMonthDay);
assertEquals(lastMonthDay, MonthDay.of(12, 31));
}

8
src/test/java/xyz/zhouxy/plusone/commons/base/YearQuarterTests.java
View File

@@ -42,13 +42,13 @@ public class YearQuarterTests {
Quarter quarter = Quarter.of(qrtr);
YearQuarter yearQuarter = YearQuarter.of(year, quarter);
LocalDate expectedStartDate = quarter.getStartMonthDay().atYear(year);
LocalDate expectedStartDate = quarter.firstMonthDay().atYear(year);
log.info("{} - expectedStartDate: {}", yearQuarter, expectedStartDate);
LocalDate expectedEndDate = quarter.getLastMonthDay().atYear(year);
LocalDate expectedEndDate = quarter.lastMonthDay().atYear(year);
log.info("{} - expectedEndDate: {}", yearQuarter, expectedEndDate);
assertEquals(expectedStartDate, yearQuarter.getStartDate());
assertEquals(expectedEndDate, yearQuarter.getLastDate());
assertEquals(expectedStartDate, yearQuarter.firstDate());
assertEquals(expectedEndDate, yearQuarter.lastDate());
}
}
}