Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into merge-212

[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 709f2c5..261c059 100644 (file)
--- a/test/jalview/ws/rest/ShmmrRSBSService.java
+++ b/test/jalview/ws/rest/ShmmrRSBSService.java
@@ -25,6 +25,7 @@ import static org.testng.AssertJUnit.assertTrue;
 
 import jalview.gui.AlignFrame;
 import jalview.gui.JvOptionPane;
+import jalview.ws.rest.clientdefs.ShmrRestClient;
 
 import java.util.Map;
 
@@ -52,13 +53,13 @@ public class ShmmrRSBSService
     assertTrue(
             "Test Rsd Exchange using using default Shmmr service failed.",
             testRsdExchange("Test using default Shmmr service",
-                    RestClient.makeShmmrRestClient().service));
+                    ShmrRestClient.makeShmmrRestClient().service));
   }
 
   @Test(groups = { "Functional" })
   public void testShmmrServiceDataprep() throws Exception
   {
-    RestClient _rc = RestClient.makeShmmrRestClient();
+    RestClient _rc = ShmrRestClient.makeShmmrRestClient();
     assertNotNull(_rc);
     AlignFrame alf = new jalview.io.FileLoader(false)
             .LoadFileWaitTillLoaded("examples/testdata/smad.fa",
@@ -127,6 +128,12 @@ public class ShmmrRSBSService
       if (!service.equals(newService))
       {
         System.err.println("Failed for service (" + desc + ").");
+        if (fromservicetostring.equals(newService.toString()))
+        {
+          System.err.println(
+                  "Description strings are equivalent: fault during RestServiceDescription.equals()");
+          return false;
+        }
         System.err.println("Original service and parsed service differ.");
         System.err.println("Original: " + fromservicetostring);
         System.err.println("Parsed  : " + newService.toString());