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' of http://source.jalview.org/git/jalview into develop
[jalview.git]
/
test
/
jalview
/
gui
/
ProgressBarTest.java
diff --git
a/test/jalview/gui/ProgressBarTest.java
b/test/jalview/gui/ProgressBarTest.java
index
192c941
..
e50148c
100644
(file)
--- a/
test/jalview/gui/ProgressBarTest.java
+++ b/
test/jalview/gui/ProgressBarTest.java
@@
-2,8
+2,7
@@
package jalview.gui;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
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;
import java.awt.Component;
import java.awt.FlowLayout;
import java.awt.GridLayout;
@@
-11,6
+10,9
@@
import java.awt.GridLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JLabel;
import javax.swing.JPanel;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
public class ProgressBarTest
{
public class ProgressBarTest
{
@@
-18,7
+20,7
@@
public class ProgressBarTest
private JLabel statusBar;
private JLabel statusBar;
- @Test
+ @Test(groups ={ "Functional" })
public void testConstructor_prematureInstantiation()
{
try
public void testConstructor_prematureInstantiation()
{
try
@@
-31,7
+33,7
@@
public class ProgressBarTest
}
}
}
}
- @Test
+ @Test(groups ={ "Functional" })
public void testConstructor_wrongLayout()
{
statusPanel = new JPanel();
public void testConstructor_wrongLayout()
{
statusPanel = new JPanel();
@@
-46,7
+48,7
@@
public class ProgressBarTest
}
}
}
}
- @Test
+ @Test(groups ={ "Functional" })
public void testSetProgressBar()
{
statusPanel = new JPanel();
public void testSetProgressBar()
{
statusPanel = new JPanel();