X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Frest%2FShmmrRSBSService.java;h=1971e0b0e9146c1e40ec572e2d8e6b016b81f791;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=5fc215c4371ef640ba9b103b91149906fc05c831;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git

diff --git a/test/jalview/ws/rest/ShmmrRSBSService.java b/test/jalview/ws/rest/ShmmrRSBSService.java
index 5fc215c..1971e0b 100644
--- a/test/jalview/ws/rest/ShmmrRSBSService.java
+++ b/test/jalview/ws/rest/ShmmrRSBSService.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,25 +20,14 @@
  */
 package jalview.ws.rest;
 
-import static org.junit.Assert.*;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.AlignmentView;
 import jalview.gui.AlignFrame;
-import jalview.io.FileParse;
-import jalview.ws.rest.InputType;
-import jalview.ws.rest.params.SeqGroupIndexVector;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.util.Map;
+
+import org.testng.annotations.Test;
 
 /**
  * @author jimp
@@ -47,21 +36,7 @@ import org.junit.Test;
 public class ShmmrRSBSService
 {
 
-  @Test
-  public void testSeparatorListToArrayForRestServiceDescriptions()
-  {
-    assertTrue(
-            "separatorListToArray is faulty.",
-            RestServiceDescription.separatorListToArray(
-                    "foo=',',min='foo',max='1,2,3',fa=','", ",").length == 4);
-    assertTrue("separatorListToArray is faulty.",
-            RestServiceDescription.separatorListToArray(
-                    "minsize='2', sep=','", ",").length != 2); // probably
-                                                               // should come as
-                                                               // 2
-  }
-
-  @Test
+  @Test(groups = { "Functional" })
   public void testShmmrService()
   {
 
@@ -71,7 +46,7 @@ public class ShmmrRSBSService
                     RestClient.makeShmmrRestClient().service));
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testShmmrServiceDataprep() throws Exception
   {
     RestClient _rc = RestClient.makeShmmrRestClient();