JAL-1152 check 'autocalculated' not 'null sequenceRef'; sort by sequence

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

diff --git a/test/jalview/gui/ProgressBarTest.java b/test/jalview/gui/ProgressBarTest.java
index 2d3db68..e50148c 100644 (file)
--- a/test/jalview/gui/ProgressBarTest.java
+++ b/test/jalview/gui/ProgressBarTest.java
@@ -1,8 +1,7 @@
 package jalview.gui;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
 
 import java.awt.Component;
 import java.awt.FlowLayout;
@@ -11,7 +10,8 @@ import java.awt.GridLayout;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public class ProgressBarTest
 {
@@ -20,20 +20,20 @@ public class ProgressBarTest
 
   private JLabel statusBar;
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testConstructor_prematureInstantiation()
   {
     try
     {
       new ProgressBar(null, null);
-      fail("Expected exception");
+      Assert.fail("Expected exception");
     } catch (NullPointerException e)
     {
       // expected
     }
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testConstructor_wrongLayout()
   {
     statusPanel = new JPanel();
@@ -41,14 +41,14 @@ public class ProgressBarTest
     try
     {
       new ProgressBar(statusPanel, null);
-      fail("expected exception");
+      Assert.fail("expected exception");
     } catch (IllegalArgumentException e)
     {
       // expected
     }
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testSetProgressBar()
   {
     statusPanel = new JPanel();