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-2314 Fixes to DisorderAnnotExportImport test
[jalview.git]
/
test
/
jalview
/
ws
/
seqfetcher
/
DasSequenceFetcher.java
diff --git
a/test/jalview/ws/seqfetcher/DasSequenceFetcher.java
b/test/jalview/ws/seqfetcher/DasSequenceFetcher.java
index
b128f53
..
f1dafcb
100644
(file)
--- a/
test/jalview/ws/seqfetcher/DasSequenceFetcher.java
+++ b/
test/jalview/ws/seqfetcher/DasSequenceFetcher.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * 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.
*
@@
-20,21
+20,30
@@
*/
package jalview.ws.seqfetcher;
*/
package jalview.ws.seqfetcher;
-import org.testng.AssertJUnit;
+import static org.testng.Assert.assertTrue;
+
+import jalview.bin.Cache;
+import jalview.gui.JvOptionPane;
+
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class DasSequenceFetcher
{
import org.testng.annotations.Test;
public class DasSequenceFetcher
{
- @Test(groups = { "Functional" })
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
+ @Test(groups = { "Network" })
public void testDasRegistryContact()
{
public void testDasRegistryContact()
{
- jalview.bin.Cache.getDasSourceRegistry().refreshSources();
- AssertJUnit
- .assertTrue(
- "Expected to find at least one DAS source at the registry. Check config.",
- jalview.bin.Cache.getDasSourceRegistry().getSources()
- .size() > 0);
+ Cache.getDasSourceRegistry().refreshSources();
+ assertTrue(Cache.getDasSourceRegistry().getSources().isEmpty(),
+ "Expected to find no DAS sources at the registry. Check config.");
}
}
}
}