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 branch 'develop' into update_212_Dec_merge_with_21125_chamges
[jalview.git]
/
test
/
jalview
/
datamodel
/
DBRefEntryTest.java
diff --git
a/test/jalview/datamodel/DBRefEntryTest.java
b/test/jalview/datamodel/DBRefEntryTest.java
index
e95a8b5
..
476e0bb
100644
(file)
--- a/
test/jalview/datamodel/DBRefEntryTest.java
+++ b/
test/jalview/datamodel/DBRefEntryTest.java
@@
-62,12
+62,14
@@
public class DBRefEntryTest
assertFalse(ref1.equalRef(new DBRefEntry("UNIPROT", "1", "V71632")));
// presence of or differences in mappings are ignored
assertFalse(ref1.equalRef(new DBRefEntry("UNIPROT", "1", "V71632")));
// presence of or differences in mappings are ignored
- ref1.setMap(new Mapping(new MapList(new int[] { 1, 3 }, new int[] { 1,
- 1 }, 3, 1)));
+ ref1.setMap(
+ new Mapping(new MapList(new int[]
+ { 1, 3 }, new int[] { 1, 1 }, 3, 1)));
assertTrue(ref1.equalRef(ref2));
assertTrue(ref2.equalRef(ref1));
assertTrue(ref1.equalRef(ref2));
assertTrue(ref2.equalRef(ref1));
- ref1.setMap(new Mapping(new MapList(new int[] { 1, 6 }, new int[] { 1,
- 2 }, 3, 1)));
+ ref1.setMap(
+ new Mapping(new MapList(new int[]
+ { 1, 6 }, new int[] { 1, 2 }, 3, 1)));
assertTrue(ref1.equalRef(ref2));
assertTrue(ref2.equalRef(ref1));
}
assertTrue(ref1.equalRef(ref2));
assertTrue(ref2.equalRef(ref1));
}
@@
-94,8
+96,9
@@
public class DBRefEntryTest
/*
* ref1 has no mapping, acquires mapping from ref2
*/
/*
* ref1 has no mapping, acquires mapping from ref2
*/
- Mapping map = new Mapping(new MapList(new int[] { 1, 3 }, new int[] {
- 1, 1 }, 3, 1));
+ Mapping map = new Mapping(
+ new MapList(new int[]
+ { 1, 3 }, new int[] { 1, 1 }, 3, 1));
ref2.setMap(map);
assertTrue(ref1.updateFrom(ref2));
assertSame(map, ref1.getMap()); // null mapping updated
ref2.setMap(map);
assertTrue(ref1.updateFrom(ref2));
assertSame(map, ref1.getMap()); // null mapping updated
@@
-172,29
+175,33
@@
public class DBRefEntryTest
/*
* 1:1 mapping - ok
*/
/*
* 1:1 mapping - ok
*/
- dbr.setMap(new Mapping(null, new int[] { 1, 3 }, new int[] { 1, 3 }, 1,
- 1));
+ dbr.setMap(
+ new Mapping(null, new int[]
+ { 1, 3 }, new int[] { 1, 3 }, 1, 1));
assertTrue(dbr.isPrimaryCandidate());
/*
* 1:1 mapping of identical split ranges - not ok
*/
assertTrue(dbr.isPrimaryCandidate());
/*
* 1:1 mapping of identical split ranges - not ok
*/
- dbr.setMap(new Mapping(null, new int[] { 1, 3, 6, 9 }, new int[] { 1,
- 3, 6, 9 }, 1, 1));
+ dbr.setMap(
+ new Mapping(null, new int[]
+ { 1, 3, 6, 9 }, new int[] { 1, 3, 6, 9 }, 1, 1));
assertFalse(dbr.isPrimaryCandidate());
/*
* 1:1 mapping of different ranges - not ok
*/
assertFalse(dbr.isPrimaryCandidate());
/*
* 1:1 mapping of different ranges - not ok
*/
- dbr.setMap(new Mapping(null, new int[] { 1, 4 }, new int[] { 2, 5 }, 1,
- 1));
+ dbr.setMap(
+ new Mapping(null, new int[]
+ { 1, 4 }, new int[] { 2, 5 }, 1, 1));
assertFalse(dbr.isPrimaryCandidate());
/*
* 1:1 mapping of 'isoform' ranges - not ok
*/
assertFalse(dbr.isPrimaryCandidate());
/*
* 1:1 mapping of 'isoform' ranges - not ok
*/
- dbr.setMap(new Mapping(null, new int[] { 1, 2, 6, 9 }, new int[] { 1,
- 3, 7, 9 }, 1, 1));
+ dbr.setMap(
+ new Mapping(null, new int[]
+ { 1, 2, 6, 9 }, new int[] { 1, 3, 7, 9 }, 1, 1));
assertFalse(dbr.isPrimaryCandidate());
dbr.setMap(null);
assertTrue(dbr.isPrimaryCandidate());
assertFalse(dbr.isPrimaryCandidate());
dbr.setMap(null);
assertTrue(dbr.isPrimaryCandidate());
@@
-222,22
+229,25
@@
public class DBRefEntryTest
/*
* 1:1 mapping and sequenceRef (fail)
*/
/*
* 1:1 mapping and sequenceRef (fail)
*/
- dbr.setMap(new Mapping(new Sequence("foo", "ASDF"), new int[] { 1, 3 },
- new int[] { 1, 3 }, 1, 1));
+ dbr.setMap(
+ new Mapping(new Sequence("foo", "ASDF"), new int[]
+ { 1, 3 }, new int[] { 1, 3 }, 1, 1));
assertFalse(dbr.isPrimaryCandidate());
/*
* 1:3 mapping (fail)
*/
assertFalse(dbr.isPrimaryCandidate());
/*
* 1:3 mapping (fail)
*/
- dbr.setMap(new Mapping(null, new int[] { 1, 3 }, new int[] { 1, 3 }, 1,
- 3));
+ dbr.setMap(
+ new Mapping(null, new int[]
+ { 1, 3 }, new int[] { 1, 3 }, 1, 3));
assertFalse(dbr.isPrimaryCandidate());
/*
* 2:2 mapping with shift (expected fail, but maybe use case for a pass)
*/
assertFalse(dbr.isPrimaryCandidate());
/*
* 2:2 mapping with shift (expected fail, but maybe use case for a pass)
*/
- dbr.setMap(new Mapping(null, new int[] { 1, 4 }, new int[] { 1, 4 }, 2,
- 2));
+ dbr.setMap(
+ new Mapping(null, new int[]
+ { 1, 4 }, new int[] { 1, 4 }, 2, 2));
assertFalse(dbr.isPrimaryCandidate());
}
}
assertFalse(dbr.isPrimaryCandidate());
}
}