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
/
PDBSearchPanelTest.java
diff --git
a/test/jalview/gui/PDBSearchPanelTest.java
b/test/jalview/gui/PDBSearchPanelTest.java
index
e06a870
..
7697bda
100644
(file)
--- a/
test/jalview/gui/PDBSearchPanelTest.java
+++ b/
test/jalview/gui/PDBSearchPanelTest.java
@@
-2,16
+2,18
@@
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 javax.swing.JInternalFrame;
import javax.swing.JTextField;
import javax.swing.JInternalFrame;
import javax.swing.JTextField;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
public class PDBSearchPanelTest
{
public class PDBSearchPanelTest
{
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
}
public void setUp() throws Exception
{
}
@@
-21,7
+23,7
@@
public class PDBSearchPanelTest
{
}
{
}
- @Test
+ @Test(groups ={ "Functional" })
public void populateCmbSearchTargetOptionsTest()
{
PDBSearchPanel searchPanel = new PDBSearchPanel(null);
public void populateCmbSearchTargetOptionsTest()
{
PDBSearchPanel searchPanel = new PDBSearchPanel(null);
@@
-29,7
+31,7
@@
public class PDBSearchPanelTest
searchPanel.populateCmbSearchTargetOptions();
}
searchPanel.populateCmbSearchTargetOptions();
}
- @Test
+ @Test(groups ={ "Functional" })
public void testDecodeSearchTerm()
{
String expectedString = "1xyz OR text:2xyz OR text:3xyz";
public void testDecodeSearchTerm()
{
String expectedString = "1xyz OR text:2xyz OR text:3xyz";
@@
-44,7
+46,7
@@
public class PDBSearchPanelTest
assertEquals(expectedString, outcome);
}
assertEquals(expectedString, outcome);
}
- @Test
+ @Test(groups ={ "Functional" })
public void testgetPDBIdwithSpecifiedChain()
{
public void testgetPDBIdwithSpecifiedChain()
{
@@
-66,7
+68,8
@@
public class PDBSearchPanelTest
assertEquals(expectedString, outcome);
}
assertEquals(expectedString, outcome);
}
- @Test
+ @Test(groups =
+ { "Network", "External" }, timeOut = 5000)
public void txt_search_ActionPerformedTest()
{
PDBSearchPanel searchPanel = new PDBSearchPanel(null);
public void txt_search_ActionPerformedTest()
{
PDBSearchPanel searchPanel = new PDBSearchPanel(null);