git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc6be6d
)
JAL-2388 Unit test update
author
kiramt
<k.mourao@dundee.ac.uk>
Thu, 16 Mar 2017 12:13:05 +0000
(12:13 +0000)
committer
kiramt
<k.mourao@dundee.ac.uk>
Thu, 16 Mar 2017 12:13:05 +0000
(12:13 +0000)
test/jalview/viewmodel/OverviewDimensionsTest.java
patch
|
blob
|
history
diff --git
a/test/jalview/viewmodel/OverviewDimensionsTest.java
b/test/jalview/viewmodel/OverviewDimensionsTest.java
index
1ea07ea
..
a1d9f31
100644
(file)
--- a/
test/jalview/viewmodel/OverviewDimensionsTest.java
+++ b/
test/jalview/viewmodel/OverviewDimensionsTest.java
@@
-677,13
+677,14
@@
public class OverviewDimensionsTest
assertEquals(od.getBoxHeight(), boxHeight);
// move viewport to hidden columns
assertEquals(od.getBoxHeight(), boxHeight);
// move viewport to hidden columns
- moveViewport(102, 0);
+ // viewport can't actually extend into hidden cols,
+ // so move to the far right edge of the viewport
+ moveViewport(firstHidden - viewWidth, 0);
assertEquals(od.getBoxX(),
assertEquals(od.getBoxX(),
- Math.round((float) 102 * od.getWidth() / alwidth));
+ Math.round((float) (firstHidden - viewWidth)
+ * od.getWidth() / alwidth));
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxY(), 0);
- assertEquals(od.getBoxWidth(), boxWidth
- + Math.round((float) (lastHidden - firstHidden + 1)
- * od.getWidth() / alwidth));
+ assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
}
assertEquals(od.getBoxHeight(), boxHeight);
}