Skip to content

Commit 1d8ba7d

Browse files
Merge branch 'main' into test
2 parents 27f71bf + 0edc592 commit 1d8ba7d

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: ./gradlew build
4646

4747
- name: Upload test results
48-
uses: actions/upload-artifact@v5.0.0
48+
uses: actions/upload-artifact@v6.0.0
4949
if: always()
5050
with:
5151
name: test-results
@@ -71,7 +71,7 @@ jobs:
7171
core.setFailed('Overall coverage is less than 85%!')
7272
7373
- name: Upload build artifacts
74-
uses: actions/upload-artifact@v5.0.0
74+
uses: actions/upload-artifact@v6.0.0
7575
with:
7676
name: build-artifacts
7777
path: build/libs/*.jar

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
github-token: ${{ secrets.GITHUB_TOKEN }}
107107

108108
- name: Upload build artifacts
109-
uses: actions/upload-artifact@v5.0.0
109+
uses: actions/upload-artifact@v6.0.0
110110
if: always()
111111
with:
112112
name: build-artifacts

src/test/java/dev/toonformat/jtoon/normalizer/JsonNormalizerTest.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.time.ZoneId;
3131
import java.time.ZoneOffset;
3232
import java.time.ZonedDateTime;
33+
import java.time.format.DateTimeFormatter;
3334
import java.util.Calendar;
3435
import java.util.Collection;
3536
import java.util.Date;
@@ -488,7 +489,8 @@ void testSQLTime() {
488489

489490
// Then
490491
assertTrue(result.isString());
491-
assertEquals("11:40:19", result.asString());
492+
String expected = time.toLocalTime().format(DateTimeFormatter.ISO_LOCAL_TIME);
493+
assertEquals(expected, result.asString());
492494
}
493495

494496
@Test
@@ -502,7 +504,8 @@ void testSQLTimeStamp() {
502504

503505
// Then
504506
assertTrue(result.isString());
505-
assertEquals("1970-01-21T11:40:19.274", result.asString());
507+
String expected = dateTime.toLocalDateTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME);
508+
assertEquals(expected, result.asString());
506509
}
507510

508511

@@ -1569,7 +1572,8 @@ void givenCalendar_whenTryNormalizeTemporal_thenIsoStringNode() throws Exception
15691572

15701573
// Then
15711574
assertInstanceOf(StringNode.class, result);
1572-
assertEquals("2017-02-16T19:22:28Z", ((JsonNode) result).asString());
1575+
String expected = input.toInstant().toString();
1576+
assertEquals(expected, ((JsonNode) result).asString());
15731577
}
15741578

15751579
@Test
@@ -1583,7 +1587,8 @@ void givenGregorianCalendar_whenTryNormalizeTemporal_thenIsoStringNode() throws
15831587

15841588
// Then
15851589
assertInstanceOf(StringNode.class, result);
1586-
assertEquals("2017-02-16T19:22:28Z", ((JsonNode) result).asString());
1590+
String expected = input.toInstant().toString();
1591+
assertEquals(expected, ((JsonNode) result).asString());
15871592
}
15881593

15891594
@Test

0 commit comments

Comments
 (0)