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
/
SeqCigarTest.java
diff --git
a/test/jalview/datamodel/SeqCigarTest.java
b/test/jalview/datamodel/SeqCigarTest.java
index
8d3c878
..
2eec987
100644
(file)
--- a/
test/jalview/datamodel/SeqCigarTest.java
+++ b/
test/jalview/datamodel/SeqCigarTest.java
@@
-23,8
+23,10
@@
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.Comparison;
import jalview.util.Comparison;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
import org.testng.annotations.Test;
/**
@@
-32,6
+34,14
@@
import org.testng.annotations.Test;
*/
public class SeqCigarTest
{
*/
public class SeqCigarTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" })
public void testFindPosition()
{
@Test(groups = { "Functional" })
public void testFindPosition()
{
@@
-55,6
+65,7
@@
public class SeqCigarTest
}
}
}
}
}
}
+
/*
* refactored 'as is' from main method
*
/*
* refactored 'as is' from main method
*
@@
-110,7
+121,7
@@
public class SeqCigarTest
/*
* TODO: can we add assertions to the sysouts that follow?
*/
/*
* TODO: can we add assertions to the sysouts that follow?
*/
- System.out.println("Original sequence align:\n" + sub_gapped_s
+ System.out.println("\nOriginal sequence align:\n" + sub_gapped_s
+ "\nReconstructed window from 8 to 48\n" + "XXXXXXXX"
+ sub_se_gp.getSequenceString('-') + "..." + "\nCigar String:"
+ sub_se_gp.getCigarstring() + "\n");
+ "\nReconstructed window from 8 to 48\n" + "XXXXXXXX"
+ sub_se_gp.getSequenceString('-') + "..." + "\nCigar String:"
+ sub_se_gp.getCigarstring() + "\n");
@@
-182,7
+193,8
@@
public class SeqCigarTest
SequenceI gen_sgapped_s = gen_sgapped.getSeq('-');
// assertEquals("Couldn't reconstruct sequence", s_gapped.getSequence(),
// gen_sgapped_s);
SequenceI gen_sgapped_s = gen_sgapped.getSeq('-');
// assertEquals("Couldn't reconstruct sequence", s_gapped.getSequence(),
// gen_sgapped_s);
- if (!gen_sgapped_s.getSequence().equals(s_gapped.getSequence()))
+ if (!gen_sgapped_s.getSequenceAsString()
+ .equals(s_gapped.getSequenceAsString()))
{
// TODO: investigate errors reported here, to allow full conversion to
// passing JUnit assertion form
{
// TODO: investigate errors reported here, to allow full conversion to
// passing JUnit assertion form