X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FPopupMenuTest.java;h=0ac7a7edb441f2e760e1459681cfa18d3f744be8;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=f2248a8f6d77356508578fd318764d1318050606;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git

diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java
index f2248a8..0ac7a7e 100644
--- a/test/jalview/gui/PopupMenuTest.java
+++ b/test/jalview/gui/PopupMenuTest.java
@@ -1,8 +1,36 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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 jalview.util.MessageManager;
 
 import java.awt.Component;
 import java.io.IOException;
@@ -14,14 +42,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 +62,7 @@ public class PopupMenuTest
 
   PopupMenu testee = null;
 
-  @Before
+  @BeforeMethod(alwaysRun = true)
   public void setUp() throws IOException
   {
     alignment = new FormatAdapter().readFile(TEST_DATA,
@@ -51,15 +73,15 @@ public class PopupMenuTest
     int i = 0;
     for (SequenceI seq : alignment.getSequences())
     {
-      final AlignmentAnnotation annotation = new AlignmentAnnotation("label" + i,
-              "desc" + i, i);
+      final AlignmentAnnotation annotation = new AlignmentAnnotation(
+              "label" + i, "desc" + i, i);
       annotation.setCalcId("calcId" + i);
       seq.addAlignmentAnnotation(annotation);
       annotation.setSequenceRef(seq);
     }
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testConfigureReferenceAnnotationsMenu_noSequenceSelected()
   {
     JMenuItem menu = new JMenuItem();
@@ -77,7 +99,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 +120,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 +140,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 +151,9 @@ public class PopupMenuTest
 
     testee.configureReferenceAnnotationsMenu(menu, seqs);
     assertTrue(menu.isEnabled());
-    String expected = "<html><table width=350 border=0><tr><td>Add annotations for<br/>JMOL/secondary structure<br/>PBD/Temp</td></tr></table></html>";
+    String s = MessageManager.getString("label.add_annotations_for");
+    String expected = "<html><style> p.ttip {width: 350; text-align: justify; word-wrap: break-word;}</style><p class=\"ttip\">"
+            + s + "<br/>Jmol/secondary structure<br/>PDB/Temp</p></html>";
     assertEquals(expected, menu.getToolTipText());
   }
 
@@ -139,7 +163,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 +174,9 @@ public class PopupMenuTest
 
     testee.configureReferenceAnnotationsMenu(menu, seqs);
     assertTrue(menu.isEnabled());
-    String expected = "<html><table width=350 border=0><tr><td>Add annotations for<br/>JMOL/secondary structure<br/>PBD/Temp</td></tr></table></html>";
+    String s = MessageManager.getString("label.add_annotations_for");
+    String expected = "<html><style> p.ttip {width: 350; text-align: justify; word-wrap: break-word;}</style><p class=\"ttip\">"
+            + s + "<br/>Jmol/secondary structure<br/>PDB/Temp</p></html>";
     assertEquals(expected, menu.getToolTipText());
   }
 
@@ -168,7 +194,7 @@ public class PopupMenuTest
     // PDB.secondary structure on Sequence0
     AlignmentAnnotation annotation = new AlignmentAnnotation(
             "secondary structure", "", 0);
-    annotation.setCalcId("PBD");
+    annotation.setCalcId("PDB");
     seqs.get(0).getDatasetSequence().addAlignmentAnnotation(annotation);
     if (addToSequence)
     {
@@ -181,7 +207,7 @@ public class PopupMenuTest
 
     // PDB.Temp on Sequence1
     annotation = new AlignmentAnnotation("Temp", "", 0);
-    annotation.setCalcId("PBD");
+    annotation.setCalcId("PDB");
     seqs.get(1).getDatasetSequence().addAlignmentAnnotation(annotation);
     if (addToSequence)
     {
@@ -194,7 +220,7 @@ public class PopupMenuTest
 
     // JMOL.secondary structure on Sequence0
     annotation = new AlignmentAnnotation("secondary structure", "", 0);
-    annotation.setCalcId("JMOL");
+    annotation.setCalcId("Jmol");
     seqs.get(0).getDatasetSequence().addAlignmentAnnotation(annotation);
     if (addToSequence)
     {
@@ -218,7 +244,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 +253,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 +264,29 @@ 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);
@@ -279,8 +306,7 @@ public class PopupMenuTest
 
     assertEquals(4, showOptions.length); // includes 'All' and separator
     assertEquals(4, hideOptions.length);
-    assertEquals("All",
-            ((JMenuItem) showOptions[0]).getText());
+    assertEquals("All", ((JMenuItem) showOptions[0]).getText());
     assertTrue(showOptions[1] instanceof JPopupMenu.Separator);
     assertEquals(JSeparator.HORIZONTAL,
             ((JSeparator) showOptions[1]).getOrientation());
@@ -290,8 +316,7 @@ public class PopupMenuTest
     assertEquals("SSP", ((JMenuItem) showOptions[3]).getText());
     assertEquals("JPred", ((JMenuItem) showOptions[3]).getToolTipText());
 
-    assertEquals("All",
-            ((JMenuItem) hideOptions[0]).getText());
+    assertEquals("All", ((JMenuItem) hideOptions[0]).getText());
     assertTrue(hideOptions[1] instanceof JPopupMenu.Separator);
     assertEquals(JSeparator.HORIZONTAL,
             ((JSeparator) hideOptions[1]).getOrientation());
@@ -305,7 +330,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 +341,14 @@ 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 +387,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 +398,14 @@ 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);