address latest rounds of Eduard's comments

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

Hide file tree

Showing 2 changed files with 7 additions and 17 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
@@ -21,10 +21,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-<<<<<<< HEAD
-import com.fasterxml.jackson.databind.JsonNode;
-=======
->>>>>>> 58ab1e5e8 (address Eduard's comments)
 import org.apache.iceberg.expressions.ExpressionUtil;
 import org.apache.iceberg.expressions.Expressions;
 import org.apache.iceberg.expressions.ResidualEvaluator;
@@ -39,13 +35,8 @@ public void testNullArguments() {
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessage("Invalid file scan task: null");
 
-<<<<<<< HEAD
-    assertThatThrownBy(() -> FileScanTaskParser.fromJson((JsonNode) null, true))
-       .isInstanceOf(IllegalArgumentException.class)
-=======
     assertThatThrownBy(() -> FileScanTaskParser.fromJson((String) null, true))
         .isInstanceOf(IllegalArgumentException.class)
->>>>>>> 58ab1e5e8 (address Eduard's comments)
         .hasMessage("Invalid JSON string for file scan task: null");
 
     assertThatThrownBy(() -> ScanTaskParser.toJson(null))
@@ -75,8 +66,7 @@ public void testFileScanTaskParserWithoutTaskTypeField(boolean caseSensitive) {
     PartitionSpec spec = TestBase.SPEC;
     FileScanTask fileScanTask = createFileScanTask(spec, caseSensitive);
     FileScanTask deserializedTask =
-        FileScanTaskParser.
-            fromJson(fileScanTaskJsonWithoutTaskType(), caseSensitive);
+        FileScanTaskParser.fromJson(fileScanTaskJsonWithoutTaskType(), caseSensitive);
     assertFileScanTaskEquals(fileScanTask, deserializedTask, spec, caseSensitive);
   }
 
@@ -166,7 +156,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(