X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjws2%2FParameterUtilsTest.java;h=2882a131d57598d0f204bac26af09456c5dd34b2;hb=refs%2Ftags%2FRelease_2_10_0b1_sourcepub;hp=d76a53276f0f03d9c5425b290cdaee4ccf4103d9;hpb=ab22918ab8fc67d30dad1fb1ae0f37e51f49df95;p=jalview.git diff --git a/test/jalview/ws/jws2/ParameterUtilsTest.java b/test/jalview/ws/jws2/ParameterUtilsTest.java index d76a532..2882a13 100644 --- a/test/jalview/ws/jws2/ParameterUtilsTest.java +++ b/test/jalview/ws/jws2/ParameterUtilsTest.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. * @@ -51,15 +51,16 @@ public class ParameterUtilsTest private static Jws2Discoverer disc = null; - @BeforeClass + @BeforeClass(alwaysRun = true) public static void setUpBeforeClass() throws Exception { serviceTests.add("AAConWS".toLowerCase()); + Cache.loadProperties("test/jalview/io/testProps.jvprops"); Cache.initLogger(); disc = JalviewJabawsTestUtils.getJabawsDiscoverer(); } - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void testWriteParameterSet() throws WrongParameterException { for (Jws2Instance service : disc.getServices()) @@ -96,8 +97,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); } @@ -119,7 +120,7 @@ public class ParameterUtilsTest || serviceTests.contains(service.serviceType.toLowerCase()); } - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void testCopyOption() { for (Jws2Instance service : disc.getServices()) @@ -143,7 +144,7 @@ public class ParameterUtilsTest /** */ - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void testCopyParameter() { for (Jws2Instance service : disc.getServices())