address latest rounds of Eduard's comments

apache · Jun 19, 2024 · 4ef2fb9 · 4ef2fb9
1 parent 8a3f349
commit 4ef2fb9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/core/src/test/java/org/apache/iceberg/TestDataTaskParser.java b/core/src/test/java/org/apache/iceberg/TestDataTaskParser.java
@@ -233,20 +233,20 @@ private String snapshotsDataTaskJson() {
   }
 
   private void assertDataTaskEquals(StaticDataTask expected, StaticDataTask actual) {
-    assertThat(expected.schema().asStruct())
+    assertThat(actual.schema().asStruct())
         .as("Schema should match")
-        .isEqualTo(actual.schema().asStruct());
+        .isEqualTo(expected.schema().asStruct());
 
-    assertThat(expected.projectedSchema().asStruct())
+    assertThat(actual.projectedSchema().asStruct())
         .as("Projected schema should match")
-        .isEqualTo(actual.projectedSchema().asStruct());
+        .isEqualTo(expected.projectedSchema().asStruct());
 
     TestContentFileParser.assertContentFileEquals(
         expected.metadataFile(), actual.metadataFile(), PartitionSpec.unpartitioned());
 
     List<StructLike> expectedRows = Lists.newArrayList(expected.rows());
     List<StructLike> actualRows = Lists.newArrayList(actual.rows());
-    assertThat(actualRows).hasSize(expectedRows.size());
+    assertThat(actualRows).hasSameSizeAs(expectedRows);
 
     // all fields are primitive types or map
     Schema schema = expected.schema();

diff --git a/core/src/test/java/org/apache/iceberg/TestFileScanTaskParser.java b/core/src/test/java/org/apache/iceberg/TestFileScanTaskParser.java
@@ -166,7 +166,7 @@ private static void assertFileScanTaskEquals(
           expected.deletes().get(pos), actual.deletes().get(pos), spec);
     }
 
-    assertThat(expected.schema().sameSchema(actual.schema())).as("Schema should match").isTrue();
+    assertThat(actual.schema().asStruct()).isEqualTo(expected.schema().asStruct());
     assertThat(actual.spec()).isEqualTo(expected.spec());
     assertThat(
             ExpressionUtil.equivalent(