X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FPaintRefresherTest.java;h=212bcce15805b0da3ff70349ced68b31e4ce3c0f;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=aff47156c140ab02fe1c9fd2a11425f4b87644f7;hpb=3412b273e964fb1a9d22564b04a5f0c827ec2461;p=jalview.git diff --git a/test/jalview/gui/PaintRefresherTest.java b/test/jalview/gui/PaintRefresherTest.java index aff4715..212bcce 100644 --- a/test/jalview/gui/PaintRefresherTest.java +++ b/test/jalview/gui/PaintRefresherTest.java @@ -1,11 +1,29 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.gui; -import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertTrue; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.Test; -import org.testng.annotations.BeforeMethod; + import jalview.datamodel.Alignment; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; @@ -17,22 +35,26 @@ import java.util.Map; import javax.swing.JPanel; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + public class PaintRefresherTest { // TODO would prefer PaintRefresher to be a single rather than static - @BeforeMethod + @BeforeMethod(alwaysRun = true) public void setUp() { PaintRefresher.components.clear(); } - @AfterMethod + @AfterMethod(alwaysRun = true) public void tearDown() { PaintRefresher.components.clear(); } - @Test + @Test(groups = { "Functional" }) public void testRegister() { JPanel jp = new JPanel(); @@ -58,11 +80,11 @@ public class PaintRefresherTest assertTrue(registered.get("44").contains(jp4)); } - @Test + @Test(groups = { "Functional" }) public void testRemoveComponent() { Map> registered = PaintRefresher.components; - + // no error with an empty PaintRefresher JPanel jp = new JPanel(); JPanel jp2 = new JPanel(); @@ -90,10 +112,10 @@ public class PaintRefresherTest assertTrue(registered.get("22").contains(jp2)); } - @Test + @Test(groups = { "Functional" }) public void testGetAssociatedPanels() { - SequenceI [] seqs = new SequenceI[]{new Sequence("", "ABC")}; + SequenceI[] seqs = new SequenceI[] { new Sequence("", "ABC") }; Alignment al = new Alignment(seqs); /* @@ -108,7 +130,7 @@ public class PaintRefresherTest .getSequenceSetId()); assertEquals(1, panels.length); assertSame(ap1, panels[0]); - + panels = PaintRefresher.getAssociatedPanels(av.getSequenceSetId() + 1); assertEquals(0, panels.length); }