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
/
StructureChooserTest.java
diff --git
a/test/jalview/gui/StructureChooserTest.java
b/test/jalview/gui/StructureChooserTest.java
index
6d5af25
..
71d062c
100644
(file)
--- a/
test/jalview/gui/StructureChooserTest.java
+++ b/
test/jalview/gui/StructureChooserTest.java
@@
-2,9
+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.AfterMethod;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
+
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.Sequence;
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.Sequence;
@@
-12,11
+10,15
@@
import jalview.datamodel.SequenceI;
import java.util.Vector;
import java.util.Vector;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
public class StructureChooserTest
{
Sequence seq;
public class StructureChooserTest
{
Sequence seq;
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
seq = new Sequence("PDB|4kqy|4KQY|A", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1,
public void setUp() throws Exception
{
seq = new Sequence("PDB|4kqy|4KQY|A", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1,
@@
-46,7
+48,7
@@
public class StructureChooserTest
- @Test
+ @Test(groups ={ "Functional" })
public void buildQueryTest()
{
String query = StructureChooser.buildQuery(seq);
public void buildQueryTest()
{
String query = StructureChooser.buildQuery(seq);
@@
-56,7
+58,7
@@
public class StructureChooserTest
query);
}
query);
}
- @Test
+ @Test(groups ={ "Functional" })
public void populateFilterComboBoxTest()
{
SequenceI[] selectedSeqs = new SequenceI[]
public void populateFilterComboBoxTest()
{
SequenceI[] selectedSeqs = new SequenceI[]
@@
-75,7
+77,7
@@
public class StructureChooserTest
// should be populated
}
// should be populated
}
- @Test
+ @Test(groups ={ "Functional" })
public void fetchStructuresInfoTest()
{
SequenceI[] selectedSeqs = new SequenceI[]
public void fetchStructuresInfoTest()
{
SequenceI[] selectedSeqs = new SequenceI[]