X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FProgressBarTest.java;fp=test%2Fjalview%2Fgui%2FProgressBarTest.java;h=281ed2d9916830dbc661fdecd01ce1e651beec5e;hb=ba0bedafc61f5e83fa5a34f8ddbd0cd5222abe0e;hp=2d3db6832f9e1b3b6f0852e30ed1a5c958bd2a4d;hpb=21fccb30635d61dbf7ad0f266a88f07fb87358f7;p=jalview.git diff --git a/test/jalview/gui/ProgressBarTest.java b/test/jalview/gui/ProgressBarTest.java index 2d3db68..281ed2d 100644 --- a/test/jalview/gui/ProgressBarTest.java +++ b/test/jalview/gui/ProgressBarTest.java @@ -1,8 +1,7 @@ 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 java.awt.Component; import java.awt.FlowLayout; @@ -11,7 +10,8 @@ import java.awt.GridLayout; import javax.swing.JLabel; import javax.swing.JPanel; -import org.junit.Test; +import org.testng.Assert; +import org.testng.annotations.Test; public class ProgressBarTest { @@ -26,7 +26,7 @@ public class ProgressBarTest try { new ProgressBar(null, null); - fail("Expected exception"); + Assert.fail("Expected exception"); } catch (NullPointerException e) { // expected @@ -41,7 +41,7 @@ public class ProgressBarTest try { new ProgressBar(statusPanel, null); - fail("expected exception"); + Assert.fail("expected exception"); } catch (IllegalArgumentException e) { // expected