git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2089 patch broken merge to master for Release 2.10.0b1
[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
523ccb3
..
1e02213
100644
(file)
--- a/
test/jalview/ws/jws2/ParameterUtilsTest.java
+++ b/
test/jalview/ws/jws2/ParameterUtilsTest.java
@@
-55,11
+55,12
@@
public class ParameterUtilsTest
public static void setUpBeforeClass() throws Exception
{
serviceTests.add("AAConWS".toLowerCase());
public static void setUpBeforeClass() throws Exception
{
serviceTests.add("AAConWS".toLowerCase());
+ Cache.loadProperties("test/jalview/io/testProps.jvprops");
Cache.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
Cache.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
- @Test(groups ={ "Functional" })
+ @Test(groups = { "Functional" })
public void testWriteParameterSet() throws WrongParameterException
{
for (Jws2Instance service : disc.getServices())
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();
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);
}
assertEquals(errorMsg, sn, st);
assertEquals(errorMsg, sn, on);
}
@@
-119,7
+120,7
@@
public class ParameterUtilsTest
|| serviceTests.contains(service.serviceType.toLowerCase());
}
|| serviceTests.contains(service.serviceType.toLowerCase());
}
- @Test(groups ={ "Functional" })
+ @Test(groups = { "Functional" })
public void testCopyOption()
{
for (Jws2Instance service : disc.getServices())
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())
public void testCopyParameter()
{
for (Jws2Instance service : disc.getServices())