[core] Reset SOP list in test

- Add SOPList#reset - fixes overloading of transfer options
bioinformatics-ua · Jun 19, 2023 · bfe8765 · bfe8765
1 parent 65212ff
commit bfe8765
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/dicoogle/src/main/java/pt/ua/dicoogle/server/SOPList.java b/dicoogle/src/main/java/pt/ua/dicoogle/server/SOPList.java
@@ -145,11 +145,19 @@ public static synchronized SOPList getInstance() {
      * Creates a new list 
      */
     private SOPList() {
-        table = new Hashtable<>();
+        this.reset();
+    }
+
+    /** Reset the SOP list to an empty slate.
+     *
+     * This is not recommended unless you know what you're doing.
+     */
+    public final void reset() {
+        this.table = new Hashtable<>();
 
         // Hardcoded (pre-#498) SOPs
         for (String sop : SOP) {
-            table.put(sop, new TransfersStorage());
+            this.table.put(sop, new TransfersStorage());
         }
     }
 

diff --git a/dicoogle/src/test/java/pt/ua/dicoogle/core/settings/LegacyServerSettingsTest.java b/dicoogle/src/test/java/pt/ua/dicoogle/core/settings/LegacyServerSettingsTest.java
@@ -109,6 +109,9 @@ private static void assertSameContent(Collection<?> o1, Collection<?> o2) {
 
     @Test
     public void testMigrate() throws IOException {
+        // clean up SOP list from past tests
+        SOPList.getInstance().reset();
+
         Path newconf = Files.createTempFile("conf", ".xml");
 
         // load legacy server settings