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-3878 update branch from 2.12 merge from 2.11.2
[jalview.git]
/
test
/
jalview
/
util
/
DnaUtilsTest.java
diff --git
a/test/jalview/util/DnaUtilsTest.java
b/test/jalview/util/DnaUtilsTest.java
index
b9083f5
..
35b4592
100644
(file)
--- a/
test/jalview/util/DnaUtilsTest.java
+++ b/
test/jalview/util/DnaUtilsTest.java
@@
-24,13
+24,24
@@
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.fail;
import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.fail;
+import jalview.gui.JvOptionPane;
+
import java.text.ParseException;
import java.util.List;
import java.text.ParseException;
import java.util.List;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class DnaUtilsTest
{
import org.testng.annotations.Test;
public class DnaUtilsTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* Tests for parsing an ENA/GenBank location specifier
*
/**
* Tests for parsing an ENA/GenBank location specifier
*
@@
-91,8
+102,8
@@
public class DnaUtilsTest
/*
* join of two complements
*/
/*
* join of two complements
*/
- ranges = DnaUtils
- .parseLocation("join(complement(4918..5163),complement(2691..4571))");
+ ranges = DnaUtils.parseLocation(
+ "join(complement(4918..5163),complement(2691..4571))");
assertEquals(2, ranges.size());
assertEquals(5163, ranges.get(0)[0]);
assertEquals(4918, ranges.get(0)[1]);
assertEquals(2, ranges.size());
assertEquals(5163, ranges.get(0)[0]);
assertEquals(4918, ranges.get(0)[1]);
@@
-147,7
+158,8
@@
public class DnaUtilsTest
* complement may not enclose multiple ranges
* parsing fails for the same reason
*/
* complement may not enclose multiple ranges
* parsing fails for the same reason
*/
- checkForParseException("join(complement(36618..36700,4000..4200),86988..87064)");
+ checkForParseException(
+ "join(complement(36618..36700,4000..4200),86988..87064)");
}
/**
}
/**