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
Merge remote-tracking branch 'origin/bug/JAL-2839findWithHidden' into merge/JAL-2839_2933
[jalview.git]
/
test
/
jalview
/
util
/
QuickSortTest.java
diff --git
a/test/jalview/util/QuickSortTest.java
b/test/jalview/util/QuickSortTest.java
index
54e46a0
..
f09dee9
100644
(file)
--- a/
test/jalview/util/QuickSortTest.java
+++ b/
test/jalview/util/QuickSortTest.java
@@
-23,13
+23,24
@@
package jalview.util;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
+import jalview.gui.JvOptionPane;
+
import java.util.Arrays;
import java.util.Random;
import java.util.Arrays;
import java.util.Random;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class QuickSortTest
{
import org.testng.annotations.Test;
public class QuickSortTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
private static final String c1 = "Blue";
private static final String c2 = "Yellow";
private static final String c1 = "Blue";
private static final String c2 = "Yellow";
@@
-110,8
+121,7
@@
public class QuickSortTest
"ALISON" };
QuickSort.sort(values, things);
assertTrue(Arrays.equals(new String[] { "lucy", "henry", "henry",
"ALISON" };
QuickSort.sort(values, things);
assertTrue(Arrays.equals(new String[] { "lucy", "henry", "henry",
- "JOHN",
- "ALISON" }, values));
+ "JOHN", "ALISON" }, values));
assertTrue(Arrays.equals(new Object[] { c3, c2, c4, c1, c5 }, things));
}
assertTrue(Arrays.equals(new Object[] { c3, c2, c4, c1, c5 }, things));
}