X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FIdentifyFileTest.java;h=cf7f58f36ded7413560a676af56963aa85406c71;hb=3b3c59cfa50e942d2fa5b367b7117cade9459ce7;hp=3d800d885291243384170bb26288a91c36811665;hpb=483e7163b1fb8d4bcb9393014816c944befce328;p=jalview.git diff --git a/test/jalview/io/IdentifyFileTest.java b/test/jalview/io/IdentifyFileTest.java index 3d800d8..cf7f58f 100644 --- a/test/jalview/io/IdentifyFileTest.java +++ b/test/jalview/io/IdentifyFileTest.java @@ -89,12 +89,11 @@ public class IdentifyFileTest @DataProvider(name = "identifyFiles") public Object[][] IdentifyFileDP() { - return new Object[][] { - { "examples/example.json", FileFormat.Json }, + return new Object[][] { { "examples/example.json", FileFormat.Json }, { "examples/plantfdx.fa", FileFormat.Fasta }, { "examples/dna_interleaved.phy", FileFormat.Phylip }, { "examples/2GIS.pdb", FileFormat.PDB }, - { "examples/rf00031_folded.stk", FileFormat.Stockholm }, + { "examples/RF00031_folded.stk", FileFormat.Stockholm }, { "examples/testdata/test.rnaml", FileFormat.Rnaml }, { "examples/testdata/test.aln", FileFormat.Clustal }, { "examples/testdata/test.pfam", FileFormat.Pfam }, @@ -107,12 +106,12 @@ public class IdentifyFileTest { "examples/testdata/simpleGff3.gff", FileFormat.Features }, { "examples/testdata/test.jvp", FileFormat.Jalview }, { "examples/testdata/test.cif", FileFormat.MMCif }, - { - "examples/testdata/cullpdb_pc25_res3.0_R0.3_d150729_chains9361.fasta.15316", + { "examples/testdata/cullpdb_pc25_res3.0_R0.3_d150729_chains9361.fasta.15316", FileFormat.Fasta }, - - // { "examples/testdata/test.amsa", "AMSA" }, - // { "examples/test.jnet", "JnetFile" }, + { "resources/scoreModel/pam250.scm", FileFormat.ScoreMatrix }, + { "resources/scoreModel/blosum80.scm", FileFormat.ScoreMatrix } + // { "examples/testdata/test.amsa", "AMSA" }, + // { "examples/test.jnet", "JnetFile" }, }; } @@ -125,8 +124,8 @@ public class IdentifyFileTest // too few columns: assertFalse(id.looksLikeFeatureData("1 \t 2 \t 3 \t 4 \t 5")); // GFF format: - assertTrue(id - .looksLikeFeatureData("Seq1\tlocal\tHelix\t2456\t2462\tss")); + assertTrue( + id.looksLikeFeatureData("Seq1\tlocal\tHelix\t2456\t2462\tss")); // Jalview format: assertTrue(id.looksLikeFeatureData("Helix\tSeq1\t-1\t2456\t2462\tss")); // non-numeric start column: