Merge branch 'Jalview-JS/jim/JAL-3253-JAL-3418' into Jalview-JS/JAL-3253-applet

[jalview.git] / test / jalview / gui / ColourMenuHelperTest.java

diff --git a/test/jalview/gui/ColourMenuHelperTest.java b/test/jalview/gui/ColourMenuHelperTest.java
index 9d4ed6c..5128fe5 100644 (file)
--- a/test/jalview/gui/ColourMenuHelperTest.java
+++ b/test/jalview/gui/ColourMenuHelperTest.java
@@ -34,13 +34,13 @@ public class ColourMenuHelperTest
   /**
    * Use a properties file with a user-defined colour scheme
    */
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public void setUp()
   {
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
   }
 
-  @Test
+  @Test(groups = "Functional")
   public void testAddMenuItems_peptide()
   {
     SequenceI s1 = new Sequence("s1", "KFRQSILM");
@@ -94,7 +94,7 @@ public class ColourMenuHelperTest
        * check i18n for display name
        */
       String label = MessageManager.getStringOrReturn("label.colourScheme_",
-              name.toLowerCase().replace(" ", "_"));
+              name);
       assertEquals(item.getText(), label);
     }
 
@@ -105,7 +105,7 @@ public class ColourMenuHelperTest
     assertFalse(bgElements.hasMoreElements());
   }
 
-  @Test
+  @Test(groups = "Functional")
   public void testAddMenuItems_nucleotide()
   {
     SequenceI s1 = new Sequence("s1", "GAATAATCCATAACAG");
@@ -164,7 +164,7 @@ public class ColourMenuHelperTest
        * check i18n for display name
        */
       String label = MessageManager.getStringOrReturn("label.colourScheme_",
-              name.toLowerCase().replace(" ", "_"));
+              name);
       assertEquals(item.getText(), label);
     }
   
@@ -182,7 +182,7 @@ public class ColourMenuHelperTest
    * <li>only simple colour schemes (colour per residue)</li>
    * </ul>
    */
-  @Test
+  @Test(groups = "Functional")
   public void testAddMenuItems_simpleOnly()
   {
     SequenceI s1 = new Sequence("s1", "KFRQSILM");
@@ -220,7 +220,7 @@ public class ColourMenuHelperTest
   /*
    * menu for AlignFrame includes 'User Defined Colour'
    */
-  @Test
+  @Test(groups = "Functional")
   public void testAddMenuItems_forAlignFrame()
   {
     SequenceI s1 = new Sequence("s1", "KFRQSILM");