Merge branch 'develop' into trialMerge

[jalview.git] / test / jalview / ws / rest / ShmmrRSBSService.java

diff --git a/test/jalview/ws/rest/ShmmrRSBSService.java b/test/jalview/ws/rest/ShmmrRSBSService.java
index c4430ad..709f2c5 100644 (file)
--- a/test/jalview/ws/rest/ShmmrRSBSService.java
+++ b/test/jalview/ws/rest/ShmmrRSBSService.java
@@ -20,15 +20,16 @@
  */
 package jalview.ws.rest;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
 
-import java.util.Map;
+import jalview.gui.AlignFrame;
+import jalview.gui.JvOptionPane;
 
-import org.junit.Test;
+import java.util.Map;
 
-import jalview.gui.AlignFrame;
-import jalview.util.StringUtils;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 /**
  * @author jimp
@@ -37,7 +38,14 @@ import jalview.util.StringUtils;
 public class ShmmrRSBSService
 {
 
-  @Test
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
+  @Test(groups = { "Functional" })
   public void testShmmrService()
   {
 
@@ -47,17 +55,17 @@ public class ShmmrRSBSService
                     RestClient.makeShmmrRestClient().service));
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testShmmrServiceDataprep() throws Exception
   {
     RestClient _rc = RestClient.makeShmmrRestClient();
     assertNotNull(_rc);
     AlignFrame alf = new jalview.io.FileLoader(false)
             .LoadFileWaitTillLoaded("examples/testdata/smad.fa",
-                    jalview.io.FormatAdapter.FILE);
+                    jalview.io.DataSourceType.FILE);
     assertNotNull("Couldn't find test data.", alf);
     alf.loadJalviewDataFile("examples/testdata/smad_groups.jva",
-            jalview.io.FormatAdapter.FILE, null, null);
+            jalview.io.DataSourceType.FILE, null, null);
     assertTrue(
             "Couldn't load the test data's annotation file (should be 5 groups but found "
                     + alf.getViewport().getAlignment().getGroups().size()