JAL-1270 JUnit to TestNG refactoring

[jalview.git] / test / jalview / ws / jabaws / RNAStructExportImport.java

diff --git a/test/jalview/ws/jabaws/RNAStructExportImport.java b/test/jalview/ws/jabaws/RNAStructExportImport.java
index 1475b4e..6b92b85 100644 (file)
--- a/test/jalview/ws/jabaws/RNAStructExportImport.java
+++ b/test/jalview/ws/jabaws/RNAStructExportImport.java
@@ -20,9 +20,23 @@
  */
 package jalview.ws.jabaws;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
+import java.awt.Component;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import compbio.metadata.WrongParameterException;
+
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
 import jalview.gui.Jalview2XML;
@@ -35,20 +49,6 @@ import jalview.ws.jws2.SequenceAnnotationWSClient;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.AutoCalcSetting;
 
-import java.awt.Component;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import compbio.metadata.WrongParameterException;
-
 public class RNAStructExportImport
 {
   public static String testseqs = "examples/RF00031_folded.stk";
@@ -81,7 +81,7 @@ public class RNAStructExportImport
 
     if (rnaalifoldws == null)
     {
-      fail("no web service");
+      Assert.fail("no web service");
     }
 
     jalview.io.FileLoader fl = new jalview.io.FileLoader(false);
@@ -144,7 +144,9 @@ public class RNAStructExportImport
       {
         if (aa.isRNA())
         {
-          Assert.assertTrue("Did not create valid structure from RNAALiFold prediction", aa.isValidStruc());
+          assertTrue(
+                  "Did not create valid structure from RNAALiFold prediction",
+                  aa.isValidStruc());
         }
       }
     }
@@ -216,7 +218,7 @@ public class RNAStructExportImport
     {
       e.printStackTrace();
     }
-    fail("Test "
+    Assert.fail("Test "
             + testname
             + "\nCouldn't complete Annotation file roundtrip input/output/input test.");
   }
@@ -235,7 +237,7 @@ public class RNAStructExportImport
           rg.setValue("292");
         } catch (WrongParameterException q)
         {
-          fail("Couldn't set the temperature parameter "
+          Assert.fail("Couldn't set the temperature parameter "
                   + q.getStackTrace());
         }
         opts.add(rg);