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-2189 format tests
[jalview.git]
/
test
/
jalview
/
ext
/
so
/
SequenceOntologyTest.java
diff --git
a/test/jalview/ext/so/SequenceOntologyTest.java
b/test/jalview/ext/so/SequenceOntologyTest.java
index
be07485
..
720edf6
100644
(file)
--- a/
test/jalview/ext/so/SequenceOntologyTest.java
+++ b/
test/jalview/ext/so/SequenceOntologyTest.java
@@
-3,11
+3,8
@@
package jalview.ext.so;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertTrue;
-import jalview.ext.so.SequenceOntology;
-import jalview.io.gff.SequenceOntologyFactory;
import jalview.io.gff.SequenceOntologyI;
import jalview.io.gff.SequenceOntologyI;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@
-15,20
+12,21
@@
public class SequenceOntologyTest
{
private SequenceOntologyI so;
{
private SequenceOntologyI so;
- @BeforeClass
- public void setUp() {
+ @BeforeClass(alwaysRun = true)
+ public void setUp()
+ {
long now = System.currentTimeMillis();
long now = System.currentTimeMillis();
- SequenceOntologyFactory.setInstance(new SequenceOntology());
+ try
+ {
+ so = new SequenceOntology();
+ } catch (Throwable t)
+ {
+ System.out.println("SOTest error ");
+ t.printStackTrace(System.err);
+ }
long elapsed = System.currentTimeMillis() - now;
System.out.println("Load and cache of Sequence Ontology took "
+ elapsed + "ms");
long elapsed = System.currentTimeMillis() - now;
System.out.println("Load and cache of Sequence Ontology took "
+ elapsed + "ms");
- so = SequenceOntologyFactory.getInstance();
- }
-
- @AfterClass
- public void tearDown()
- {
- SequenceOntologyFactory.setInstance(null);
}
@Test(groups = "Functional")
}
@Test(groups = "Functional")