From 98a2926e82661163ef007edb70a445b39d1427de Mon Sep 17 00:00:00 2001
From: James Procter <jprocter@ls30857.local>
Date: Fri, 5 Jun 2015 11:00:23 +0100
Subject: [PATCH] JAL-1601 refactor RSBS description test

---
 test/jalview/ws/rest/ShmmrRSBSService.java         |   61 +-------------------
 .../ws/rest/TestRestServiceDescription.java        |   60 +++++++++++++++++++
 2 files changed, 63 insertions(+), 58 deletions(-)
 create mode 100644 test/jalview/ws/rest/TestRestServiceDescription.java

diff --git a/test/jalview/ws/rest/ShmmrRSBSService.java b/test/jalview/ws/rest/ShmmrRSBSService.java
index c4430ad..433c72c 100644
--- a/test/jalview/ws/rest/ShmmrRSBSService.java
+++ b/test/jalview/ws/rest/ShmmrRSBSService.java
@@ -22,14 +22,12 @@ package jalview.ws.rest;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import jalview.gui.AlignFrame;
 
 import java.util.Map;
 
 import org.junit.Test;
 
-import jalview.gui.AlignFrame;
-import jalview.util.StringUtils;
-
 /**
  * @author jimp
  * 
@@ -43,7 +41,8 @@ public class ShmmrRSBSService
 
     assertTrue(
             "Test Rsd Exchange using using default Shmmr service failed.",
-            testRsdExchange("Test using default Shmmr service",
+            TestRestServiceDescription.testRsdExchange(
+                    "Test using default Shmmr service",
                     RestClient.makeShmmrRestClient().service));
   }
 
@@ -80,58 +79,4 @@ public class ShmmrRSBSService
     }
   }
 
-  private static boolean testRsdExchange(String desc, String servicestring)
-  {
-    try
-    {
-      RestServiceDescription newService = new RestServiceDescription(
-              servicestring);
-      if (!newService.isValid())
-      {
-        throw new Error("Failed to create service from '" + servicestring
-                + "'.\n" + newService.getInvalidMessage());
-      }
-      return testRsdExchange(desc, newService);
-    } catch (Throwable x)
-    {
-      System.err.println("Failed for service (" + desc + "): "
-              + servicestring);
-      x.printStackTrace();
-      return false;
-    }
-  }
-
-  private static boolean testRsdExchange(String desc,
-          RestServiceDescription service)
-  {
-    try
-    {
-      String fromservicetostring = service.toString();
-      RestServiceDescription newService = new RestServiceDescription(
-              fromservicetostring);
-      if (!newService.isValid())
-      {
-        throw new Error("Failed to create service from '"
-                + fromservicetostring + "'.\n"
-                + newService.getInvalidMessage());
-      }
-
-      if (!service.equals(newService))
-      {
-        System.err.println("Failed for service (" + desc + ").");
-        System.err.println("Original service and parsed service differ.");
-        System.err.println("Original: " + fromservicetostring);
-        System.err.println("Parsed  : " + newService.toString());
-        return false;
-      }
-    } catch (Throwable x)
-    {
-      System.err.println("Failed for service (" + desc + "): "
-              + service.toString());
-      x.printStackTrace();
-      return false;
-    }
-    return true;
-  }
-
 }
diff --git a/test/jalview/ws/rest/TestRestServiceDescription.java b/test/jalview/ws/rest/TestRestServiceDescription.java
new file mode 100644
index 0000000..6df3eba
--- /dev/null
+++ b/test/jalview/ws/rest/TestRestServiceDescription.java
@@ -0,0 +1,60 @@
+package jalview.ws.rest;
+
+public class TestRestServiceDescription
+{
+
+  public static boolean testRsdExchange(String desc, String servicestring)
+  {
+    try
+    {
+      RestServiceDescription newService = new RestServiceDescription(
+              servicestring);
+      if (!newService.isValid())
+      {
+        throw new Error("Failed to create service from '" + servicestring
+                + "'.\n" + newService.getInvalidMessage());
+      }
+      return testRsdExchange(desc, newService);
+    } catch (Throwable x)
+    {
+      System.err.println("Failed for service (" + desc + "): "
+              + servicestring);
+      x.printStackTrace();
+      return false;
+    }
+  }
+
+  public static boolean testRsdExchange(String desc,
+          RestServiceDescription service)
+  {
+    try
+    {
+      String fromservicetostring = service.toString();
+      RestServiceDescription newService = new RestServiceDescription(
+              fromservicetostring);
+      if (!newService.isValid())
+      {
+        throw new Error("Failed to create service from '"
+                + fromservicetostring + "'.\n"
+                + newService.getInvalidMessage());
+      }
+
+      if (!service.equals(newService))
+      {
+        System.err.println("Failed for service (" + desc + ").");
+        System.err.println("Original service and parsed service differ.");
+        System.err.println("Original: " + fromservicetostring);
+        System.err.println("Parsed  : " + newService.toString());
+        return false;
+      }
+    } catch (Throwable x)
+    {
+      System.err.println("Failed for service (" + desc + "): "
+              + service.toString());
+      x.printStackTrace();
+      return false;
+    }
+    return true;
+  }
+
+}
-- 
1.7.10.2