Use containsAll for metadata.materialized_views asserts

trinodb · Oct 8, 2021 · f4caa4e · f4caa4e
1 parent f4cada1
commit f4caa4e
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
@@ -637,30 +637,34 @@ public void testMaterializedView()
         assertUpdate("DROP MATERIALIZED VIEW " + viewWithComment);
 
         // test filtering materialized views in system metadata table
-        assertQuery(
-                listMaterializedViewsSql("catalog_name = '" + view.getCatalogName() + "'"),
-                getTestingMaterializedViewsResultRows(view, otherView));
+        assertThat(query(listMaterializedViewsSql("catalog_name = '" + view.getCatalogName() + "'")))
+                .skippingTypesCheck()
+                .containsAll(getTestingMaterializedViewsResultRows(view, otherView));
 
-        assertQuery(
+        assertThat(query(
                 listMaterializedViewsSql(
                         "catalog_name = '" + otherView.getCatalogName() + "'",
-                        "schema_name = '" + otherView.getSchemaName() + "'"),
-                getTestingMaterializedViewsResultRow(otherView, "sarcastic comment"));
+                        "schema_name = '" + otherView.getSchemaName() + "'")))
+                .skippingTypesCheck()
+                .containsAll(getTestingMaterializedViewsResultRow(otherView, "sarcastic comment"));
 
-        assertQuery(
+        assertThat(query(
                 listMaterializedViewsSql(
                         "catalog_name = '" + view.getCatalogName() + "'",
                         "schema_name = '" + view.getSchemaName() + "'",
-                        "name = '" + view.getObjectName() + "'"),
-                getTestingMaterializedViewsResultRow(view, ""));
+                        "name = '" + view.getObjectName() + "'")))
+                .skippingTypesCheck()
+                .containsAll(getTestingMaterializedViewsResultRow(view, ""));
 
-        assertQuery(
-                listMaterializedViewsSql("schema_name LIKE '%" + view.getSchemaName() + "%'"),
-                getTestingMaterializedViewsResultRow(view, ""));
+        assertThat(query(
+                listMaterializedViewsSql("schema_name LIKE '%" + view.getSchemaName() + "%'")))
+                .skippingTypesCheck()
+                .containsAll(getTestingMaterializedViewsResultRow(view, ""));
 
-        assertQuery(
-                listMaterializedViewsSql("name LIKE '%" + view.getObjectName() + "%'"),
-                getTestingMaterializedViewsResultRow(view, ""));
+        assertThat(query(
+                listMaterializedViewsSql("name LIKE '%" + view.getObjectName() + "%'")))
+                .skippingTypesCheck()
+                .containsAll(getTestingMaterializedViewsResultRow(view, ""));
 
         // verify write in transaction
         if (!hasBehavior(SUPPORTS_MULTI_STATEMENT_WRITES)) {