refactoring

Author: m.zharinova

spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/controllers/TimeControllerTest.java

@@ -170,7 +170,7 @@ void mdcValuesShouldBeReportedInLogs(@Nonnull final CapturedOutput output) {
 
     @SneakyThrows
     @Test
-    void spanShouldBeReportedInRetryLogs(@Nonnull final CapturedOutput output) {
+    void spanAndMdcShouldBeReportedWhenRetry(@Nonnull final CapturedOutput output) {
         final String zoneNames = TimeZone.getDefault().getID();
         final RuntimeException exception = new RuntimeException("Retries exhausted");
         stubFor(get(urlPathMatching("/" + zoneNames))
@@ -217,6 +217,11 @@ void spanShouldBeReportedInRetryLogs(@Nonnull final CapturedOutput output) {
             .pollInterval(Duration.ofMillis(500L))
             .until(() -> countRecordsInTable() >= 1L);
         assertThat(output.getAll())
-            .contains("Received record: " + received.value() + " with traceId " + traceId);
+            .contains(
+                "Received record: " + received.value() + " with traceId " + traceId,
+                "Retrying request to ",
+                "Retries exhausted",
+                "\"instance_timezone\":\"" + zoneNames + "\""
+            );
     }
 }

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/controllers/TimeControllerTest.java

@@ -169,7 +169,7 @@ void mdcValuesShouldBeReportedInLogs(@Nonnull final CapturedOutput output) {
 
     @SneakyThrows
     @Test
-    void mdcValuesShouldBeReportedInRetryLogs(@Nonnull final CapturedOutput output) {
+    void mdcValuesShouldBeReportedWhenRetry(@Nonnull final CapturedOutput output) {
         final String zoneNames = TimeZone.getDefault().getID();
         final RuntimeException exception = new RuntimeException("Retries exhausted");
         stubFor(get(urlPathMatching("/" + zoneNames))
@@ -216,11 +216,11 @@ void mdcValuesShouldBeReportedInRetryLogs(@Nonnull final CapturedOutput output)
             .pollInterval(Duration.ofMillis(500L))
             .until(() -> countRecordsInTable() >= 1L);
         assertThat(output.getAll())
-            .contains("Received record: " + received.value() + " with traceId " + traceId);
-        assertThat(output.getAll()).contains("Retrying request to ", "Retries exhausted", "\"instance_timezone\":\"" + zoneNames + "\"");
-        final String messageFromDb = namedParameterJdbcTemplate.queryForObject("select message from otel_demo.storage where trace_id = :traceId",
-            Map.of("traceId", traceId), String.class);
-        assertThat(messageFromDb)
-            .isEqualTo(received.value());
+            .contains(
+                "Received record: " + received.value() + " with traceId " + traceId,
+                "Retrying request to ",
+                "Retries exhausted",
+                "\"instance_timezone\":\"" + zoneNames + "\""
+            );
     }
 }