X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FFileFormatsTest.java;h=ffc844cf914dd9f0de115331fa3a2e6c5c5961eb;hb=c8b35bed08a4bd8688b762bd50f13195c1cfb1c6;hp=8df228f6219d7a67e260e7febeae461434d4cc90;hpb=6a39c322e12aa5b9a14e240e19df8d6be814e594;p=jalview.git diff --git a/test/jalview/io/FileFormatsTest.java b/test/jalview/io/FileFormatsTest.java index 8df228f..ffc844c 100644 --- a/test/jalview/io/FileFormatsTest.java +++ b/test/jalview/io/FileFormatsTest.java @@ -21,17 +21,21 @@ public class FileFormatsTest } @Test(groups = "Functional") - public void testIsDynamic() + public void testIsIdentifiable() { FileFormats formats = FileFormats.getInstance(); - for (FileFormatI ff : FileFormat.values()) - { - assertFalse(formats.isIdentifiable(ff)); - } - assertTrue(formats.isIdentifiable(null)); + assertTrue(formats.isIdentifiable(formats.forName(FileFormat.Fasta + .getName()))); + assertTrue(formats.isIdentifiable(formats.forName(FileFormat.MMCif + .getName()))); + assertTrue(formats.isIdentifiable(formats.forName(FileFormat.Jnet + .getName()))); + assertFalse(formats.isIdentifiable(formats.forName(FileFormat.Jalview + .getName()))); + assertFalse(formats.isIdentifiable(null)); /* - * remove and re-add a format: it is now considered 'dynamically added' + * remove and re-add a format: it is still 'identifiable' */ formats.deregisterFileFormat(FileFormat.Fasta.getName()); assertNull(formats.forName(FileFormat.Fasta.getName())); @@ -104,7 +108,7 @@ public class FileFormatsTest FileFormats formats = FileFormats.getInstance(); assertSame(FileFormat.MMCif, formats.forName(FileFormat.MMCif.getName())); - assertFalse(formats.isIdentifiable(FileFormat.MMCif)); + assertTrue(formats.isIdentifiable(FileFormat.MMCif)); /* * deregister mmCIF format @@ -114,7 +118,7 @@ public class FileFormatsTest /* * re-register mmCIF format - * it is reinstated (but now classed as 'dynamic') + * it is reinstated (still 'identifiable') */ formats.registerFileFormat(FileFormat.MMCif); assertSame(FileFormat.MMCif,