combine outputs, add test retries

Author: m.zharinova

buildSrc/build.gradle.kts

@@ -13,4 +13,5 @@ dependencies {
     implementation("gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.7.3")
     implementation("de.thetaphi:forbiddenapis:3.8")
     implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.0")
+    implementation("org.gradle:test-retry-gradle-plugin:1.6.1")
 }

buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts

@@ -18,6 +18,7 @@ plugins {
     id("com.github.spotbugs")
     id("net.ltgt.errorprone")
     id("com.google.osdetector")
+    id("org.gradle.test-retry")
 }
 
 dependencies {
@@ -95,6 +96,12 @@ tasks {
         dependsOn(checkstyleMain, checkstyleTest, pmdMain, pmdTest, spotbugsMain, spotbugsTest)
         finalizedBy(jacocoTestReport, jacocoTestCoverageVerification)
         maxParallelForks = 1
+
+        retry {
+            maxRetries.set(1)
+            maxFailures.set(3)
+            failOnPassedAfterRetry.set(false)
+        }
     }
 
     jacocoTestCoverageVerification {

spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/service/PublicApiServiceTest.java

@@ -56,7 +56,7 @@ void getZonedTimeSuccessfully(@Nonnull final CapturedOutput output) throws JsonP
         assertThat(result).isNotNull();
         assertThat(result.truncatedTo(ChronoUnit.MINUTES))
             .isEqualTo(localDateTimeNow.truncatedTo(ChronoUnit.MINUTES));
-        assertThat(output).doesNotContain(
+        assertThat(output.getAll()).doesNotContain(
             "Retrying request to ",
             "Retries exhausted",
             "Failed to convert response ",
@@ -78,8 +78,7 @@ void retriesOnceToGetZonedTime(@Nonnull final CapturedOutput output) throws Json
         verify(2, getRequestedFor(urlPathMatching("/" + zoneNames)));
 
         assertThat(result).isNull();
-        assertThat(output).contains("Retrying request to ", "Retries exhausted");
-        assertThat(output).doesNotContain("Failed to convert response ");
-        assertThat(output).contains("\"instance_timezone\":\"" + zoneNames + "\"");
+        assertThat(output.getAll()).contains("Retrying request to ", "Retries exhausted", "\"instance_timezone\":\"" + zoneNames + "\"");
+        assertThat(output.getAll()).doesNotContain("Failed to convert response ");
     }
 }

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

@@ -217,8 +217,7 @@ void mdcValuesShouldBeReportedInRetryLogs(@Nonnull final CapturedOutput output)
             .until(() -> countRecordsInTable() >= 1L);
         assertThat(output.getAll())
             .contains("Received record: " + received.value() + " with traceId " + traceId);
-        assertThat(output).contains("Retrying request to ", "Retries exhausted");
-        assertThat(output).contains("\"instance_timezone\":\"" + zoneNames + "\"");
+        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)

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/service/PublicApiServiceTest.java

@@ -56,7 +56,7 @@ void printTimeZoneSuccessfully(@Nonnull final CapturedOutput output) throws Json
         assertThat(result).isNotNull();
         assertThat(result.truncatedTo(ChronoUnit.MINUTES))
             .isEqualTo(localDateTimeNow.truncatedTo(ChronoUnit.MINUTES));
-        assertThat(output).doesNotContain(
+        assertThat(output.getAll()).doesNotContain(
             "Retrying request to ",
             "Retries exhausted",
             "Failed to convert response ",
@@ -78,8 +78,7 @@ void retriesOnceToGetZonedTime(@Nonnull final CapturedOutput output) throws Json
         verify(2, getRequestedFor(urlPathMatching("/" + zoneNames)));
 
         assertThat(result).isNull();
-        assertThat(output).contains("Retrying request to ", "Retries exhausted");
-        assertThat(output).doesNotContain("Failed to convert response ");
-        assertThat(output).contains("\"instance_timezone\":\"" + zoneNames + "\"");
+        assertThat(output.getAll()).contains("Retrying request to ", "Retries exhausted", "\"instance_timezone\":\"" + zoneNames + "\"");
+        assertThat(output.getAll()).doesNotContain("Failed to convert response ");
     }
 }