X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FBackupFilesTest.java;h=1386bfea3413be1d8bf627a2c5bd37c9381e6c88;hb=refs%2Fheads%2Fpatch%2FJAL-3584_cherrypickto-JAL-3676_2.11.1.1;hp=ebdf26ae9cff007ed320c5ec791de187c07cafa3;hpb=5e183aa333880dfe2bab2a383950042d722dc217;p=jalview.git

diff --git a/test/jalview/io/BackupFilesTest.java b/test/jalview/io/BackupFilesTest.java
index ebdf26a..1386bfe 100644
--- a/test/jalview/io/BackupFilesTest.java
+++ b/test/jalview/io/BackupFilesTest.java
@@ -34,7 +34,8 @@ public class BackupFilesTest
   }
 
   private static boolean actuallyDeleteTmpFiles = true;
-  private static String testDir = "examples";
+
+  private static String testDir = "test/jalview/io";
 
   private static String testBasename = "backupfilestest";
 
@@ -61,7 +62,7 @@ public class BackupFilesTest
 
   private static String suffix = "_BACKUPTEST-%n";
 
-  private static int digits = 8;
+  private static int digits = 6;
 
   private static int rollMax = 2;
 
@@ -107,28 +108,28 @@ 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");
-    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");
+    HashMap<Integer, String> correctindexmap = new HashMap<>();
+    correctindexmap.put(1, "backupfilestestTemp.fa_BACKUPTEST-000001");
+    correctindexmap.put(2, "backupfilestestTemp.fa_BACKUPTEST-000002");
+    correctindexmap.put(3, "backupfilestestTemp.fa_BACKUPTEST-000003");
+    correctindexmap.put(4, "backupfilestestTemp.fa_BACKUPTEST-000004");
+    correctindexmap.put(5, "backupfilestestTemp.fa_BACKUPTEST-000005");
+    correctindexmap.put(6, "backupfilestestTemp.fa_BACKUPTEST-000006");
+    correctindexmap.put(7, "backupfilestestTemp.fa_BACKUPTEST-000007");
+    correctindexmap.put(8, "backupfilestestTemp.fa_BACKUPTEST-000008");
+    correctindexmap.put(9, "backupfilestestTemp.fa_BACKUPTEST-000009");
+    correctindexmap.put(10, "backupfilestestTemp.fa_BACKUPTEST-000010");
+    HashMap<Integer, String> wrongindexmap = new HashMap<>();
+    wrongindexmap.put(1, "backupfilestestTemp.fa_BACKUPTEST-1");
+    wrongindexmap.put(2, "backupfilestestTemp.fa_BACKUPTEST-000002");
+    wrongindexmap.put(3, "backupfilestestTemp.fa_BACKUPTEST-000003");
+    wrongindexmap.put(4, "backupfilestestTemp.fa_BACKUPTEST-000004");
+    wrongindexmap.put(5, "backupfilestestTemp.fa_BACKUPTEST-000005");
+    wrongindexmap.put(6, "backupfilestestTemp.fa_BACKUPTEST-000006");
+    wrongindexmap.put(7, "backupfilestestTemp.fa_BACKUPTEST-000007");
+    wrongindexmap.put(8, "backupfilestestTemp.fa_BACKUPTEST-000008");
+    wrongindexmap.put(9, "backupfilestestTemp.fa_BACKUPTEST-000009");
+    wrongindexmap.put(10, "backupfilestestTemp.fa_BACKUPTEST-000010");
     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));
@@ -158,9 +159,9 @@ 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");
+    HashMap<Integer, String> correctindexmap = new HashMap<>();
+    correctindexmap.put(9, "backupfilestestTemp.fa_BACKUPTEST-000009");
+    correctindexmap.put(10, "backupfilestestTemp.fa_BACKUPTEST-000010");
     int[] indexes2 = { 10 };
     int[] indexes3 = { 8, 9, 10 };
     Assert.assertTrue(checkBackupFiles(correctindexmap));
@@ -189,9 +190,9 @@ 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");
+    HashMap<Integer, String> correctindexmap = new HashMap<>();
+    correctindexmap.put(1, "backupfilestestTemp.fa_BACKUPTEST-000001");
+    correctindexmap.put(2, "backupfilestestTemp.fa_BACKUPTEST-000002");
     int[] indexes2 = { 1 };
     int[] indexes3 = { 1, 2, 3 };
     Assert.assertTrue(checkBackupFiles(correctindexmap));
@@ -208,9 +209,18 @@ public class BackupFilesTest
           boolean noMax)
   {
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
+    Cache.initLogger();
+
+    BackupFilesPresetEntry bfpe = new BackupFilesPresetEntry(suffix, digits,
+            reverse, noMax, rollMax, false);
 
     Cache.applicationProperties.setProperty(BackupFiles.ENABLED,
             Boolean.toString(enabled));
+    Cache.applicationProperties.setProperty(
+            BackupFilesPresetEntry.SAVEDCONFIG, bfpe.toString());
+    /*
+    Cache.applicationProperties.setProperty(BackupFiles.ENABLED,
+            Boolean.toString(enabled));
     Cache.applicationProperties.setProperty(BackupFiles.SUFFIX, suffix);
     Cache.applicationProperties.setProperty(BackupFiles.SUFFIX_DIGITS,
             Integer.toString(digits));
@@ -222,6 +232,7 @@ public class BackupFilesTest
             Integer.toString(rollMax));
     Cache.applicationProperties.setProperty(BackupFiles.CONFIRM_DELETE_OLD,
             "false");
+            */
   }
 
   private void save()
@@ -361,8 +372,8 @@ public class BackupFilesTest
         return false;
       }
       // 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);
+      String filename = BackupFilenameParts.getBackupFilename(i,
+              newBasename + testExt, suffix, digits);
       if (!filename.equals(f.getName()))
       {
         System.out.println("Supposed filename '" + filename