X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FJSONFileTest.java;h=b6a3e4ac99c9ef2386aa004163ba9a3b3c46d687;hb=8bbcfb93404decd6d660ca32b69a29f8a1f34e82;hp=a695d3742e30b35c9f5044a0d123ea7d3b53b360;hpb=3f3c6c3a2b99fee2e726d18302af1b3320331212;p=jalview.git

diff --git a/test/jalview/io/JSONFileTest.java b/test/jalview/io/JSONFileTest.java
index a695d37..b6a3e4a 100644
--- a/test/jalview/io/JSONFileTest.java
+++ b/test/jalview/io/JSONFileTest.java
@@ -62,7 +62,7 @@ public class JSONFileTest
 
   private JSONFile jf;
 
-  @BeforeTest
+  @BeforeTest(alwaysRun = true)
   public void setup() throws Exception
   {
     // create and add sequences
@@ -228,7 +228,7 @@ public class JSONFileTest
 
   }
 
-  @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
   public void methodSetup()
   {
     passedCount = 0;
@@ -246,13 +246,13 @@ public class JSONFileTest
     jf = null;
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void roundTripTest()
   {
     assertNotNull("JSON roundtrip test failed!", testJsonFile);
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testSeqParsed()
   {
     assertNotNull("Couldn't read supplied alignment data.", testAlignment);
@@ -269,7 +269,7 @@ public class JSONFileTest
             TEST_SEQ_HEIGHT, passedCount);
   }
   
-  @Test
+  @Test(groups ={ "Functional" })
   public void hiddenColsTest()
   {
     ColumnSelection cs = testJsonFile.getColumnSelection();
@@ -281,7 +281,7 @@ public class JSONFileTest
             "Mismatched hidden columns!");
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void hiddenSeqsTest()
   {
     Assert.assertNotNull(testJsonFile.getHiddenSequences(),
@@ -290,7 +290,7 @@ public class JSONFileTest
             "Hidden sequece");
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void colorSchemeTest()
   {
     Assert.assertNotNull(testJsonFile.getColourScheme(),
@@ -300,14 +300,14 @@ public class JSONFileTest
             "Zappo colour scheme expected!");
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void isShowSeqFeaturesSet()
   {
     Assert.assertTrue(testJsonFile.isShowSeqFeatures(),
             "Sequence feature isDisplayed setting expected to be true");
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testGrpParsed()
   {
     Assert.assertNotNull(testAlignment.getGroups());
@@ -323,7 +323,7 @@ public class JSONFileTest
             TEST_GRP_HEIGHT, passedCount);
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testAnnotationParsed()
   {
     Assert.assertNotNull(testAlignment.getAlignmentAnnotation());