X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FJSONFileTest.java;h=3f7edd471847d67059912fcaf657b1152c7f3c98;hb=refs%2Fheads%2Fbug%2FJAL-2308;hp=6e4458ee6430a0cc757dfa448af0dc4be5967972;hpb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git diff --git a/test/jalview/io/JSONFileTest.java b/test/jalview/io/JSONFileTest.java index 6e4458e..3f7edd4 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.0b1) - * 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; @@ -305,7 +305,8 @@ public class JSONFileTest Assert.assertNotNull(cs.getHiddenColumns()); List hiddenCols = cs.getHiddenColumns(); Assert.assertEquals(hiddenCols.size(), TEST_CS_HEIGHT); - Assert.assertEquals(hiddenCols, expectedColSel.getHiddenColumns(), + Assert.assertEquals(hiddenCols.get(0), expectedColSel + .getHiddenColumns().get(0), "Mismatched hidden columns!"); } @@ -314,7 +315,8 @@ public class JSONFileTest { Assert.assertNotNull(testJsonFile.getHiddenSequences(), "Hidden sequence Expected but found Null"); - Assert.assertEquals(jf.getHiddenSequences().length, 1, "Hidden sequece"); + Assert.assertEquals(jf.getHiddenSequences().length, 1, + "Hidden sequence"); } @Test(groups = { "Functional" })