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-2349 fixed rendering method and switched to using color from contact range to...
[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
9dc5303
..
06c803f
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;
@@
-51,10
+52,19
@@
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import compbio.metadata.Argument;
import compbio.metadata.WrongParameterException;
public class RNAStructExportImport
{
import compbio.metadata.WrongParameterException;
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";
@@
-145,7
+155,6
@@
public class RNAStructExportImport
} catch (InterruptedException x)
{
}
} catch (InterruptedException x)
{
}
- ;
} while (af.getViewport().getCalcManager().isWorking());
AlignmentI orig_alig = af.getViewport().getAlignment();
} while (af.getViewport().getCalcManager().isWorking());
AlignmentI orig_alig = af.getViewport().getAlignment();
@@
-179,7
+188,6
@@
public class RNAStructExportImport
} catch (InterruptedException x)
{
}
} catch (InterruptedException x)
{
}
- ;
} while (af.getViewport().getCalcManager().isWorking());
AlignmentI orig_alig = af.getViewport().getAlignment();
} while (af.getViewport().getCalcManager().isWorking());
AlignmentI orig_alig = af.getViewport().getAlignment();
@@
-198,11
+206,11
@@
public class RNAStructExportImport
String anfileout = new AnnotationFile()
.printAnnotationsForAlignment(al);
String anfileout = new AnnotationFile()
.printAnnotationsForAlignment(al);
- assertTrue(
+ assertNotNull(
"Test "
+ testname
+ "\nAlignment annotation file was not regenerated. Null string",
"Test "
+ testname
+ "\nAlignment annotation file was not regenerated. Null string",
- anfileout != null);
+ anfileout);
assertTrue(
"Test "
+ testname
assertTrue(
"Test "
+ testname
@@
-237,9
+245,9
@@
public class RNAStructExportImport
@Test(groups = { "Functional" })
public void testRnaalifoldSettingsRecovery()
{
@Test(groups = { "Functional" })
public void testRnaalifoldSettingsRecovery()
{
- List<compbio.metadata.Argument> opts = new ArrayList<compbio.metadata.Argument>();
- for (compbio.metadata.Argument rg : (List<compbio.metadata.Argument>) rnaalifoldws
- .getRunnerConfig().getArguments())
+ List<Argument> opts = new ArrayList<Argument>();
+ for (Argument rg : (List<Argument>) rnaalifoldws.getRunnerConfig()
+ .getArguments())
{
if (rg.getDescription().contains("emperature"))
{
{
if (rg.getDescription().contains("emperature"))
{