JAL-3141 Fixed tests for new placement of suffix after extension

diff --git a/test/jalview/io/BackupFilesTest.java b/test/jalview/io/BackupFilesTest.java
index ebdf26a..86322b8 100644 (file)
--- a/test/jalview/io/BackupFilesTest.java
+++ b/test/jalview/io/BackupFilesTest.java
@@ -108,27 +108,27 @@ public class BackupFilesTest
 
     // check 10 backup files
     HashMap correctindexmap = new HashMap();
-    correctindexmap.put(1, "backupfilestestTemp_BACKUPTEST-00000001.fa");
-    correctindexmap.put(2, "backupfilestestTemp_BACKUPTEST-00000002.fa");
-    correctindexmap.put(3, "backupfilestestTemp_BACKUPTEST-00000003.fa");
-    correctindexmap.put(4, "backupfilestestTemp_BACKUPTEST-00000004.fa");
-    correctindexmap.put(5, "backupfilestestTemp_BACKUPTEST-00000005.fa");
-    correctindexmap.put(6, "backupfilestestTemp_BACKUPTEST-00000006.fa");
-    correctindexmap.put(7, "backupfilestestTemp_BACKUPTEST-00000007.fa");
-    correctindexmap.put(8, "backupfilestestTemp_BACKUPTEST-00000008.fa");
-    correctindexmap.put(9, "backupfilestestTemp_BACKUPTEST-00000009.fa");
-    correctindexmap.put(10, "backupfilestestTemp_BACKUPTEST-00000010.fa");
+    correctindexmap.put(1, "backupfilestestTemp.fa_BACKUPTEST-00000001");
+    correctindexmap.put(2, "backupfilestestTemp.fa_BACKUPTEST-00000002");
+    correctindexmap.put(3, "backupfilestestTemp.fa_BACKUPTEST-00000003");
+    correctindexmap.put(4, "backupfilestestTemp.fa_BACKUPTEST-00000004");
+    correctindexmap.put(5, "backupfilestestTemp.fa_BACKUPTEST-00000005");
+    correctindexmap.put(6, "backupfilestestTemp.fa_BACKUPTEST-00000006");
+    correctindexmap.put(7, "backupfilestestTemp.fa_BACKUPTEST-00000007");
+    correctindexmap.put(8, "backupfilestestTemp.fa_BACKUPTEST-00000008");
+    correctindexmap.put(9, "backupfilestestTemp.fa_BACKUPTEST-00000009");
+    correctindexmap.put(10, "backupfilestestTemp.fa_BACKUPTEST-00000010");
     HashMap wrongindexmap = new HashMap();
-    wrongindexmap.put(1, "backupfilestestTemp_BACKUPTEST-1.fa");
-    wrongindexmap.put(2, "backupfilestestTemp_BACKUPTEST-00000002.fa");
-    wrongindexmap.put(3, "backupfilestestTemp_BACKUPTEST-00000003.fa");
-    wrongindexmap.put(4, "backupfilestestTemp_BACKUPTEST-00000004.fa");
-    wrongindexmap.put(5, "backupfilestestTemp_BACKUPTEST-00000005.fa");
-    wrongindexmap.put(6, "backupfilestestTemp_BACKUPTEST-00000006.fa");
-    wrongindexmap.put(7, "backupfilestestTemp_BACKUPTEST-00000007.fa");
-    wrongindexmap.put(8, "backupfilestestTemp_BACKUPTEST-00000008.fa");
-    wrongindexmap.put(9, "backupfilestestTemp_BACKUPTEST-00000009.fa");
-    wrongindexmap.put(10, "backupfilestestTemp_BACKUPTEST-00000010.fa");
+    wrongindexmap.put(1, "backupfilestestTemp.fa_BACKUPTEST-1");
+    wrongindexmap.put(2, "backupfilestestTemp.fa_BACKUPTEST-00000002");
+    wrongindexmap.put(3, "backupfilestestTemp.fa_BACKUPTEST-00000003");
+    wrongindexmap.put(4, "backupfilestestTemp.fa_BACKUPTEST-00000004");
+    wrongindexmap.put(5, "backupfilestestTemp.fa_BACKUPTEST-00000005");
+    wrongindexmap.put(6, "backupfilestestTemp.fa_BACKUPTEST-00000006");
+    wrongindexmap.put(7, "backupfilestestTemp.fa_BACKUPTEST-00000007");
+    wrongindexmap.put(8, "backupfilestestTemp.fa_BACKUPTEST-00000008");
+    wrongindexmap.put(9, "backupfilestestTemp.fa_BACKUPTEST-00000009");
+    wrongindexmap.put(10, "backupfilestestTemp.fa_BACKUPTEST-00000010");
     int[] indexes2 = { 3, 4, 5, 6, 7, 8, 9, 10 };
     int[] indexes3 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
     Assert.assertTrue(checkBackupFiles(correctindexmap));
@@ -159,8 +159,8 @@ public class BackupFilesTest
     // check there are "rollMax" backup files and they are all saved correctly
     // check 10 backup files
     HashMap correctindexmap = new HashMap();
-    correctindexmap.put(9, "backupfilestestTemp_BACKUPTEST-00000009.fa");
-    correctindexmap.put(10, "backupfilestestTemp_BACKUPTEST-00000010.fa");
+    correctindexmap.put(9, "backupfilestestTemp.fa_BACKUPTEST-00000009");
+    correctindexmap.put(10, "backupfilestestTemp.fa_BACKUPTEST-00000010");
     int[] indexes2 = { 10 };
     int[] indexes3 = { 8, 9, 10 };
     Assert.assertTrue(checkBackupFiles(correctindexmap));
@@ -190,8 +190,8 @@ public class BackupFilesTest
     // check there are "rollMax" backup files and they are all saved correctly
     // check 10 backup files
     HashMap correctindexmap = new HashMap();
-    correctindexmap.put(1, "backupfilestestTemp_BACKUPTEST-00000001.fa");
-    correctindexmap.put(2, "backupfilestestTemp_BACKUPTEST-00000002.fa");
+    correctindexmap.put(1, "backupfilestestTemp.fa_BACKUPTEST-00000001");
+    correctindexmap.put(2, "backupfilestestTemp.fa_BACKUPTEST-00000002");
     int[] indexes2 = { 1 };
     int[] indexes3 = { 1, 2, 3 };
     Assert.assertTrue(checkBackupFiles(correctindexmap));
@@ -362,7 +362,7 @@ public class BackupFilesTest
       }
       // check the filename -- although this uses the same code to forumulate the filename so not much of a test!
       String filename = BackupFilenameFilter.getBackupFilename(i,
-              newBasename, suffix, digits, testExt);
+              newBasename + testExt, suffix, digits);
       if (!filename.equals(f.getName()))
       {
         System.out.println("Supposed filename '" + filename