JAL-1805 test envirionment separation

[jalview.git] / test / jalview / analysis / ParsePropertiesTest.java

diff --git a/test/jalview/analysis/ParsePropertiesTest.java b/test/jalview/analysis/ParsePropertiesTest.java
index a01d255..221d47e 100644 (file)
--- a/test/jalview/analysis/ParsePropertiesTest.java
+++ b/test/jalview/analysis/ParsePropertiesTest.java
@@ -1,18 +1,18 @@
 package jalview.analysis;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
 
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 
+import java.util.List;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 public class ParsePropertiesTest
 {
 
@@ -23,7 +23,7 @@ public class ParsePropertiesTest
   /**
    * Construct an alignment with 4 sequences with varying description format
    */
-  @Before
+  @BeforeMethod
   public void setUp()
   {
     SequenceI[] seqs = new SequenceI[]
@@ -46,7 +46,7 @@ public class ParsePropertiesTest
    * more 'number characters' (0-9+.), i.e. greedily matches any trailing
    * numeric part of the string
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testGetScoresFromDescription()
   {
     String regex = ".*([-0-9.+]+)";
@@ -82,7 +82,7 @@ public class ParsePropertiesTest
    * character, followed by at least one 'number character', then any trailing
    * characters.
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testGetScoresFromDescription_twoScores()
   {
     String regex = ".*([-0-9.+]+).+([-0-9.+]+).*";
@@ -144,7 +144,7 @@ public class ParsePropertiesTest
    * 
    * @see AlignFrame.extractScores_actionPerformed
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testGetScoresFromDescription_wordBoundaries()
   {
     String regex = "\\W*([-+eE0-9.]+)";