Removed use of Approvals from compaction system tests

gchq · Aug 6, 2024 · 22ebd70 · 22ebd70
1 parent 9acdfc4
commit 22ebd70
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 40 deletions.
diff --git a/...stem-test/system-test-suite/src/test/java/sleeper/systemtest/suite/CompactionOnEC2ST.java b/...stem-test/system-test-suite/src/test/java/sleeper/systemtest/suite/CompactionOnEC2ST.java
@@ -16,7 +16,6 @@
 
 package sleeper.systemtest.suite;
 
-import org.approvaltests.Approvals;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -39,6 +38,7 @@
 import static sleeper.configuration.properties.table.TableProperty.COMPACTION_FILES_BATCH_SIZE;
 import static sleeper.core.testutils.printers.FileReferencePrinter.printFiles;
 import static sleeper.systemtest.suite.fixtures.SystemTestInstance.COMPACTION_ON_EC2;
+import static sleeper.systemtest.suite.testutil.TestResources.exampleString;
 
 @SystemTest
 @Slow
@@ -78,6 +78,7 @@ void shouldCompactFilesUsingDefaultCompactionStrategy(SleeperSystemTest sleeper)
         // Then
         assertThat(sleeper.directQuery().allRecordsInTable())
                 .containsExactlyInAnyOrderElementsOf(sleeper.generateNumberedRecords(LongStream.range(0, 46)));
-        Approvals.verify(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()));
+        assertThat(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()))
+                .isEqualTo(exampleString("compaction/compacted5ToSingleFile.txt"));
     }
 }
diff --git a/java/system-test/system-test-suite/src/test/java/sleeper/systemtest/suite/CompactionST.java b/java/system-test/system-test-suite/src/test/java/sleeper/systemtest/suite/CompactionST.java
@@ -16,7 +16,6 @@
 
 package sleeper.systemtest.suite;
 
-import org.approvaltests.Approvals;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -51,6 +50,7 @@
 import static sleeper.systemtest.suite.fixtures.SystemTestInstance.MAIN;
 import static sleeper.systemtest.suite.fixtures.SystemTestSchema.DEFAULT_SCHEMA;
 import static sleeper.systemtest.suite.fixtures.SystemTestSchema.ROW_KEY_FIELD_NAME;
+import static sleeper.systemtest.suite.testutil.TestResources.exampleString;
 
 @SystemTest
 public class CompactionST {
@@ -88,7 +88,8 @@ void shouldCompactFilesUsingDefaultCompactionStrategy(SleeperSystemTest sleeper)
             // Then
             assertThat(sleeper.directQuery().allRecordsInTable())
                     .containsExactlyInAnyOrderElementsOf(sleeper.generateNumberedRecords(LongStream.range(0, 46)));
-            Approvals.verify(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()));
+            assertThat(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()))
+                    .isEqualTo(exampleString("compaction/compacted5ToSingleFile.txt"));
         }
 
         @Test
@@ -110,7 +111,8 @@ void shouldCompactFilesUsingBasicCompactionStrategy(SleeperSystemTest sleeper) {
             // Then
             assertThat(sleeper.directQuery().allRecordsInTable())
                     .containsExactlyInAnyOrderElementsOf(sleeper.generateNumberedRecords(LongStream.range(0, 100)));
-            Approvals.verify(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()));
+            assertThat(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()))
+                    .isEqualTo(exampleString("compaction/compacted4To2Files.txt"));
         }
     }
 
@@ -155,7 +157,8 @@ void shouldCompactOneFileIntoExistingFilesOnLeafPartitions(SleeperSystemTest sle
             // Then the same records should be present, in one file on each leaf partition
             assertThat(sleeper.directQuery().allRecordsInTable())
                     .containsExactlyInAnyOrderElementsOf(sleeper.generateNumberedRecords(LongStream.range(0, 100)));
-            Approvals.verify(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()));
+            assertThat(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()))
+                    .isEqualTo(exampleString("compaction/compactedFileIntoLeafPartitions.txt"));
         }
 
         @Test
@@ -181,7 +184,8 @@ void shouldCompactOneFileFromRootIntoExistingFilesOnLeafPartitions(SleeperSystem
             // Then the same records should be present, in one file on each leaf partition
             assertThat(sleeper.directQuery().allRecordsInTable())
                     .containsExactlyInAnyOrderElementsOf(sleeper.generateNumberedRecords(LongStream.range(0, 100)));
-            Approvals.verify(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()));
+            assertThat(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()))
+                    .isEqualTo(exampleString("compaction/compactedFileIntoLeafPartitions.txt"));
         }
     }
 
@@ -213,7 +217,8 @@ void shouldCompactFilesInSinglePartition(SleeperSystemTest sleeper) {
             // Then
             assertThat(sleeper.directQuery().allRecordsInTable())
                     .containsExactlyInAnyOrderElementsOf(sleeper.generateNumberedRecords(LongStream.range(0, 100)));
-            Approvals.verify(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()));
+            assertThat(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()))
+                    .isEqualTo(exampleString("compaction/compacted4To2Files.txt"));
         }
 
         @Test
@@ -241,7 +246,8 @@ void shouldCompactFilesFromMultiplePartitions(SleeperSystemTest sleeper) throws
             // Then
             assertThat(sleeper.directQuery().allRecordsInTable())
                     .containsExactlyInAnyOrderElementsOf(sleeper.generateNumberedRecords(LongStream.range(0, 100)));
-            Approvals.verify(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()));
+            assertThat(printFiles(sleeper.partitioning().tree(), sleeper.tableFiles().all()))
+                    .isEqualTo(exampleString("compaction/compactedFileIntoLeafPartitions.txt"));
         }
     }
 }
diff --git a/...C2ST.MergePartialFiles.shouldCompactOneFileIntoExistingFilesOnLeafPartitions.approved.txt b/...C2ST.MergePartialFiles.shouldCompactOneFileIntoExistingFilesOnLeafPartitions.approved.txt
diff --git a/...pactionOnFargateST.MergeFiles.shouldCompactFilesUsingBasicCompactionStrategy.approved.txt b/...pactionOnFargateST.MergeFiles.shouldCompactFilesUsingBasicCompactionStrategy.approved.txt
diff --git a/...ctionOnFargateST.MergeFiles.shouldCompactFilesUsingDefaultCompactionStrategy.approved.txt b/...ctionOnFargateST.MergeFiles.shouldCompactFilesUsingDefaultCompactionStrategy.approved.txt
diff --git a/...gePartialFiles.shouldCompactOneFileFromRootIntoExistingFilesOnLeafPartitions.approved.txt b/...gePartialFiles.shouldCompactOneFileFromRootIntoExistingFilesOnLeafPartitions.approved.txt
diff --git a/...teST.MergePartialFiles.shouldCompactOneFileIntoExistingFilesOnLeafPartitions.approved.txt b/...teST.MergePartialFiles.shouldCompactOneFileIntoExistingFilesOnLeafPartitions.approved.txt
diff --git a/...test/system-test-suite/src/test/java/sleeper/systemtest/suite/testutil/TestResources.java b/...test/system-test-suite/src/test/java/sleeper/systemtest/suite/testutil/TestResources.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2022-2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sleeper.systemtest.suite.testutil;
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.util.Objects;
+
+public class TestResources {
+
+    private TestResources() {
+    }
+
+    public static String exampleString(String path) {
+        try (Reader reader = exampleReader(path)) {
+            return IOUtils.toString(reader);
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to load example: " + path, e);
+        }
+    }
+
+    public static Reader exampleReader(String path) {
+        return new InputStreamReader(exampleInputStream(path));
+    }
+
+    public static InputStream exampleInputStream(String path) {
+        URL resource = Objects.requireNonNull(TestResources.class.getClassLoader().getResource(path));
+        try {
+            return resource.openStream();
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to load test example: " + path, e);
+        }
+    }
+
+}
diff --git a/...UsingBasicCompactionStrategy.approved.txt → ...sources/compaction/compacted4To2Files.txt b/...UsingBasicCompactionStrategy.approved.txt → ...sources/compaction/compacted4To2Files.txt
diff --git a/...ingDefaultCompactionStrategy.approved.txt → ...ces/compaction/compacted5ToSingleFile.txt b/...ingDefaultCompactionStrategy.approved.txt → ...ces/compaction/compacted5ToSingleFile.txt
diff --git a/...xistingFilesOnLeafPartitions.approved.txt → ...ction/compactedFileIntoLeafPartitions.txt b/...xistingFilesOnLeafPartitions.approved.txt → ...ction/compactedFileIntoLeafPartitions.txt