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 trialMerge
[jalview.git]
/
test
/
jalview
/
analysis
/
DnaAlignmentGenerator.java
diff --git
a/test/jalview/analysis/DnaAlignmentGenerator.java
b/test/jalview/analysis/DnaAlignmentGenerator.java
index
69e5c23
..
60dd929
100644
(file)
--- a/
test/jalview/analysis/DnaAlignmentGenerator.java
+++ b/
test/jalview/analysis/DnaAlignmentGenerator.java
@@
-24,11
+24,14
@@
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
+import jalview.gui.JvOptionPane;
import jalview.io.FastaFile;
import java.util.Arrays;
import java.util.Random;
import jalview.io.FastaFile;
import java.util.Arrays;
import java.util.Random;
+import org.testng.annotations.BeforeClass;
+
/**
* Generates, and outputs in Fasta format, a random DNA alignment for given
* sequence length and count. Will regenerate the same alignment each time if
/**
* Generates, and outputs in Fasta format, a random DNA alignment for given
* sequence length and count. Will regenerate the same alignment each time if
@@
-50,6
+53,14
@@
import java.util.Random;
*/
public class DnaAlignmentGenerator
{
*/
public class DnaAlignmentGenerator
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
private static final char GAP = '-';
private static final char ZERO = '0';
private static final char GAP = '-';
private static final char ZERO = '0';
@@
-58,6
+69,7
@@
public class DnaAlignmentGenerator
private Random random;
private Random random;
+
/**
* Outputs a DNA 'alignment' where each position is a random choice from
* 'GTCA-'.
/**
* Outputs a DNA 'alignment' where each position is a random choice from
* 'GTCA-'.
@@
-83,7
+95,7
@@
public class DnaAlignmentGenerator
+ " bases with " + gapPercentage + "% gaps and "
+ changePercentage + "% mutations (random seed = " + randomSeed
+ ")");
+ " bases with " + gapPercentage + "% gaps and "
+ changePercentage + "% mutations (random seed = " + randomSeed
+ ")");
- System.out.println(new FastaFile().print(al.getSequencesArray()));
+ System.out.println(new FastaFile().print(al.getSequencesArray(), true));
}
/**
}
/**