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-3026 fixes Jmol going into debug mode
[jalview.git]
/
test
/
jalview
/
urls
/
CustomUrlProviderTest.java
diff --git
a/test/jalview/urls/CustomUrlProviderTest.java
b/test/jalview/urls/CustomUrlProviderTest.java
index
52b3fcd
..
f9ed893
100644
(file)
--- a/
test/jalview/urls/CustomUrlProviderTest.java
+++ b/
test/jalview/urls/CustomUrlProviderTest.java
@@
-24,6
+24,7
@@
import static org.testng.AssertJUnit.assertEquals;
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.urls.api.UrlProviderI;
import jalview.util.UrlConstants;
import java.util.Arrays;
import jalview.util.UrlConstants;
import java.util.Arrays;
@@
-101,24
+102,24
@@
public class CustomUrlProviderTest
unselectedList);
// default url can be set
unselectedList);
// default url can be set
- assertTrue(customProv.setDefaultUrl("ANOTHER"));
+ assertTrue(customProv.setPrimaryUrl("ANOTHER"));
// supplied replacement id must be more than 4 chars
// supplied replacement id must be more than 4 chars
- String result = customProv.getDefaultUrl("123");
+ String result = customProv.getPrimaryUrl("123");
assertEquals(null, result);
// default url can be retrieved given a sequence id
assertEquals(null, result);
// default url can be retrieved given a sequence id
- result = customProv.getDefaultUrl("seqid");
+ result = customProv.getPrimaryUrl("seqid");
assertEquals("http://test/tseqid", result);
// if there is no default url it sets the default to null
assertEquals("http://test/tseqid", result);
// if there is no default url it sets the default to null
- assertFalse(customProv.setDefaultUrl("No default"));
- result = customProv.getDefaultUrl("testid");
+ assertFalse(customProv.setPrimaryUrl("No default"));
+ result = customProv.getPrimaryUrl("testid");
assertEquals(null, result);
// choosing the default picks the DEFAULT_STRING option
assertEquals(null, result);
// choosing the default picks the DEFAULT_STRING option
- customProv.chooseDefaultUrl();
- result = customProv.getDefaultUrl("seqid");
+ customProv.choosePrimaryUrl();
+ result = customProv.getPrimaryUrl("seqid");
assertEquals(
UrlConstants.DEFAULT_STRING.split("\\|")[1].split("\\$")[0]
+ "seqid",
assertEquals(
UrlConstants.DEFAULT_STRING.split("\\|")[1].split("\\$")[0]
+ "seqid",