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-3438 spotless for 2.11.2.0
[jalview.git]
/
test
/
jalview
/
datamodel
/
AlignedCodonIteratorTest.java
diff --git
a/test/jalview/datamodel/AlignedCodonIteratorTest.java
b/test/jalview/datamodel/AlignedCodonIteratorTest.java
index
d2cebaa
..
af9bbb7
100644
(file)
--- a/
test/jalview/datamodel/AlignedCodonIteratorTest.java
+++ b/
test/jalview/datamodel/AlignedCodonIteratorTest.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-23,11
+23,13
@@
package jalview.datamodel;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertFalse;
+import jalview.gui.JvOptionPane;
import jalview.util.MapList;
import java.util.Iterator;
import org.testng.Assert;
import jalview.util.MapList;
import java.util.Iterator;
import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
import org.testng.annotations.Test;
/**
@@
-38,6
+40,14
@@
import org.testng.annotations.Test;
*/
public class AlignedCodonIteratorTest
{
*/
public class AlignedCodonIteratorTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* Test normal case for iterating over aligned codons.
*/
/**
* Test normal case for iterating over aligned codons.
*/
@@
-48,9
+58,9
@@
public class AlignedCodonIteratorTest
from.createDatasetSequence();
SequenceI to = new Sequence("Seq1", "-PQ-R-");
to.createDatasetSequence();
from.createDatasetSequence();
SequenceI to = new Sequence("Seq1", "-PQ-R-");
to.createDatasetSequence();
- MapList map = new MapList(
- new int[] { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 },
- new int[] { 1, 3 }, 3, 1);
+ MapList map = new MapList(new int[] { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 },
+ new int[]
+ { 1, 3 }, 3, 1);
Mapping m = new Mapping(to.getDatasetSequence(), map);
Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
Mapping m = new Mapping(to.getDatasetSequence(), map);
Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@
-76,9
+86,9
@@
public class AlignedCodonIteratorTest
from.createDatasetSequence();
SequenceI to = new Sequence("Seq1", "-PQ-TR-");
to.createDatasetSequence();
from.createDatasetSequence();
SequenceI to = new Sequence("Seq1", "-PQ-TR-");
to.createDatasetSequence();
- MapList map = new MapList(
- new int[] { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 }, new int[] { 1,
- 2, 4, 4 }, 3, 1);
+ MapList map = new MapList(new int[] { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 },
+ new int[]
+ { 1, 2, 4, 4 }, 3, 1);
Mapping m = new Mapping(to.getDatasetSequence(), map);
Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
Mapping m = new Mapping(to.getDatasetSequence(), map);
Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@
-105,7
+115,8
@@
public class AlignedCodonIteratorTest
SequenceI to = new Sequence("Seq1", "-PQ-R-");
to.createDatasetSequence();
MapList map = new MapList(new int[] { 1, 1, 3, 4, 6, 6, 8, 8 },
SequenceI to = new Sequence("Seq1", "-PQ-R-");
to.createDatasetSequence();
MapList map = new MapList(new int[] { 1, 1, 3, 4, 6, 6, 8, 8 },
- new int[] { 1, 3 }, 3, 1);
+ new int[]
+ { 1, 3 }, 3, 1);
Mapping m = new Mapping(to.getDatasetSequence(), map);
Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
Mapping m = new Mapping(to.getDatasetSequence(), map);
Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@
-132,7
+143,8
@@
public class AlignedCodonIteratorTest
from.createDatasetSequence();
SequenceI to = new Sequence("Seq1", "CHYQ");
to.createDatasetSequence();
from.createDatasetSequence();
SequenceI to = new Sequence("Seq1", "CHYQ");
to.createDatasetSequence();
- MapList map = new MapList(new int[] { 1, 12 }, new int[] { 1, 4 }, 3, 1);
+ MapList map = new MapList(new int[] { 1, 12 }, new int[] { 1, 4 }, 3,
+ 1);
Mapping m = new Mapping(to.getDatasetSequence(), map);
Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
Mapping m = new Mapping(to.getDatasetSequence(), map);
Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@
-161,8
+173,10
@@
public class AlignedCodonIteratorTest
from.createDatasetSequence();
SequenceI to = new Sequence("Seq1/10-12", "-PQ-R-");
to.createDatasetSequence();
from.createDatasetSequence();
SequenceI to = new Sequence("Seq1/10-12", "-PQ-R-");
to.createDatasetSequence();
- MapList map = new MapList(new int[] { 7, 7, 9, 10, 12, 12, 14, 16, 18,
- 19 }, new int[] { 10, 12 }, 3, 1);
+ MapList map = new MapList(
+ new int[]
+ { 7, 7, 9, 10, 12, 12, 14, 16, 18, 19 }, new int[] { 10, 12 },
+ 3, 1);
Mapping m = new Mapping(to.getDatasetSequence(), map);
Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
Mapping m = new Mapping(to.getDatasetSequence(), map);
Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');