From b6bf6deb4ca9380fedc99961747124f501ffd99a Mon Sep 17 00:00:00 2001 From: Dennis-Mircea Ciupitu Date: Thu, 28 May 2026 12:31:27 +0300 Subject: [PATCH 1/2] test: reset ExternalIDGenServiceMock between tests to fix flaky external-state ITs Signed-off-by: Dennis-Mircea Ciupitu --- .../dependent/externalstate/ExternalStateTestBase.java | 6 ++++++ .../externalstatebulkdependent/ExternalStateBulkIT.java | 6 ++++++ .../operator/support/ExternalIDGenServiceMock.java | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateTestBase.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateTestBase.java index dedcc0da5a..1eb3139c66 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateTestBase.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateTestBase.java @@ -15,6 +15,7 @@ */ package io.javaoperatorsdk.operator.dependent.externalstate; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import io.fabric8.kubernetes.api.model.ConfigMap; @@ -35,6 +36,11 @@ public abstract class ExternalStateTestBase { private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); + @BeforeEach + void resetExternalService() { + externalService.reset(); + } + @Test public void reconcilesResourceWithPersistentState() { var resource = extension().create(testResource()); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java index b81464bc46..9d6205bc7a 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java @@ -17,6 +17,7 @@ import java.time.Duration; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -49,6 +50,11 @@ class ExternalStateBulkIT { private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); + @BeforeEach + void resetExternalService() { + externalService.reset(); + } + @RegisterExtension LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java index f2640b18b3..cdb669d21a 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java @@ -50,6 +50,14 @@ public List listResources() { return new ArrayList<>(resourceMap.values()); } + /** + * Clears the internal state. Intended to be called between tests so that state from one test + * does not leak into the next via this JVM-lifetime singleton. + */ + public void reset() { + resourceMap.clear(); + } + public static ExternalIDGenServiceMock getInstance() { return serviceMock; } From 233cb9f6ffdf51192621f4141edb936a22892565 Mon Sep 17 00:00:00 2001 From: Dennis-Mircea Ciupitu Date: Fri, 29 May 2026 10:42:42 +0300 Subject: [PATCH 2/2] test: address review comments and fix format Signed-off-by: Dennis-Mircea Ciupitu --- .../externalstate/ExternalStateTestBase.java | 9 ++--- .../ExternalStateBulkIT.java | 9 ++--- .../support/ExternalIDGenServiceMock.java | 4 +-- .../ExternalServiceResetExtension.java | 33 +++++++++++++++++++ 4 files changed, 41 insertions(+), 14 deletions(-) create mode 100644 operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalServiceResetExtension.java diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateTestBase.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateTestBase.java index 1eb3139c66..06b71c6d7b 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateTestBase.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateTestBase.java @@ -15,18 +15,20 @@ */ package io.javaoperatorsdk.operator.dependent.externalstate; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension; import io.javaoperatorsdk.operator.support.ExternalIDGenServiceMock; +import io.javaoperatorsdk.operator.support.ExternalServiceResetExtension; import static io.javaoperatorsdk.operator.dependent.externalstate.ExternalStateReconciler.ID_KEY; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; +@ExtendWith(ExternalServiceResetExtension.class) public abstract class ExternalStateTestBase { private static final String TEST_RESOURCE_NAME = "test1"; @@ -36,11 +38,6 @@ public abstract class ExternalStateTestBase { private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); - @BeforeEach - void resetExternalService() { - externalService.reset(); - } - @Test public void reconcilesResourceWithPersistentState() { var resource = extension().create(testResource()); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java index 9d6205bc7a..e38f5543c1 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java @@ -17,14 +17,15 @@ import java.time.Duration; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.RegisterExtension; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.javaoperatorsdk.annotation.Sample; import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension; import io.javaoperatorsdk.operator.support.ExternalIDGenServiceMock; +import io.javaoperatorsdk.operator.support.ExternalServiceResetExtension; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -38,6 +39,7 @@ allowing operators to track and reconcile a variable number of external resources with \ persistent state that survives operator restarts. """) +@ExtendWith(ExternalServiceResetExtension.class) class ExternalStateBulkIT { private static final String TEST_RESOURCE_NAME = "test1"; @@ -50,11 +52,6 @@ class ExternalStateBulkIT { private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); - @BeforeEach - void resetExternalService() { - externalService.reset(); - } - @RegisterExtension LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java index cdb669d21a..ee26e348b7 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java @@ -51,8 +51,8 @@ public List listResources() { } /** - * Clears the internal state. Intended to be called between tests so that state from one test - * does not leak into the next via this JVM-lifetime singleton. + * Clears the internal state. Intended to be called between tests so that state from one test does + * not leak into the next via this JVM-lifetime singleton. */ public void reset() { resourceMap.clear(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalServiceResetExtension.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalServiceResetExtension.java new file mode 100644 index 0000000000..8d6f168a26 --- /dev/null +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalServiceResetExtension.java @@ -0,0 +1,33 @@ +/* + * Copyright Java Operator SDK Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.javaoperatorsdk.operator.support; + +import org.jspecify.annotations.NonNull; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +/** + * Resets the {@link ExternalIDGenServiceMock} singleton before each test method so that state from + * one test does not leak into the next. Apply via + * {@code @ExtendWith(ExternalServiceResetExtension.class)}. + */ +public class ExternalServiceResetExtension implements BeforeEachCallback { + + @Override + public void beforeEach(@NonNull ExtensionContext context) { + ExternalIDGenServiceMock.getInstance().reset(); + } +}