Refactor tests #2

Author: mfvanek

spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/IndexesMaintenanceTest.java

@@ -4,17 +4,16 @@
 import io.github.mfvanek.pg.common.maintenance.Diagnostic;
 import io.github.mfvanek.pg.model.DbObject;
 import io.github.mfvanek.pg.model.PgContext;
-import io.github.mfvanek.pg.model.column.Column;
+import io.github.mfvanek.pg.model.table.TableNameAware;
 import io.github.mfvanek.spring.boot2.test.support.TestBase;
-import org.assertj.core.api.ListAssert;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
+import java.util.function.Predicate;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.InstanceOfAssertFactories.list;
 
 class IndexesMaintenanceTest extends TestBase {
 
@@ -37,18 +36,16 @@ void databaseStructureCheckForPublicSchema() {
         checks.stream()
             .filter(DatabaseCheckOnHost::isStatic)
             .forEach(check -> {
-                final List<? extends DbObject> objects = check.check(PgContext.ofPublic(), o -> !o.getName().equalsIgnoreCase("databasechangelog"));
-                final ListAssert<? extends DbObject> checkAssert = assertThat(objects)
-                    .as(check.getDiagnostic().name());
-
-                if (check.getDiagnostic() == Diagnostic.COLUMNS_WITHOUT_DESCRIPTION) {
-                    assertThat(objects)
-                        .asInstanceOf(list(Column.class))
-                        .hasSize(14)
-                        .allSatisfy(column -> assertThat(column.getTableName()).isEqualTo("databasechangelog"));
-                } else {
-                    checkAssert.isEmpty();
-                }
+                final Predicate<DbObject> skipLiquibaseTables = dbObject -> {
+                    if (dbObject instanceof TableNameAware t) {
+                        return !t.getTableName().equalsIgnoreCase("databasechangelog");
+                    }
+                    return true;
+                };
+                final List<? extends DbObject> objects = check.check(PgContext.ofPublic(), skipLiquibaseTables);
+                assertThat(objects)
+                    .as(check.getDiagnostic().name())
+                    .isEmpty();
             });
     }
 }

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/IndexesMaintenanceTest.java

@@ -4,17 +4,16 @@
 import io.github.mfvanek.pg.common.maintenance.Diagnostic;
 import io.github.mfvanek.pg.model.DbObject;
 import io.github.mfvanek.pg.model.PgContext;
-import io.github.mfvanek.pg.model.column.Column;
+import io.github.mfvanek.pg.model.table.TableNameAware;
 import io.github.mfvanek.spring.boot3.test.support.TestBase;
-import org.assertj.core.api.ListAssert;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
+import java.util.function.Predicate;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.InstanceOfAssertFactories.list;
 
 class IndexesMaintenanceTest extends TestBase {
 
@@ -37,18 +36,16 @@ void databaseStructureCheckForPublicSchema() {
         checks.stream()
             .filter(DatabaseCheckOnHost::isStatic)
             .forEach(check -> {
-                final List<? extends DbObject> objects = check.check(PgContext.ofPublic(), o -> !o.getName().equalsIgnoreCase("databasechangelog"));
-                final ListAssert<? extends DbObject> checkAssert = assertThat(objects)
-                    .as(check.getDiagnostic().name());
-
-                if (check.getDiagnostic() == Diagnostic.COLUMNS_WITHOUT_DESCRIPTION) {
-                    assertThat(objects)
-                        .asInstanceOf(list(Column.class))
-                        .hasSize(14)
-                        .allSatisfy(column -> assertThat(column.getTableName()).isEqualTo("databasechangelog"));
-                } else {
-                    checkAssert.isEmpty();
-                }
+                final Predicate<DbObject> skipLiquibaseTables = dbObject -> {
+                    if (dbObject instanceof TableNameAware t) {
+                        return !t.getTableName().equalsIgnoreCase("databasechangelog");
+                    }
+                    return true;
+                };
+                final List<? extends DbObject> objects = check.check(PgContext.ofPublic(), skipLiquibaseTables);
+                assertThat(objects)
+                    .as(check.getDiagnostic().name())
+                    .isEmpty();
             });
     }
 }