X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FJSONFileTest.java;h=f75f433857a53d32ee2de793891978abadc56b47;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=e0b050f6da21dbc2b03b0eb46d419e7fe28fc965;hpb=dc1ad37588e94cbc9ebbfaab2e9e49407f464310;p=jalview.git diff --git a/test/jalview/io/JSONFileTest.java b/test/jalview/io/JSONFileTest.java index e0b050f..f75f433 100644 --- a/test/jalview/io/JSONFileTest.java +++ b/test/jalview/io/JSONFileTest.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -114,7 +114,7 @@ public class JSONFileTest for (Sequence seq : seqs) { - seq.setDatasetSequence(seq); + seq.createDatasetSequence(); expectedSeqs.put(seq.getName(), seq); } @@ -262,7 +262,7 @@ public class JSONFileTest passedCount = 0; } - @AfterTest + @AfterTest(alwaysRun = true) public void tearDown() throws Exception { testJsonFile = null; @@ -324,9 +324,6 @@ public class JSONFileTest "Colourscheme is null, parsing failed!"); Assert.assertEquals(testJsonFile.getGlobalColourScheme(), "Zappo", "Zappo colour scheme expected!"); - // Assert.assertTrue( - // testJsonFile.getGlobalColourScheme() instanceof ZappoColourScheme, - // "Zappo colour scheme expected!"); } @Test(groups = { "Functional" })