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-4134 efficiency improvement
[jalview.git]
/
test
/
jalview
/
datamodel
/
MappingTest.java
diff --git
a/test/jalview/datamodel/MappingTest.java
b/test/jalview/datamodel/MappingTest.java
index
b326d90
..
0bf753d
100644
(file)
--- a/
test/jalview/datamodel/MappingTest.java
+++ b/
test/jalview/datamodel/MappingTest.java
@@
-23,10
+23,12
@@
package jalview.datamodel;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertSame;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertSame;
+import jalview.gui.JvOptionPane;
import jalview.util.MapList;
import java.util.Arrays;
import jalview.util.MapList;
import java.util.Arrays;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
import org.testng.annotations.Test;
/**
@@
-34,6
+36,14
@@
import org.testng.annotations.Test;
*/
public class MappingTest
{
*/
public class MappingTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* trite test of the intersectVisContigs method for a simple DNA -> Protein
* exon map and a range of visContigs
/**
* trite test of the intersectVisContigs method for a simple DNA -> Protein
* exon map and a range of visContigs
@@
-41,11
+51,13
@@
public class MappingTest
@Test(groups = { "Functional" })
public void testIntersectVisContigs()
{
@Test(groups = { "Functional" })
public void testIntersectVisContigs()
{
- MapList fk = new MapList(new int[] { 1, 6, 8, 13, 15, 23 }, new int[] {
- 1, 7 }, 3, 1);
+ MapList fk = new MapList(new int[] { 1, 6, 8, 13, 15, 23 },
+ new int[]
+ { 1, 7 }, 3, 1);
Mapping m = new Mapping(fk);
Mapping m = new Mapping(fk);
- Mapping m_1 = m.intersectVisContigs(new int[] { fk.getFromLowest(),
- fk.getFromHighest() });
+ Mapping m_1 = m
+ .intersectVisContigs(new int[]
+ { fk.getFromLowest(), fk.getFromHighest() });
Mapping m_2 = m.intersectVisContigs(new int[] { 1, 7, 11, 20 });
// assertions from output values 'as is', not checked for correctness
Mapping m_2 = m.intersectVisContigs(new int[] { 1, 7, 11, 20 });
// assertions from output values 'as is', not checked for correctness