Skip to content

Make 'default' timezone deterministic in ConverterTest #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make 'default' timezone deterministic in ConverterTest #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions ...n-blackbox/src/test/java/ch/qos/logback/access/common/blackbox/pattern/ConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.TimeZone;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down Expand Up @@ -79,8 +80,20 @@ public void testContentLengthConverter() {
}

@Test
public void testDateConverter() {
dateConverterChecker(parseDateAsMillis("2024-08-14T15:29:25.956Z"), List.of(), "14/.../2024:17:29:25 \\+\\d*");
public void testDateConverterWithDefaultTimezone() {
TimeZone originalTimeZone = TimeZone.getDefault();
try {
// Set a known timezone for deterministic testing
TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
dateConverterChecker(parseDateAsMillis("2024-08-14T15:29:25.956Z"), List.of(), "14/.../2024:17:29:25 \\+\\d*");
} finally {
// Restore original timezone
TimeZone.setDefault(originalTimeZone);
}
}

@Test
public void testDateConverterWithExplicitTimezone() {
dateConverterChecker(parseDateAsMillis("2022-10-21T10:30:20.800Z"), List.of(CoreConstants.CLF_DATE_PATTERN, "Australia/Sydney", "en-AU"),
"21/Oct/2022:21:30:20 \\+1100");
dateConverterChecker(parseDateAsMillis("2022-09-21T10:30:20.800Z"), List.of(CoreConstants.CLF_DATE_PATTERN, "UTC", "en"),
Expand Down Expand Up @@ -111,6 +124,7 @@ void dateConverterChecker(long millis, List<String> options, String regex) {
assertTrue(result.matches(regex));
}

@Test
public void testLineLocalPortConverter() {
LocalPortConverter converter = new LocalPortConverter();
converter.start();
Expand Down