X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FBackupFilesTest.java;h=64cf902facc766a3b11073d27461eb8cf3307e80;hb=9028e7194ce7bc6d284671317bd4016694affbd1;hp=a78936e7bc1d287a146367cb14a8ce53f1fb833a;hpb=3069ade337eb42af30baf34a69f0a7f4cefe3948;p=jalview.git diff --git a/test/jalview/io/BackupFilesTest.java b/test/jalview/io/BackupFilesTest.java index a78936e..64cf902 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 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 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 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 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)); @@ -209,6 +210,14 @@ public class BackupFilesTest { Cache.loadProperties("test/jalview/io/testProps.jvprops"); + 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); @@ -222,6 +231,7 @@ public class BackupFilesTest Integer.toString(rollMax)); Cache.applicationProperties.setProperty(BackupFiles.CONFIRM_DELETE_OLD, "false"); + */ } private void save() @@ -272,7 +282,7 @@ public class BackupFilesTest { newfile.delete(); } - File[] tmpFiles = BackupFiles.lsBackupFiles(newFile, suffix, digits); + File[] tmpFiles = getBackupFiles(newFile, suffix, digits); for (int i = 0; i < tmpFiles.length; i++) { if (actuallyDeleteTmpFiles) @@ -286,15 +296,24 @@ public class BackupFilesTest } } + private static File[] getBackupFiles(String f, String s, int i) + { + TreeMap bfTreeMap = BackupFiles.getBackupFilesAsTreeMap(f, + s, i); + File[] backupFiles = new File[bfTreeMap.size()]; + bfTreeMap.values().toArray(backupFiles); + return backupFiles; + } + private static File[] getBackupFiles() { - return BackupFiles.lsBackupFiles(newFile, suffix, digits); + return getBackupFiles(newFile, suffix, digits); } private static boolean checkBackupFiles(HashMap indexmap) throws IOException { - TreeMap map = BackupFiles.lsBackupFilesAsTreeMap(newFile, + TreeMap map = BackupFiles.getBackupFilesAsTreeMap(newFile, suffix, digits); Enumeration indexesenum = Collections .enumeration(indexmap.keySet()); @@ -332,7 +351,7 @@ public class BackupFilesTest private static boolean checkBackupFiles(int[] indexes) throws IOException { - TreeMap map = BackupFiles.lsBackupFilesAsTreeMap(newFile, + TreeMap map = BackupFiles.getBackupFilesAsTreeMap(newFile, suffix, digits); for (int m = 0; m < indexes.length; m++) { @@ -352,8 +371,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 @@ -372,7 +391,7 @@ public class BackupFilesTest private static String[] getBackupFilesAsStrings() { - File[] files = BackupFiles.lsBackupFiles(newFile, suffix, digits); + File[] files = getBackupFiles(newFile, suffix, digits); String[] filenames = new String[files.length]; for (int i = 0; i < files.length; i++) {