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
Merge branch 'develop' into features/JAL-2393customMatrices
[jalview.git]
/
test
/
jalview
/
ws
/
jabaws
/
RNAStructExportImport.java
diff --git
a/test/jalview/ws/jabaws/RNAStructExportImport.java
b/test/jalview/ws/jabaws/RNAStructExportImport.java
index
f1430f6
..
4e9741e
100644
(file)
--- a/
test/jalview/ws/jabaws/RNAStructExportImport.java
+++ b/
test/jalview/ws/jabaws/RNAStructExportImport.java
@@
-55,6
+55,11
@@
import org.testng.annotations.Test;
import compbio.metadata.Argument;
import compbio.metadata.WrongParameterException;
import compbio.metadata.Argument;
import compbio.metadata.WrongParameterException;
+/*
+ * All methods in this class are set to the Network group because setUpBeforeClass will fail
+ * if there is no network.
+ */
+@Test(singleThreaded = true)
public class RNAStructExportImport
{
public class RNAStructExportImport
{
@@
-84,6
+89,12
@@
public class RNAStructExportImport
Cache.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer(false);
Cache.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer(false);
+ while (disc.isRunning())
+ {
+ // don't get services until discoverer has finished
+ Thread.sleep(100);
+ }
+
for (Jws2Instance svc : disc.getServices())
{
for (Jws2Instance svc : disc.getServices())
{
@@
-139,7
+150,7
@@
public class RNAStructExportImport
}
}
}
}
- @Test(groups = { "Functional" })
+ @Test(groups = { "Network" })
public void testRNAAliFoldValidStructure()
{
public void testRNAAliFoldValidStructure()
{
@@
-172,7
+183,7
@@
public class RNAStructExportImport
}
}
}
}
- @Test(groups = { "Functional" })
+ @Test(groups = { "Network" })
public void testRNAStructExport()
{
public void testRNAStructExport()
{
@@
-192,11
+203,11
@@
public class RNAStructExportImport
AlignmentI orig_alig = af.getViewport().getAlignment();
AlignmentI orig_alig = af.getViewport().getAlignment();
- testAnnotationFileIO("Testing RNAalifold Annotation IO", orig_alig);
+ verifyAnnotationFileIO("Testing RNAalifold Annotation IO", orig_alig);
}
}
- public static void testAnnotationFileIO(String testname, AlignmentI al)
+ static void verifyAnnotationFileIO(String testname, AlignmentI al)
{
try
{
{
try
{
@@
-242,7
+253,7
@@
public class RNAStructExportImport
+ "\nCouldn't complete Annotation file roundtrip input/output/input test.");
}
+ "\nCouldn't complete Annotation file roundtrip input/output/input test.");
}
- @Test(groups = { "Functional" })
+ @Test(groups = { "Network" })
public void testRnaalifoldSettingsRecovery()
{
List<Argument> opts = new ArrayList<Argument>();
public void testRnaalifoldSettingsRecovery()
{
List<Argument> opts = new ArrayList<Argument>();