git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c1905ce
)
JAL-674 patch NPE bug when test run in isolation
author
Jim Procter
<jprocter@dundee.ac.uk>
Thu, 27 Nov 2014 10:35:58 +0000
(10:35 +0000)
committer
Jim Procter
<jprocter@dundee.ac.uk>
Thu, 27 Nov 2014 10:35:58 +0000
(10:35 +0000)
test/jalview/io/Jalview2xmlTests.java
patch
|
blob
|
history
diff --git
a/test/jalview/io/Jalview2xmlTests.java
b/test/jalview/io/Jalview2xmlTests.java
index
32aa84a
..
fec7d75
100644
(file)
--- a/
test/jalview/io/Jalview2xmlTests.java
+++ b/
test/jalview/io/Jalview2xmlTests.java
@@
-237,7
+237,8
@@
public class Jalview2xmlTests
@Test
public void gatherViewsHere() throws Exception
{
- int origCount = Desktop.getAlignframes().length;
+ int origCount = Desktop.getAlignframes() == null ? 0 : Desktop
+ .getAlignframes().length;
AlignFrame af = new jalview.io.FileLoader().LoadFileWaitTillLoaded(
"examples/exampleFile_2_7.jar", FormatAdapter.FILE);
assertTrue("Didn't read in the example file correctly.", af != null);