X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FQuickSortTest.java;fp=test%2Fjalview%2Futil%2FQuickSortTest.java;h=7d1075827c944530e4e8145349b1d73c2406b2a5;hb=44e5428356c618d139354d02bbfc2f9008ae50b6;hp=2293163f47df2342cfda01ace4d05533a8bbbf62;hpb=4740ac2539b6c62c36a0c79ec6880237e50ea3f4;p=jalview.git diff --git a/test/jalview/util/QuickSortTest.java b/test/jalview/util/QuickSortTest.java index 2293163..7d10758 100644 --- a/test/jalview/util/QuickSortTest.java +++ b/test/jalview/util/QuickSortTest.java @@ -1,13 +1,12 @@ 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 org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; public class QuickSortTest { @@ -24,7 +23,7 @@ public class QuickSortTest private final Object[] sortedThings = new Object[] { c4, c2, c1, c3 }; - @Before + @BeforeMethod 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 - @Ignore + @Test(enabled = false) public void testSort_withDuplicates() { int[] values = new int[]