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 branch 'develop' into features/JAL-892varnaToProject
[jalview.git]
/
test
/
jalview
/
gui
/
ProgressBarTest.java
diff --git
a/test/jalview/gui/ProgressBarTest.java
b/test/jalview/gui/ProgressBarTest.java
index
2d3db68
..
281ed2d
100644
(file)
--- a/
test/jalview/gui/ProgressBarTest.java
+++ b/
test/jalview/gui/ProgressBarTest.java
@@
-1,8
+1,7
@@
package jalview.gui;
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;
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 javax.swing.JLabel;
import javax.swing.JPanel;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
public class ProgressBarTest
{
public class ProgressBarTest
{
@@
-26,7
+26,7
@@
public class ProgressBarTest
try
{
new ProgressBar(null, null);
try
{
new ProgressBar(null, null);
- fail("Expected exception");
+ Assert.fail("Expected exception");
} catch (NullPointerException e)
{
// expected
} catch (NullPointerException e)
{
// expected
@@
-41,7
+41,7
@@
public class ProgressBarTest
try
{
new ProgressBar(statusPanel, null);
try
{
new ProgressBar(statusPanel, null);
- fail("expected exception");
+ Assert.fail("expected exception");
} catch (IllegalArgumentException e)
{
// expected
} catch (IllegalArgumentException e)
{
// expected