X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fgui%2FPopupMenuTest.java;h=46397d33b7c09c2e65701c4fad253edfccba469c;hb=8bbcfb93404decd6d660ca32b69a29f8a1f34e82;hp=f2248a8f6d77356508578fd318764d1318050606;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git
diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java
index f2248a8..46397d3 100644
--- a/test/jalview/gui/PopupMenuTest.java
+++ b/test/jalview/gui/PopupMenuTest.java
@@ -1,8 +1,15 @@
package jalview.gui;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
+
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.Annotation;
+import jalview.datamodel.SequenceI;
+import jalview.io.AppletFormatAdapter;
+import jalview.io.FormatAdapter;
import java.awt.Component;
import java.io.IOException;
@@ -14,14 +21,8 @@ import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
-import org.junit.Before;
-import org.junit.Test;
-
-import jalview.datamodel.AlignmentAnnotation;
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.SequenceI;
-import jalview.io.AppletFormatAdapter;
-import jalview.io.FormatAdapter;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
public class PopupMenuTest
{
@@ -40,7 +41,7 @@ public class PopupMenuTest
PopupMenu testee = null;
- @Before
+ @BeforeMethod(alwaysRun = true)
public void setUp() throws IOException
{
alignment = new FormatAdapter().readFile(TEST_DATA,
@@ -59,7 +60,7 @@ public class PopupMenuTest
}
}
- @Test
+ @Test(groups ={ "Functional" })
public void testConfigureReferenceAnnotationsMenu_noSequenceSelected()
{
JMenuItem menu = new JMenuItem();
@@ -77,7 +78,7 @@ public class PopupMenuTest
* are no reference annotations to add to the alignment. The menu item should
* be disabled.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testConfigureReferenceAnnotationsMenu_noReferenceAnnotations()
{
JMenuItem menu = new JMenuItem();
@@ -98,7 +99,7 @@ public class PopupMenuTest
* reference annotations are already on the alignment. The menu item should be
* disabled.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testConfigureReferenceAnnotationsMenu_alreadyAdded()
{
JMenuItem menu = new JMenuItem();
@@ -118,7 +119,7 @@ public class PopupMenuTest
* The menu item should be enabled, and acquire a tooltip which lists the
* annotation sources (calcIds) and type (labels).
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testConfigureReferenceAnnotationsMenu()
{
JMenuItem menu = new JMenuItem();
@@ -129,7 +130,7 @@ public class PopupMenuTest
testee.configureReferenceAnnotationsMenu(menu, seqs);
assertTrue(menu.isEnabled());
- String expected = "
Add annotations for JMOL/secondary structure PBD/Temp
";
+ String expected = "
Add annotations for JMOL/secondary structure PBD/Temp
";
assertEquals(expected, menu.getToolTipText());
}
@@ -139,7 +140,7 @@ public class PopupMenuTest
* on the alignment. The menu item should be enabled, and acquire a tooltip
* which lists the annotation sources (calcIds) and type (labels).
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testConfigureReferenceAnnotationsMenu_notOnAlignment()
{
JMenuItem menu = new JMenuItem();
@@ -150,7 +151,7 @@ public class PopupMenuTest
testee.configureReferenceAnnotationsMenu(menu, seqs);
assertTrue(menu.isEnabled());
- String expected = "
Add annotations for JMOL/secondary structure PBD/Temp
";
+ String expected = "
Add annotations for JMOL/secondary structure PBD/Temp
";
assertEquals(expected, menu.getToolTipText());
}
@@ -218,7 +219,7 @@ public class PopupMenuTest
* The menu item should be enabled, and acquire a tooltip which lists the
* annotation sources (calcIds) and type (labels).
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testConfigureReferenceAnnotationsMenu_twoViews()
{
}
@@ -227,7 +228,7 @@ public class PopupMenuTest
* Test for building menu options including 'show' and 'hide' annotation
* types.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testBuildAnnotationTypesMenus()
{
JMenu showMenu = new JMenu();
@@ -238,28 +239,32 @@ public class PopupMenuTest
// PDB.secondary structure on Sequence0
AlignmentAnnotation annotation = new AlignmentAnnotation(
- "secondary structure", "", 0);
+ "secondary structure", "", new Annotation[]
+ {});
annotation.setCalcId("PDB");
annotation.visible = true;
seqs.get(0).addAlignmentAnnotation(annotation);
parentPanel.getAlignment().addAnnotation(annotation);
// JMOL.secondary structure on Sequence0 - hidden
- annotation = new AlignmentAnnotation("secondary structure", "", 0);
+ annotation = new AlignmentAnnotation("secondary structure", "", new Annotation[]
+ {});
annotation.setCalcId("JMOL");
annotation.visible = false;
seqs.get(0).addAlignmentAnnotation(annotation);
parentPanel.getAlignment().addAnnotation(annotation);
// Jpred.SSP on Sequence0 - hidden
- annotation = new AlignmentAnnotation("SSP", "", 0);
+ annotation = new AlignmentAnnotation("SSP", "", new Annotation[]
+ {});
annotation.setCalcId("JPred");
annotation.visible = false;
seqs.get(0).addAlignmentAnnotation(annotation);
parentPanel.getAlignment().addAnnotation(annotation);
// PDB.Temp on Sequence1
- annotation = new AlignmentAnnotation("Temp", "", 0);
+ annotation = new AlignmentAnnotation("Temp", "", new Annotation[]
+ {});
annotation.setCalcId("PDB");
annotation.visible = true;
seqs.get(1).addAlignmentAnnotation(annotation);
@@ -305,7 +310,7 @@ public class PopupMenuTest
/**
* Test for building menu options with only 'hide' annotation types enabled.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testBuildAnnotationTypesMenus_showDisabled()
{
JMenu showMenu = new JMenu();
@@ -316,14 +321,16 @@ public class PopupMenuTest
// PDB.secondary structure on Sequence0
AlignmentAnnotation annotation = new AlignmentAnnotation(
- "secondary structure", "", 0);
+ "secondary structure", "", new Annotation[]
+ {});
annotation.setCalcId("PDB");
annotation.visible = true;
seqs.get(0).addAlignmentAnnotation(annotation);
parentPanel.getAlignment().addAnnotation(annotation);
// PDB.Temp on Sequence1
- annotation = new AlignmentAnnotation("Temp", "", 0);
+ annotation = new AlignmentAnnotation("Temp", "", new Annotation[]
+ {});
annotation.setCalcId("PDB");
annotation.visible = true;
seqs.get(1).addAlignmentAnnotation(annotation);
@@ -362,7 +369,7 @@ public class PopupMenuTest
/**
* Test for building menu options with only 'show' annotation types enabled.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testBuildAnnotationTypesMenus_hideDisabled()
{
JMenu showMenu = new JMenu();
@@ -373,14 +380,16 @@ public class PopupMenuTest
// PDB.secondary structure on Sequence0
AlignmentAnnotation annotation = new AlignmentAnnotation(
- "secondary structure", "", 0);
+ "secondary structure", "", new Annotation[]
+ {});
annotation.setCalcId("PDB");
annotation.visible = false;
seqs.get(0).addAlignmentAnnotation(annotation);
parentPanel.getAlignment().addAnnotation(annotation);
// PDB.Temp on Sequence1
- annotation = new AlignmentAnnotation("Temp", "", 0);
+ annotation = new AlignmentAnnotation("Temp", "", new Annotation[]
+ {});
annotation.setCalcId("PDB2");
annotation.visible = false;
seqs.get(1).addAlignmentAnnotation(annotation);