From 374d2479374f8445b65a85ff94521fa9aa0567bd Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 23 Aug 2022 10:29:55 +0200 Subject: [PATCH 1/3] feat: improved integration test for multi version crd --- .../operator/MultiVersionCRDIT.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java index f53c4aacda..4ac2ef0843 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java @@ -15,7 +15,7 @@ import io.javaoperatorsdk.operator.sample.multiversioncrd.MultiVersionCRDTestReconciler1; import io.javaoperatorsdk.operator.sample.multiversioncrd.MultiVersionCRDTestReconciler2; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static com.google.common.truth.Truth.assertThat; import static org.awaitility.Awaitility.await; class MultiVersionCRDIT { @@ -38,16 +38,16 @@ void multipleCRDVersions() { await() .atMost(Duration.ofSeconds(2)) .pollInterval(Duration.ofMillis(50)) - .until( + .untilAsserted( () -> { var crV1Now = operator.get(MultiVersionCRDTestCustomResource1.class, CR_V1_NAME); var crV2Now = operator.get(MultiVersionCRDTestCustomResource2.class, CR_V2_NAME); - return crV1Now.getStatus().getReconciledBy().size() == 1 - && crV1Now.getStatus().getReconciledBy() - .contains(MultiVersionCRDTestReconciler1.class.getSimpleName()) - && crV2Now.getStatus().getReconciledBy().size() == 1 - && crV2Now.getStatus().getReconciledBy() - .contains(MultiVersionCRDTestReconciler2.class.getSimpleName()); + assertThat(crV1Now.getStatus()).isNotNull(); + assertThat(crV2Now.getStatus()).isNotNull(); + assertThat(crV1Now.getStatus().getReconciledBy()) + .containsExactly(MultiVersionCRDTestReconciler1.class.getSimpleName()); + assertThat(crV2Now.getStatus().getReconciledBy()) + .containsExactly(MultiVersionCRDTestReconciler2.class.getSimpleName()); }); } From 69f20f6703bcaba590e0b3df0f8f15945094c102 Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 23 Aug 2022 10:33:10 +0200 Subject: [PATCH 2/3] assert improvement --- .../java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java index 4ac2ef0843..6948a1a51f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java @@ -62,10 +62,10 @@ void invalidEventsDoesNotBreakEventHandling() { await() .atMost(Duration.ofSeconds(2)) .pollInterval(Duration.ofMillis(50)) - .until(() -> { + .untilAsserted(() -> { var crV1Now = operator.get(MultiVersionCRDTestCustomResource1.class, CR_V1_NAME); - return crV1Now.getStatus().getReconciledBy() - .contains(MultiVersionCRDTestReconciler1.class.getSimpleName()); + assertThat(crV1Now.getStatus().getReconciledBy()) + .containsExactly(MultiVersionCRDTestReconciler1.class.getSimpleName()); }); assertThat( operator From b50f54c004c7c4c84b817a5e72fd2ad28304745b Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 23 Aug 2022 10:34:18 +0200 Subject: [PATCH 3/3] improvements --- .../test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java index 6948a1a51f..65bf839ff4 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java @@ -64,6 +64,7 @@ void invalidEventsDoesNotBreakEventHandling() { .pollInterval(Duration.ofMillis(50)) .untilAsserted(() -> { var crV1Now = operator.get(MultiVersionCRDTestCustomResource1.class, CR_V1_NAME); + assertThat(crV1Now.getStatus()).isNotNull(); assertThat(crV1Now.getStatus().getReconciledBy()) .containsExactly(MultiVersionCRDTestReconciler1.class.getSimpleName()); });