X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FPaintRefresherTest.java;h=5167eb3954fab24971babcc597f5c53be00018d7;hb=1810df9d010000e434975a8a4e68dcbda238f7f1;hp=1da7c8cfc367b436adcb8950297132db5dac62ad;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git
diff --git a/test/jalview/gui/PaintRefresherTest.java b/test/jalview/gui/PaintRefresherTest.java
index 1da7c8c..5167eb3 100644
--- a/test/jalview/gui/PaintRefresherTest.java
+++ b/test/jalview/gui/PaintRefresherTest.java
@@ -1,8 +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.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
import jalview.datamodel.Alignment;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
@@ -14,26 +35,35 @@ import java.util.Map;
import javax.swing.JPanel;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
public class PaintRefresherTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
// TODO would prefer PaintRefresher to be a single rather than static
- @Before
+ @BeforeMethod(alwaysRun = true)
public void setUp()
{
PaintRefresher.components.clear();
}
- @After
+ @AfterMethod(alwaysRun = true)
public void tearDown()
{
PaintRefresher.components.clear();
}
- @Test
+ @Test(groups = { "Functional" })
public void testRegister()
{
JPanel jp = new JPanel();
@@ -59,11 +89,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();
@@ -91,10 +121,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);
/*
@@ -109,7 +139,7 @@ public class PaintRefresherTest
.getSequenceSetId());
assertEquals(1, panels.length);
assertSame(ap1, panels[0]);
-
+
panels = PaintRefresher.getAssociatedPanels(av.getSequenceSetId() + 1);
assertEquals(0, panels.length);
}