diff --git a/sample-operators/mysql-schema/pom.xml b/sample-operators/mysql-schema/pom.xml
index ea4f50256e..2055a9933d 100644
--- a/sample-operators/mysql-schema/pom.xml
+++ b/sample-operators/mysql-schema/pom.xml
@@ -90,6 +90,11 @@
operator-framework-junit
test
+
+ org.assertj
+ assertj-core
+ test
+
diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java
index 6400d312c7..a34cab5384 100644
--- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java
+++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java
@@ -110,6 +110,7 @@ private Connection getConnection() throws SQLException {
@Override
public void delete(MySQLSchema primary, Context context) {
+ log.debug("Deleting schema");
try (Connection connection = getConnection()) {
var userName = primary.getStatus() != null ? primary.getStatus().getUserName() : null;
SchemaService.deleteSchemaAndRelatedUser(
diff --git a/sample-operators/mysql-schema/src/main/resources/log4j2.xml b/sample-operators/mysql-schema/src/main/resources/log4j2.xml
index 2979258355..593f120e0b 100644
--- a/sample-operators/mysql-schema/src/main/resources/log4j2.xml
+++ b/sample-operators/mysql-schema/src/main/resources/log4j2.xml
@@ -23,7 +23,10 @@
-
+
+
+
+
diff --git a/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java b/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java
index 129b502ed8..80d07333f6 100644
--- a/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java
+++ b/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java
@@ -36,12 +36,8 @@
import io.javaoperatorsdk.operator.sample.dependent.SchemaDependentResource;
import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
class MySQLSchemaOperatorE2E {
@@ -114,10 +110,10 @@ void test() {
.inNamespace(operator.getNamespace())
.withName(testSchema.getMetadata().getName())
.get();
- assertThat(updatedSchema.getStatus(), is(notNullValue()));
- assertThat(updatedSchema.getStatus().getStatus(), equalTo("CREATED"));
- assertThat(updatedSchema.getStatus().getSecretName(), is(notNullValue()));
- assertThat(updatedSchema.getStatus().getUserName(), is(notNullValue()));
+ assertThat(updatedSchema.getStatus()).isNotNull();
+ assertThat(updatedSchema.getStatus().getStatus()).isEqualTo("CREATED");
+ assertThat(updatedSchema.getStatus().getSecretName()).isNotNull();
+ assertThat(updatedSchema.getStatus().getUserName()).isNotNull();
});
client
@@ -137,7 +133,7 @@ void test() {
.inNamespace(operator.getNamespace())
.withName(testSchema.getMetadata().getName())
.get();
- assertThat(updatedSchema, is(nullValue()));
+ assertThat(updatedSchema).isNull();
});
}
}