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
/
io
/
JSONFileTest.java
diff --git
a/test/jalview/io/JSONFileTest.java
b/test/jalview/io/JSONFileTest.java
index
bd7ec71
..
f75f433
100644
(file)
--- a/
test/jalview/io/JSONFileTest.java
+++ b/
test/jalview/io/JSONFileTest.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-114,7
+114,7
@@
public class JSONFileTest
for (Sequence seq : seqs)
{
for (Sequence seq : seqs)
{
- seq.setDatasetSequence(seq);
+ seq.createDatasetSequence();
expectedSeqs.put(seq.getName(), seq);
}
expectedSeqs.put(seq.getName(), seq);
}
@@
-262,7
+262,7
@@
public class JSONFileTest
passedCount = 0;
}
passedCount = 0;
}
- @AfterTest
+ @AfterTest(alwaysRun = true)
public void tearDown() throws Exception
{
testJsonFile = null;
public void tearDown() throws Exception
{
testJsonFile = null;