X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fgui%2FProgressBarTest.java;h=192c941733f982c74f3c522df20c8adb34d665fd;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=2d3db6832f9e1b3b6f0852e30ed1a5c958bd2a4d;hpb=4bba61a3c701f83bdcb6707c4d9f17a1f5faaa04;p=jalview.git diff --git a/test/jalview/gui/ProgressBarTest.java b/test/jalview/gui/ProgressBarTest.java index 2d3db68..192c941 100644 --- a/test/jalview/gui/ProgressBarTest.java +++ b/test/jalview/gui/ProgressBarTest.java @@ -1,9 +1,9 @@ package jalview.gui; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertTrue; +import org.testng.annotations.Test; +import org.testng.Assert; import java.awt.Component; import java.awt.FlowLayout; import java.awt.GridLayout; @@ -11,8 +11,6 @@ import java.awt.GridLayout; import javax.swing.JLabel; import javax.swing.JPanel; -import org.junit.Test; - public class ProgressBarTest { @@ -26,7 +24,7 @@ public class ProgressBarTest try { new ProgressBar(null, null); - fail("Expected exception"); + Assert.fail("Expected exception"); } catch (NullPointerException e) { // expected @@ -41,7 +39,7 @@ public class ProgressBarTest try { new ProgressBar(statusPanel, null); - fail("expected exception"); + Assert.fail("expected exception"); } catch (IllegalArgumentException e) { // expected