From 64987f42480f4d597f22ecef08140193476562e1 Mon Sep 17 00:00:00 2001
From: Mattia Brescia <9354343-mattiabrescia@users.noreply.gitlab.com>
Date: Wed, 5 Jun 2024 13:05:07 +0200
Subject: [PATCH] #2882: fix flaky tests

---
 .../store/internal/PgFactStreamTelemetryTest.java        | 2 +-
 .../telemetry/PgStoreTelemetryIntegrationTest.java       | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/factcast-store/src/test/java/org/factcast/store/internal/PgFactStreamTelemetryTest.java b/factcast-store/src/test/java/org/factcast/store/internal/PgFactStreamTelemetryTest.java
index b4cbcc0506..a4a75e91cc 100644
--- a/factcast-store/src/test/java/org/factcast/store/internal/PgFactStreamTelemetryTest.java
+++ b/factcast-store/src/test/java/org/factcast/store/internal/PgFactStreamTelemetryTest.java
@@ -36,7 +36,7 @@
 import org.mockito.*;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-public class PgFactStreamTelemetryTest {
+class PgFactStreamTelemetryTest {
   @Mock JdbcTemplate jdbcTemplate;
   @Mock EventBus eventBus;
   @Mock PgFactIdToSerialMapper idToSerMapper;
diff --git a/factcast-store/src/test/java/org/factcast/store/internal/telemetry/PgStoreTelemetryIntegrationTest.java b/factcast-store/src/test/java/org/factcast/store/internal/telemetry/PgStoreTelemetryIntegrationTest.java
index f7b8231eb4..5461a94f1d 100644
--- a/factcast-store/src/test/java/org/factcast/store/internal/telemetry/PgStoreTelemetryIntegrationTest.java
+++ b/factcast-store/src/test/java/org/factcast/store/internal/telemetry/PgStoreTelemetryIntegrationTest.java
@@ -17,7 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.waitAtMost;
-import static org.mockito.Mockito.spy;
 
 import com.google.common.collect.Lists;
 import com.google.common.eventbus.Subscribe;
@@ -46,7 +45,7 @@
 @Sql(scripts = "/wipe.sql", config = @SqlConfig(separator = "#"))
 @ExtendWith(SpringExtension.class)
 @IntegrationTest
-public class PgStoreTelemetryIntegrationTest {
+class PgStoreTelemetryIntegrationTest {
 
   @Autowired FactStore store;
 
@@ -56,7 +55,7 @@ public class PgStoreTelemetryIntegrationTest {
 
   @BeforeEach
   void setUp() {
-    uut = spy(FactCast.from(store));
+    uut = FactCast.from(store);
   }
 
   @Test
@@ -66,7 +65,7 @@ void publishesTelemetryOnCatchup() {
         SubscriptionRequest.catchup(FactSpec.ns("foo").aggId(UUID.randomUUID())).fromScratch();
     var telemetryListener = new TelemetryListener(request);
 
-    try (Subscription ignored = uut.subscribe(request, f -> {}).awaitComplete(1000)) {
+    try (Subscription ignored = uut.subscribe(request, f -> {}).awaitComplete(5000)) {
       // wait until complete is consumed
       waitAtMost(Duration.ofSeconds(5)).until(() -> telemetryListener.completed);
     }
@@ -94,7 +93,7 @@ void publishesTelemetryOnFollow() {
         SubscriptionRequest.follow(FactSpec.ns("foo").aggId(UUID.randomUUID())).fromScratch();
     var telemetryListener = new TelemetryListener(request);
 
-    try (Subscription ignored = uut.subscribe(request, f -> {}).awaitCatchup(1000)) {
+    try (Subscription ignored = uut.subscribe(request, f -> {}).awaitCatchup(5000)) {
       // wait until follow is consumed
       waitAtMost(Duration.ofSeconds(5)).until(() -> telemetryListener.following);
     }