X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FStockholmFileTest.java;h=d7a9166a059437aeb4454d1d5a7380b8678f1f07;hb=4eb9955fd442f5fa51c1771d00b6c352ff227a4c;hp=7ef5cc64dfc224308bceb1cf872347b6c477cfff;hpb=06e3a52df5af8243cdb67c023c8ddd834711ad36;p=jalview.git diff --git a/test/jalview/io/StockholmFileTest.java b/test/jalview/io/StockholmFileTest.java index 7ef5cc6..d7a9166 100644 --- a/test/jalview/io/StockholmFileTest.java +++ b/test/jalview/io/StockholmFileTest.java @@ -43,18 +43,18 @@ public class StockholmFileTest static String PfamFile = "examples/PF00111_seed.stk", RfamFile = "examples/RF00031_folded.stk"; - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void pfamFileIO() throws Exception { testFileIOwithFormat(new File(PfamFile), "STH", -1, 0); } - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void pfamFileDataExtraction() throws Exception { AppletFormatAdapter af = new AppletFormatAdapter(); AlignmentI al = af.readFile(PfamFile, af.FILE, - new IdentifyFile().Identify(PfamFile, af.FILE)); + new IdentifyFile().identify(PfamFile, af.FILE)); int numpdb = 0; for (SequenceI sq : al.getSequences()) { @@ -68,7 +68,7 @@ public class StockholmFileTest numpdb > 0); } - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void rfamFileIO() throws Exception { testFileIOwithFormat(new File(RfamFile), "STH", 2, 1); @@ -95,7 +95,7 @@ public class StockholmFileTest AppletFormatAdapter rf = new AppletFormatAdapter(); AlignmentI al = rf.readFile(ff, AppletFormatAdapter.FILE, - new IdentifyFile().Identify(ff, AppletFormatAdapter.FILE)); + new IdentifyFile().identify(ff, AppletFormatAdapter.FILE)); assertNotNull("Couldn't read supplied alignment data.", al); @@ -112,7 +112,7 @@ public class StockholmFileTest AppletFormatAdapter.PASTE, ioformat); assertNotNull("Couldn't parse reimported alignment data.", al_input); - String identifyoutput = new IdentifyFile().Identify(outputfile, + String identifyoutput = new IdentifyFile().identify(outputfile, AppletFormatAdapter.PASTE); assertNotNull("Identify routine failed for outputformat " + ioformat, identifyoutput); @@ -136,7 +136,7 @@ public class StockholmFileTest if (naliannot > -1) { assertEquals("Number of alignment annotations", naliannot, - numaliannot); + numaliannot); } assertTrue( @@ -268,7 +268,7 @@ public class StockholmFileTest + (ignoreFeatures ? " ignoring." : ""), ignoreFeatures || (seq_original[i].getSequenceFeatures() == null && seq_new[in] - .getSequenceFeatures() == null) + .getSequenceFeatures() == null) || (seq_original[i].getSequenceFeatures() != null && seq_new[in] .getSequenceFeatures() != null)); // compare sequence features