X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FDnaTest.java;h=2e21d9c0e2c2c4daee93ad176325b6a74d15b39a;hb=371978b7fd3a9252d3362f01a1449b15d88fca5c;hp=31c98391ad4160e154c030b597e876af14988c79;hpb=8b27085fa7fc5f2877e078421284c2636b85b8c6;p=jalview.git diff --git a/test/jalview/analysis/DnaTest.java b/test/jalview/analysis/DnaTest.java index 31c9839..2e21d9c 100644 --- a/test/jalview/analysis/DnaTest.java +++ b/test/jalview/analysis/DnaTest.java @@ -32,16 +32,25 @@ import jalview.datamodel.ColumnSelection; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; import jalview.gui.AlignViewport; +import jalview.gui.JvOptionPane; import jalview.io.DataSourceType; import jalview.io.FileFormat; import jalview.io.FormatAdapter; import java.io.IOException; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; public class DnaTest { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + // @formatter:off // AA encoding codons as ordered on the Jalview help page Amino Acid Table private static String fasta = ">B\n" + "GCT" + "GCC" + "GCA" + "GCG" @@ -285,7 +294,8 @@ public class DnaTest /* * Generate cDNA - 8 sequences of 12 bases each. */ - AlignmentI cdna = new DnaAlignmentGenerator().generate(12, 8, 97, 5, 5); + AlignmentI cdna = new AlignmentGenerator(true) + .generate(12, 8, 97, 5, 5); ColumnSelection cs = new ColumnSelection(); AlignViewportI av = new AlignViewport(cdna, cs); Dna dna = new Dna(av, new int[] { 0, cdna.getWidth() - 1 }); @@ -527,7 +537,7 @@ public class DnaTest String seqDsRev = new StringBuilder(seqDs).reverse().toString(); SequenceI dna = new Sequence("Seq1", seq); - Alignment al = new Alignment(new SequenceI[] {dna}); + Alignment al = new Alignment(new SequenceI[] { dna }); al.createDatasetAlignment(); assertEquals(seqDs, al.getSequenceAt(0).getDatasetSequence() .getSequenceAsString());