X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FNewickFileTests.java;h=7acc37d07fa2566ba39a1706464315329e6fb749;hb=019a78415854a8c7fbfe0b566174ede7e69f24b8;hp=d8e21c4b473d7336f7dde77bda785d8eace3d4e9;hpb=52288466dd1e71946a06fd1e6ea15fa8e652c693;p=jalview.git diff --git a/test/jalview/io/NewickFileTests.java b/test/jalview/io/NewickFileTests.java index d8e21c4..7acc37d 100644 --- a/test/jalview/io/NewickFileTests.java +++ b/test/jalview/io/NewickFileTests.java @@ -93,7 +93,7 @@ public class NewickFileTests { stage = "Parsing testTree " + treename; System.out.println(treename + "\n" + testTree); - NewickFile nf = new NewickFile(testTree, FormatAdapter.PASTE); + NewickFile nf = new NewickFile(testTree, DataSourceType.PASTE); nf.parse(); AssertJUnit.assertTrue( stage + "Invalid Tree '" + nf.getWarningMessage() + "'", @@ -106,7 +106,7 @@ public class NewickFileTests AssertJUnit.assertTrue(stage + "Empty string generated", gentree != null && gentree.trim().length() > 0); stage = "Parsing regenerated testTree " + treename; - NewickFile nf_regen = new NewickFile(gentree, FormatAdapter.PASTE); + NewickFile nf_regen = new NewickFile(gentree, DataSourceType.PASTE); nf_regen.parse(); AssertJUnit.assertTrue( stage + "Newick file is invalid ('" @@ -172,7 +172,7 @@ public class NewickFileTests /** * @throws java.lang.Exception */ - @AfterClass + @AfterClass(alwaysRun = true) public static void tearDownAfterClass() throws Exception { }