wip

keeps · Oct 15, 2024 · 627f938 · 627f938
1 parent 6945ccb
commit 627f938
Show file tree

Hide file tree

Showing 17 changed files with 145 additions and 495 deletions.
diff --git a/dbptk-core/src/test/java/com/databasepreservation/testing/integration/siard/SiardDKTest.java b/dbptk-core/src/test/java/com/databasepreservation/testing/integration/siard/SiardDKTest.java
@@ -146,9 +146,14 @@ protected DatabaseStructure roundTrip(DatabaseStructure orgDbStructure, Path tmp
 
     databaseStructure.setArchivalDate(null); // In siard-dk Archival Date is
                                              // located in archiveIndex.xml
-
+    int virtualTableCounter = 0;
     for (SchemaStructure orgSchema : orgDbStructure.getSchemas()) {
-      assert orgSchema.getTables().size() == databaseStructure.getSchemas().get(0).getTables().size();
+      for (TableStructure tableStructure : databaseStructure.getSchemas().get(0).getTables()) {
+        if (tableStructure.getName().equals("virtual_table")) {
+          virtualTableCounter++;
+        }
+      }
+      assert orgSchema.getTables().size() == databaseStructure.getSchemas().get(0).getTables().size()-virtualTableCounter;
       for (int tblIndex = 0; tblIndex < orgSchema.getTables().size(); tblIndex++) {
         TableStructure orgTable = orgSchema.getTables().get(tblIndex);
         assert orgTable.getColumns().size() == databaseStructure.getSchemas().get(0).getTables().get(tblIndex)

diff --git a/dbptk-core/src/test/java/com/databasepreservation/testing/integration/siard/SiardTest.java b/dbptk-core/src/test/java/com/databasepreservation/testing/integration/siard/SiardTest.java
@@ -17,6 +17,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/dbptk-core/src/test/resources/siarddk/AVID.HEX.1000.1/Indices/archiveIndex.xml b/dbptk-core/src/test/resources/siarddk/AVID.HEX.1000.1/Indices/archiveIndex.xml
diff --git a/dbptk-core/src/test/resources/siarddk/AVID.HEX.1000.1/Indices/fileIndex.xml b/dbptk-core/src/test/resources/siarddk/AVID.HEX.1000.1/Indices/fileIndex.xml
@@ -21,11 +21,6 @@
         <fiN>tableIndex.xml</fiN>
         <md5>0BFD6992E602AEB1A04AF847D26107A4</md5>
     </f>
-    <f>
-        <foN>AVID.HEX.1000.1\Indices</foN>
-        <fiN>archiveIndex.xml</fiN>
-        <md5>00eb5657e163ae242c648fe4f8b012e8</md5>
-    </f>
     <f>
         <foN>AVID.HEX.1000.1\Schemas\standard</foN>
         <fiN>fileIndex.xsd</fiN>