X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FFileFormatsTest.java;h=bf01fb73fa59101f9d7f5517a0e40a36d7acc761;hb=41e20dff103d6d1995b2ed3b6d6479f359025531;hp=53f18bf20ba30ff0db4f0d1631976c7bf9586be4;hpb=9e6afa38edbc34c7e989dc643d8c173b677fdbd0;p=jalview.git diff --git a/test/jalview/io/FileFormatsTest.java b/test/jalview/io/FileFormatsTest.java index 53f18bf..bf01fb7 100644 --- a/test/jalview/io/FileFormatsTest.java +++ b/test/jalview/io/FileFormatsTest.java @@ -31,14 +31,15 @@ public class FileFormatsTest public void testIsIdentifiable() { FileFormats formats = FileFormats.getInstance(); - assertTrue(formats.isIdentifiable(formats.forName(FileFormat.Fasta - .getName()))); - assertTrue(formats.isIdentifiable(formats.forName(FileFormat.MMCif - .getName()))); - assertTrue(formats.isIdentifiable(formats.forName(FileFormat.Jnet - .getName()))); - assertTrue(formats.isIdentifiable(formats.forName(FileFormat.Jalview - .getName()))); + assertTrue(formats + .isIdentifiable(formats.forName(FileFormat.Fasta.getName()))); + assertTrue(formats + .isIdentifiable(formats.forName(FileFormat.MMCif.getName()))); + assertTrue(formats + .isIdentifiable(formats.forName(FileFormat.Jnet.getName()))); + assertTrue(formats + .isIdentifiable(formats.forName(FileFormat.Jalview.getName()))); + // GenBank/ENA assertFalse(formats.isIdentifiable(null)); /* @@ -55,7 +56,7 @@ public class FileFormatsTest @Test(groups = "Functional") public void testGetReadableFormats() { - String expected = "[Fasta, PFAM, Stockholm, PIR, BLC, AMSA, HTML, RNAML, JSON, PileUp, MSF, Clustal, PHYLIP, GFF or Jalview features, PDB, mmCIF, Jalview]"; + String expected = "[Fasta, PFAM, Stockholm, PIR, BLC, AMSA, HTML, RNAML, JSON, PileUp, MSF, Clustal, PHYLIP, GenBank Flatfile, ENA Flatfile, GFF or Jalview features, PDB, mmCIF, Jalview]"; FileFormats formats = FileFormats.getInstance(); assertEquals(formats.getReadableFormats().toString(), expected); } @@ -74,14 +75,14 @@ public class FileFormatsTest public void testDeregisterFileFormat() { String writable = "[Fasta, PFAM, Stockholm, PIR, BLC, AMSA, JSON, PileUp, MSF, Clustal, PHYLIP]"; - String readable = "[Fasta, PFAM, Stockholm, PIR, BLC, AMSA, HTML, RNAML, JSON, PileUp, MSF, Clustal, PHYLIP, GFF or Jalview features, PDB, mmCIF, Jalview]"; + String readable = "[Fasta, PFAM, Stockholm, PIR, BLC, AMSA, HTML, RNAML, JSON, PileUp, MSF, Clustal, PHYLIP, GenBank Flatfile, ENA Flatfile, GFF or Jalview features, PDB, mmCIF, Jalview]"; FileFormats formats = FileFormats.getInstance(); assertEquals(formats.getWritableFormats(true).toString(), writable); assertEquals(formats.getReadableFormats().toString(), readable); formats.deregisterFileFormat(FileFormat.Fasta.getName()); writable = "[PFAM, Stockholm, PIR, BLC, AMSA, JSON, PileUp, MSF, Clustal, PHYLIP]"; - readable = "[PFAM, Stockholm, PIR, BLC, AMSA, HTML, RNAML, JSON, PileUp, MSF, Clustal, PHYLIP, GFF or Jalview features, PDB, mmCIF, Jalview]"; + readable = "[PFAM, Stockholm, PIR, BLC, AMSA, HTML, RNAML, JSON, PileUp, MSF, Clustal, PHYLIP, GenBank Flatfile, ENA Flatfile, GFF or Jalview features, PDB, mmCIF, Jalview]"; assertEquals(formats.getWritableFormats(true).toString(), writable); assertEquals(formats.getReadableFormats().toString(), readable); @@ -90,7 +91,7 @@ public class FileFormatsTest */ formats.registerFileFormat(FileFormat.Fasta); writable = "[PFAM, Stockholm, PIR, BLC, AMSA, JSON, PileUp, MSF, Clustal, PHYLIP, Fasta]"; - readable = "[PFAM, Stockholm, PIR, BLC, AMSA, HTML, RNAML, JSON, PileUp, MSF, Clustal, PHYLIP, GFF or Jalview features, PDB, mmCIF, Jalview, Fasta]"; + readable = "[PFAM, Stockholm, PIR, BLC, AMSA, HTML, RNAML, JSON, PileUp, MSF, Clustal, PHYLIP, GenBank Flatfile, ENA Flatfile, GFF or Jalview features, PDB, mmCIF, Jalview, Fasta]"; assertEquals(formats.getWritableFormats(true).toString(), writable); assertEquals(formats.getReadableFormats().toString(), readable); } @@ -144,8 +145,7 @@ public class FileFormatsTest * verify the list of file formats registered matches the enum values */ FileFormats instance = FileFormats.getInstance(); - Iterator formats = instance.getFormats() - .iterator(); + Iterator formats = instance.getFormats().iterator(); FileFormatI[] builtIn = FileFormat.values(); for (FileFormatI ff : builtIn)