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-1782 JAL-1780 JAL-653 JAL-1892 update patched refactored test suite with TestNG
[jalview.git]
/
test
/
jalview
/
util
/
QuickSortTest.java
diff --git
a/test/jalview/util/QuickSortTest.java
b/test/jalview/util/QuickSortTest.java
index
2293163
..
7d10758
100644
(file)
--- a/
test/jalview/util/QuickSortTest.java
+++ b/
test/jalview/util/QuickSortTest.java
@@
-1,13
+1,12
@@
package jalview.util;
package jalview.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
import java.util.Arrays;
import java.util.Arrays;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
public class QuickSortTest
{
public class QuickSortTest
{
@@
-24,7
+23,7
@@
public class QuickSortTest
private final Object[] sortedThings = new Object[]
{ c4, c2, c1, c3 };
private final Object[] sortedThings = new Object[]
{ c4, c2, c1, c3 };
- @Before
+ @BeforeMethod
public void setUp()
{
things = new Object[]
public void setUp()
{
things = new Object[]
@@
-82,8
+81,7
@@
public class QuickSortTest
/**
* Test whether sort is stable i.e. equal values retain their mutual ordering.
*/
/**
* Test whether sort is stable i.e. equal values retain their mutual ordering.
*/
- @Test
- @Ignore
+ @Test(enabled = false)
public void testSort_withDuplicates()
{
int[] values = new int[]
public void testSort_withDuplicates()
{
int[] values = new int[]