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
Merge remote-tracking branch 'origin/develop' into bug/JAL-2282
[jalview.git]
/
test
/
jalview
/
util
/
DBRefUtilsTest.java
diff --git
a/test/jalview/util/DBRefUtilsTest.java
b/test/jalview/util/DBRefUtilsTest.java
index
76ce32f
..
468bc3e
100644
(file)
--- a/
test/jalview/util/DBRefUtilsTest.java
+++ b/
test/jalview/util/DBRefUtilsTest.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * 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.
*
@@
-74,9
+74,23
@@
public class DBRefUtilsTest
assertSame(ref2, selected[0]);
assertSame(ref3, selected[1]);
assertSame(ref2, selected[0]);
assertSame(ref3, selected[1]);
- sources = new String[] { "Uniprot", "EMBLCDS" };
+ // case insensitive
+ sources = new String[] { "Uniprot" };
+ selected = DBRefUtils.selectRefs(dbrefs, sources);
+ assertEquals(2, selected.length);
+ assertSame(ref2, selected[0]);
+ assertSame(ref3, selected[1]);
+
+ sources = new String[] { "EMBLCDS" };
selected = DBRefUtils.selectRefs(dbrefs, sources);
assertNull(selected);
selected = DBRefUtils.selectRefs(dbrefs, sources);
assertNull(selected);
+
+ sources = new String[] { "embl", "uniprot" };
+ selected = DBRefUtils.selectRefs(dbrefs, sources);
+ assertEquals(3, selected.length);
+ assertSame(ref1, selected[0]);
+ assertSame(ref2, selected[1]);
+ assertSame(ref3, selected[2]);
}
/**
}
/**
@@
-99,6
+113,11
@@
public class DBRefUtilsTest
assertEquals("UNIPROTKB/SWISS-CHEESE",
DBRefUtils.getCanonicalName("UNIPROTKB/SWISS-CHEESE"));
assertEquals("ENSEMBL", DBRefUtils.getCanonicalName("Ensembl"));
assertEquals("UNIPROTKB/SWISS-CHEESE",
DBRefUtils.getCanonicalName("UNIPROTKB/SWISS-CHEESE"));
assertEquals("ENSEMBL", DBRefUtils.getCanonicalName("Ensembl"));
+
+ // these are not 'known' to Jalview
+ assertEquals("PFAM", DBRefUtils.getCanonicalName("PFAM"));
+ assertEquals("pfam", DBRefUtils.getCanonicalName("pfam"));
+
}
@Test(groups = { "Functional" })
}
@Test(groups = { "Functional" })