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
fbee3a7
..
4e9741e
100644
(file)
--- a/
test/jalview/ws/jabaws/RNAStructExportImport.java
+++ b/
test/jalview/ws/jabaws/RNAStructExportImport.java
@@
-27,6
+27,7
@@
import jalview.bin.Cache;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.gui.Jalview2XML;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.gui.Jalview2XML;
+import jalview.gui.JvOptionPane;
import jalview.io.AnnotationFile;
import jalview.io.DataSourceType;
import jalview.io.FileFormat;
import jalview.io.AnnotationFile;
import jalview.io.DataSourceType;
import jalview.io.FileFormat;
@@
-54,8
+55,21
@@
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
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
private static final String JAR_FILE_NAME = "testRnalifold_param.jar";
public static String testseqs = "examples/RF00031_folded.stk";
private static final String JAR_FILE_NAME = "testRnalifold_param.jar";
public static String testseqs = "examples/RF00031_folded.stk";
@@
-75,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())
{
@@
-130,7
+150,7
@@
public class RNAStructExportImport
}
}
}
}
- @Test(groups = { "Functional" })
+ @Test(groups = { "Network" })
public void testRNAAliFoldValidStructure()
{
public void testRNAAliFoldValidStructure()
{
@@
-163,7
+183,7
@@
public class RNAStructExportImport
}
}
}
}
- @Test(groups = { "Functional" })
+ @Test(groups = { "Network" })
public void testRNAStructExport()
{
public void testRNAStructExport()
{
@@
-183,16
+203,16
@@
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
{
// what format would be appropriate for RNAalifold annotations?
{
try
{
// what format would be appropriate for RNAalifold annotations?
- String aligfileout = FileFormat.Pfam.getAlignmentFile().print(
+ String aligfileout = FileFormat.Pfam.getWriter(null).print(
al.getSequencesArray(), true);
String anfileout = new AnnotationFile()
al.getSequencesArray(), true);
String anfileout = new AnnotationFile()
@@
-233,12
+253,12
@@
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>();
- for (Argument rg : (List<Argument>) rnaalifoldws
- .getRunnerConfig().getArguments())
+ for (Argument rg : (List<Argument>) rnaalifoldws.getRunnerConfig()
+ .getArguments())
{
if (rg.getDescription().contains("emperature"))
{
{
if (rg.getDescription().contains("emperature"))
{