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
JAL-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
test
/
jalview
/
fts
/
service
/
pdb
/
PDBFTSPanelTest.java
diff --git
a/test/jalview/fts/service/pdb/PDBFTSPanelTest.java
b/test/jalview/fts/service/pdb/PDBFTSPanelTest.java
index
6837847
..
69792bb
100644
(file)
--- a/
test/jalview/fts/service/pdb/PDBFTSPanelTest.java
+++ b/
test/jalview/fts/service/pdb/PDBFTSPanelTest.java
@@
-23,8
+23,6
@@
package jalview.fts.service.pdb;
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 jalview.fts.service.pdb.PDBFTSPanel;
-
import javax.swing.JInternalFrame;
import javax.swing.JTextField;
import javax.swing.JInternalFrame;
import javax.swing.JTextField;
@@
-40,7
+38,7
@@
public class PDBFTSPanelTest
{
}
{
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception
{
}
public void tearDown() throws Exception
{
}
@@
-90,7
+88,7
@@
public class PDBFTSPanelTest
assertEquals(expectedString, outcome);
}
assertEquals(expectedString, outcome);
}
- @Test(groups = { "Network", "External" }, timeOut = 7000)
+ @Test(groups = { "External" }, timeOut = 7000)
public void txt_search_ActionPerformedTest()
{
PDBFTSPanel searchPanel = new PDBFTSPanel(null);
public void txt_search_ActionPerformedTest()
{
PDBFTSPanel searchPanel = new PDBFTSPanel(null);