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
/
jabaws
/
JpredJabaStructExportImport.java
diff --git
a/test/jalview/ws/jabaws/JpredJabaStructExportImport.java
b/test/jalview/ws/jabaws/JpredJabaStructExportImport.java
index
a347286
..
7f94b6b
100644
(file)
--- a/
test/jalview/ws/jabaws/JpredJabaStructExportImport.java
+++ b/
test/jalview/ws/jabaws/JpredJabaStructExportImport.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-23,6
+23,7
@@
package jalview.ws.jabaws;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertTrue;
+import jalview.bin.Cache;
import jalview.datamodel.AlignmentI;
import jalview.gui.Jalview2XML;
import jalview.io.AnnotationFile;
import jalview.datamodel.AlignmentI;
import jalview.gui.Jalview2XML;
import jalview.io.AnnotationFile;
@@
-65,8
+66,8
@@
public class JpredJabaStructExportImport
@BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
@BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
-
- jalview.bin.Cache.initLogger();
+ Cache.loadProperties("test/jalview/io/testProps.jvprops");
+ Cache.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer(false);
for (Jws2Instance svc : disc.getServices())
disc = JalviewJabawsTestUtils.getJabawsDiscoverer(false);
for (Jws2Instance svc : disc.getServices())
@@
-84,7
+85,7
@@
public class JpredJabaStructExportImport
assertNotNull("Couldn't load test data ('" + testseqs + "')", af);
}
assertNotNull("Couldn't load test data ('" + testseqs + "')", af);
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception
{
if (af != null)
public static void tearDownAfterClass() throws Exception
{
if (af != null)