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-4134 properly resolve positions in associated aligned sequence for matrix group...
[jalview.git]
/
test
/
jalview
/
io
/
Jalview2xmlBase.java
diff --git
a/test/jalview/io/Jalview2xmlBase.java
b/test/jalview/io/Jalview2xmlBase.java
index
15e18e3
..
a197340
100644
(file)
--- a/
test/jalview/io/Jalview2xmlBase.java
+++ b/
test/jalview/io/Jalview2xmlBase.java
@@
-20,6
+20,12
@@
*/
package jalview.io;
*/
package jalview.io;
+import java.util.Date;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeTest;
+
import jalview.bin.Cache;
import jalview.bin.Jalview;
import jalview.datamodel.AlignmentAnnotation;
import jalview.bin.Cache;
import jalview.bin.Jalview;
import jalview.datamodel.AlignmentAnnotation;
@@
-27,12
+33,6
@@
import jalview.datamodel.SequenceI;
import jalview.gui.Desktop;
import jalview.gui.JvOptionPane;
import jalview.gui.Desktop;
import jalview.gui.JvOptionPane;
-import java.util.Date;
-
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeTest;
-
public class Jalview2xmlBase
{
public class Jalview2xmlBase
{
@@
-58,7
+58,8
@@
public class Jalview2xmlBase
* set news feed last read to a future time to ensure no
* 'unread' news item is displayed
*/
* set news feed last read to a future time to ensure no
* 'unread' news item is displayed
*/
- Date oneHourFromNow = new Date(System.currentTimeMillis() + 3600 * 1000);
+ Date oneHourFromNow = new Date(
+ System.currentTimeMillis() + 3600 * 1000);
Cache.setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", oneHourFromNow);
Jalview.main(new String[] {});
Cache.setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", oneHourFromNow);
Jalview.main(new String[] {});
@@
-70,13
+71,15
@@
public class Jalview2xmlBase
@AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception
{
@AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception
{
- jalview.gui.Desktop.instance.closeAll_actionPerformed(null);
+ if (Desktop.instance != null)
+ Desktop.instance.closeAll_actionPerformed(null);
}
@BeforeTest(alwaysRun = true)
public static void clearDesktop()
{
}
@BeforeTest(alwaysRun = true)
public static void clearDesktop()
{
- if (Desktop.instance != null && Desktop.getAlignFrames() != null)
+ if (Desktop.instance != null && Desktop.getFrames() != null
+ && Desktop.getFrames().length > 0)
{
Desktop.instance.closeAll_actionPerformed(null);
}
{
Desktop.instance.closeAll_actionPerformed(null);
}