git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1759 reinstate changes from bdfde6ef989da0702cef90f03858f0f30e0bc83a
[jalview.git]
/
test
/
jalview
/
gui
/
PopupMenuTest.java
diff --git
a/test/jalview/gui/PopupMenuTest.java
b/test/jalview/gui/PopupMenuTest.java
index
787171d
..
f984dfc
100644
(file)
--- a/
test/jalview/gui/PopupMenuTest.java
+++ b/
test/jalview/gui/PopupMenuTest.java
@@
-4,6
+4,13
@@
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertTrue;
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;
import java.util.ArrayList;
import java.awt.Component;
import java.io.IOException;
import java.util.ArrayList;
@@
-17,13
+24,6
@@
import javax.swing.JSeparator;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import jalview.datamodel.AlignmentAnnotation;
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.Annotation;
-import jalview.datamodel.SequenceI;
-import jalview.io.AppletFormatAdapter;
-import jalview.io.FormatAdapter;
-
public class PopupMenuTest
{
// 4 sequences x 13 positions
public class PopupMenuTest
{
// 4 sequences x 13 positions
@@
-60,7
+60,7
@@
public class PopupMenuTest
}
}
}
}
- @Test
+ @Test(groups ={ "Functional" })
public void testConfigureReferenceAnnotationsMenu_noSequenceSelected()
{
JMenuItem menu = new JMenuItem();
public void testConfigureReferenceAnnotationsMenu_noSequenceSelected()
{
JMenuItem menu = new JMenuItem();
@@
-78,7
+78,7
@@
public class PopupMenuTest
* are no reference annotations to add to the alignment. The menu item should
* be disabled.
*/
* 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();
public void testConfigureReferenceAnnotationsMenu_noReferenceAnnotations()
{
JMenuItem menu = new JMenuItem();
@@
-99,7
+99,7
@@
public class PopupMenuTest
* reference annotations are already on the alignment. The menu item should be
* disabled.
*/
* 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();
public void testConfigureReferenceAnnotationsMenu_alreadyAdded()
{
JMenuItem menu = new JMenuItem();
@@
-119,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).
*/
* 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();
public void testConfigureReferenceAnnotationsMenu()
{
JMenuItem menu = new JMenuItem();
@@
-140,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).
*/
* 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();
public void testConfigureReferenceAnnotationsMenu_notOnAlignment()
{
JMenuItem menu = new JMenuItem();
@@
-219,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).
*/
* 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()
{
}
public void testConfigureReferenceAnnotationsMenu_twoViews()
{
}
@@
-228,7
+228,7
@@
public class PopupMenuTest
* Test for building menu options including 'show' and 'hide' annotation
* types.
*/
* Test for building menu options including 'show' and 'hide' annotation
* types.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testBuildAnnotationTypesMenus()
{
JMenu showMenu = new JMenu();
public void testBuildAnnotationTypesMenus()
{
JMenu showMenu = new JMenu();
@@
-310,7
+310,7
@@
public class PopupMenuTest
/**
* Test for building menu options with only 'hide' annotation types enabled.
*/
/**
* Test for building menu options with only 'hide' annotation types enabled.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testBuildAnnotationTypesMenus_showDisabled()
{
JMenu showMenu = new JMenu();
public void testBuildAnnotationTypesMenus_showDisabled()
{
JMenu showMenu = new JMenu();
@@
-369,7
+369,7
@@
public class PopupMenuTest
/**
* Test for building menu options with only 'show' annotation types enabled.
*/
/**
* Test for building menu options with only 'show' annotation types enabled.
*/
- @Test
+ @Test(groups ={ "Functional" })
public void testBuildAnnotationTypesMenus_hideDisabled()
{
JMenu showMenu = new JMenu();
public void testBuildAnnotationTypesMenus_hideDisabled()
{
JMenu showMenu = new JMenu();