Handle zero-offset timezone in logging test

scottfrederick · scottfrederick · commit 7dd8dfc19741 · 2022-05-03T17:48:09.000-05:00
See gh-28654
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
@@ -554,7 +554,7 @@ void testDateformatPatternDefault(CapturedOutput output) {
 		initialize(loggingInitializationContext, null, null);
 		this.logger.info("Hello world");
 		assertThat(getLineWithText(output, "Hello world"))
-				.containsPattern("\\d{4}-\\d{2}\\-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}[-+]\\d{2}:\\d{2}");
+				.containsPattern("\\d{4}-\\d{2}\\-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}([-+]\\d{2}:\\d{2}|Z)");
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ void testDateformatPatternDefault(CapturedOutput output) {`
`554`	`554`	`initialize(loggingInitializationContext, null, null);`
`555`	`555`	`this.logger.info("Hello world");`
`556`	`556`	`assertThat(getLineWithText(output, "Hello world"))`
`557`		`- .containsPattern("\\d{4}-\\d{2}\\-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}[-+]\\d{2}:\\d{2}");`
	`557`	`+ .containsPattern("\\d{4}-\\d{2}\\-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}([-+]\\d{2}:\\d{2}\|Z)");`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`@Test`