Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / test / jalview / ws / jws2 / ParameterUtilsTest.java

diff --git a/test/jalview/ws/jws2/ParameterUtilsTest.java b/test/jalview/ws/jws2/ParameterUtilsTest.java
index 05bb4af..1d3c191 100644 (file)
--- a/test/jalview/ws/jws2/ParameterUtilsTest.java
+++ b/test/jalview/ws/jws2/ParameterUtilsTest.java
@@ -26,6 +26,7 @@ import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
 
 import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.gui.JvOptionPane;
 import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.api.UIinfo;
@@ -73,7 +74,7 @@ public class ParameterUtilsTest
   {
     serviceTests.add("AAConWS".toLowerCase(Locale.ROOT));
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
-    Cache.initLogger();
+    Console.initLogger();
     disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
   }
 
@@ -115,8 +116,8 @@ public class ParameterUtilsTest
             String on = o.next();
             String sn = s.next();
             String st = t.next();
-            final String errorMsg = "Original was " + on
-                    + " Phase 1 wrote " + sn + "\tPhase 2 wrote " + st;
+            final String errorMsg = "Original was " + on + " Phase 1 wrote "
+                    + sn + "\tPhase 2 wrote " + st;
             assertEquals(errorMsg, sn, st);
             assertEquals(errorMsg, sn, on);
           }
@@ -134,8 +135,8 @@ public class ParameterUtilsTest
    */
   public boolean isForTesting(UIinfo service)
   {
-    return serviceTests.size() == 0
-            || serviceTests.contains(service.serviceType.toLowerCase(Locale.ROOT));
+    return serviceTests.size() == 0 || serviceTests
+            .contains(service.serviceType.toLowerCase(Locale.ROOT));
   }
 
   @Test(groups = { "Network" })