fix: move tests where appropriate

Author: metacosm

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/TestUtils.java

@@ -32,12 +32,4 @@ public static TestCustomResource testCustomResource(String uid) {
     resource.getSpec().setValue("test-value");
     return resource;
   }
-
-  public static void waitXms(int x) {
-    try {
-      Thread.sleep(x);
-    } catch (InterruptedException e) {
-      throw new IllegalStateException(e);
-    }
-  }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/TestUtils.java

@@ -32,4 +32,12 @@ public static TestCustomResource testCustomResource(String uid) {
     resource.getSpec().setValue("test-value");
     return resource;
   }
+
+  public static void waitXms(int x) {
+    try {
+      Thread.sleep(x);
+    } catch (InterruptedException e) {
+      throw new IllegalStateException(e);
+    }
+  }
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/UpdatingResAndSubResIT.java renamed to operator-framework/src/test/java/io/javaoperatorsdk/operator/UpdatingResAndSubResIT.java

@@ -1,19 +1,18 @@
 package io.javaoperatorsdk.operator;
 
 import static io.javaoperatorsdk.operator.IntegrationTestSupport.TEST_NAMESPACE;
-import static io.javaoperatorsdk.operator.TestUtils.waitXms;
-import static io.javaoperatorsdk.operator.doubleupdate.DoubleUpdateTestCustomResourceController.TEST_ANNOTATION;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.javaoperatorsdk.operator.doubleupdate.DoubleUpdateTestCustomResource;
-import io.javaoperatorsdk.operator.doubleupdate.DoubleUpdateTestCustomResourceController;
-import io.javaoperatorsdk.operator.doubleupdate.DoubleUpdateTestCustomResourceSpec;
-import io.javaoperatorsdk.operator.doubleupdate.DoubleUpdateTestCustomResourceStatus;
+import io.javaoperatorsdk.operator.sample.doubleupdate.DoubleUpdateTestCustomResource;
+import io.javaoperatorsdk.operator.sample.doubleupdate.DoubleUpdateTestCustomResourceController;
+import io.javaoperatorsdk.operator.sample.doubleupdate.DoubleUpdateTestCustomResourceSpec;
+import io.javaoperatorsdk.operator.sample.doubleupdate.DoubleUpdateTestCustomResourceStatus;
 import java.util.concurrent.TimeUnit;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -40,15 +39,19 @@ public void updatesSubResourceStatus() {
 
           awaitStatusUpdated(resource.getMetadata().getName());
           // wait for sure, there are no more events
-          waitXms(300);
+          TestUtils.waitXms(300);
 
           DoubleUpdateTestCustomResource customResource =
               (DoubleUpdateTestCustomResource)
                   integrationTestSupport.getCustomResource(resource.getMetadata().getName());
           assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(1);
-          assertThat(customResource.getStatus().getState())
+          Assertions.assertThat(customResource.getStatus().getState())
               .isEqualTo(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);
-          assertThat(customResource.getMetadata().getAnnotations().get(TEST_ANNOTATION))
+          Assertions.assertThat(
+                  customResource
+                      .getMetadata()
+                      .getAnnotations()
+                      .get(DoubleUpdateTestCustomResourceController.TEST_ANNOTATION))
               .isNotNull();
         });
   }
@@ -65,10 +68,10 @@ void awaitStatusUpdated(String name) {
                           .inNamespace(TEST_NAMESPACE)
                           .withName(name)
                           .get();
-              assertThat(cr.getMetadata().getFinalizers()).hasSize(1);
-              assertThat(cr).isNotNull();
-              assertThat(cr.getStatus()).isNotNull();
-              assertThat(cr.getStatus().getState())
+              Assertions.assertThat(cr.getMetadata().getFinalizers()).hasSize(1);
+              Assertions.assertThat(cr).isNotNull();
+              Assertions.assertThat(cr.getStatus()).isNotNull();
+              Assertions.assertThat(cr.getStatus().getState())
                   .isEqualTo(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);
             });
   }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/doubleupdate/DoubleUpdateTestCustomResource.java renamed to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomResource.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.doubleupdate;
+package io.javaoperatorsdk.operator.sample.doubleupdate;
 
 import io.fabric8.kubernetes.client.CustomResource;
 

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/doubleupdate/DoubleUpdateTestCustomResourceController.java renamed to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomResourceController.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.doubleupdate;
+package io.javaoperatorsdk.operator.sample.doubleupdate;
 
 import io.javaoperatorsdk.operator.TestExecutionInfoProvider;
 import io.javaoperatorsdk.operator.api.*;

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/doubleupdate/DoubleUpdateTestCustomResourceSpec.java renamed to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomResourceSpec.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.doubleupdate;
+package io.javaoperatorsdk.operator.sample.doubleupdate;
 
 public class DoubleUpdateTestCustomResourceSpec {
 

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/doubleupdate/DoubleUpdateTestCustomResourceStatus.java renamed to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomResourceStatus.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.doubleupdate;
+package io.javaoperatorsdk.operator.sample.doubleupdate;
 
 public class DoubleUpdateTestCustomResourceStatus {