Improve code / xml formatting, closes #54
This commit is contained in:
Emux
@@ -17,127 +17,127 @@ import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
public class MapEventLayerTest {
|
||||
private MapEventLayer layer;
|
||||
private Map mockMap;
|
||||
private ViewController mockViewport;
|
||||
private Animator mockAnimator;
|
||||
private ArgumentCaptor<Float> argumentCaptor;
|
||||
private MapEventLayer layer;
|
||||
private Map mockMap;
|
||||
private ViewController mockViewport;
|
||||
private Animator mockAnimator;
|
||||
private ArgumentCaptor<Float> argumentCaptor;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
mockMap = Mockito.mock(Map.class);
|
||||
mockViewport = Mockito.mock(ViewController.class);
|
||||
mockAnimator = Mockito.mock(Animator.class);
|
||||
layer = new MapEventLayer(mockMap);
|
||||
when(mockMap.viewport()).thenReturn(mockViewport);
|
||||
when(mockMap.animator()).thenReturn(mockAnimator);
|
||||
when(mockMap.getHeight()).thenReturn(6);
|
||||
argumentCaptor = ArgumentCaptor.forClass(float.class);
|
||||
}
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
mockMap = Mockito.mock(Map.class);
|
||||
mockViewport = Mockito.mock(ViewController.class);
|
||||
mockAnimator = Mockito.mock(Animator.class);
|
||||
layer = new MapEventLayer(mockMap);
|
||||
when(mockMap.viewport()).thenReturn(mockViewport);
|
||||
when(mockMap.animator()).thenReturn(mockAnimator);
|
||||
when(mockMap.getHeight()).thenReturn(6);
|
||||
argumentCaptor = ArgumentCaptor.forClass(float.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldNotBeNull() throws Exception {
|
||||
assertThat(layer).isNotNull();
|
||||
}
|
||||
@Test
|
||||
public void shouldNotBeNull() throws Exception {
|
||||
assertThat(layer).isNotNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doubleTap_shouldAnimateZoom() throws Exception {
|
||||
simulateDoubleTap();
|
||||
verify(mockAnimator).animateZoom(300, 2, 1.0f, -2.0f);
|
||||
}
|
||||
@Test
|
||||
public void doubleTap_shouldAnimateZoom() throws Exception {
|
||||
simulateDoubleTap();
|
||||
verify(mockAnimator).animateZoom(300, 2, 1.0f, -2.0f);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doubleTap_shouldAnimateZoomAfterDoubleTouchDrag() throws Exception {
|
||||
simulateDoubleTouchDragUp();
|
||||
simulateDoubleTap();
|
||||
verify(mockAnimator).animateZoom(300, 2, 1.0f, -2.0f);
|
||||
}
|
||||
@Test
|
||||
public void doubleTap_shouldAnimateZoomAfterDoubleTouchDrag() throws Exception {
|
||||
simulateDoubleTouchDragUp();
|
||||
simulateDoubleTap();
|
||||
verify(mockAnimator).animateZoom(300, 2, 1.0f, -2.0f);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doubleTouchDrag_shouldNotAnimateZoom() throws Exception {
|
||||
simulateDoubleTouchDragUp();
|
||||
verify(mockAnimator, never()).animateZoom(any(long.class), any(double.class),
|
||||
any(float.class), any(float.class));
|
||||
}
|
||||
@Test
|
||||
public void doubleTouchDrag_shouldNotAnimateZoom() throws Exception {
|
||||
simulateDoubleTouchDragUp();
|
||||
verify(mockAnimator, never()).animateZoom(any(long.class), any(double.class),
|
||||
any(float.class), any(float.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doubleTouchDragUp_shouldDecreaseContentScale() throws Exception {
|
||||
simulateDoubleTouchDragUp();
|
||||
verify(mockViewport).scaleMap(argumentCaptor.capture(), any(float.class), any(float.class));
|
||||
assertThat(argumentCaptor.getValue()).isLessThan(1);
|
||||
}
|
||||
@Test
|
||||
public void doubleTouchDragUp_shouldDecreaseContentScale() throws Exception {
|
||||
simulateDoubleTouchDragUp();
|
||||
verify(mockViewport).scaleMap(argumentCaptor.capture(), any(float.class), any(float.class));
|
||||
assertThat(argumentCaptor.getValue()).isLessThan(1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doubleTouchDragDown_shouldIncreaseContentScale() throws Exception {
|
||||
simulateDoubleTouchDragDown();
|
||||
verify(mockViewport).scaleMap(argumentCaptor.capture(), any(float.class), any(float.class));
|
||||
assertThat(argumentCaptor.getValue()).isGreaterThan(1);
|
||||
}
|
||||
@Test
|
||||
public void doubleTouchDragDown_shouldIncreaseContentScale() throws Exception {
|
||||
simulateDoubleTouchDragDown();
|
||||
verify(mockViewport).scaleMap(argumentCaptor.capture(), any(float.class), any(float.class));
|
||||
assertThat(argumentCaptor.getValue()).isGreaterThan(1);
|
||||
}
|
||||
|
||||
private void simulateDoubleTap() {
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_DOWN, 1, 1));
|
||||
layer.onGesture(Gesture.DOUBLE_TAP, new TestMotionEvent(MotionEvent.ACTION_UP, 1, 1));
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_UP, 1, 1));
|
||||
}
|
||||
private void simulateDoubleTap() {
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_DOWN, 1, 1));
|
||||
layer.onGesture(Gesture.DOUBLE_TAP, new TestMotionEvent(MotionEvent.ACTION_UP, 1, 1));
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_UP, 1, 1));
|
||||
}
|
||||
|
||||
private void simulateDoubleTouchDragUp() {
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_DOWN, 1, 1));
|
||||
layer.onGesture(Gesture.DOUBLE_TAP, new TestMotionEvent(MotionEvent.ACTION_MOVE, 1, 0));
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_MOVE, -100, 0));
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_UP, 1, 0));
|
||||
}
|
||||
private void simulateDoubleTouchDragUp() {
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_DOWN, 1, 1));
|
||||
layer.onGesture(Gesture.DOUBLE_TAP, new TestMotionEvent(MotionEvent.ACTION_MOVE, 1, 0));
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_MOVE, -100, 0));
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_UP, 1, 0));
|
||||
}
|
||||
|
||||
private void simulateDoubleTouchDragDown() {
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_DOWN, 1, 1));
|
||||
layer.onGesture(Gesture.DOUBLE_TAP, new TestMotionEvent(MotionEvent.ACTION_MOVE, 1, 2));
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_MOVE, 100, 2));
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_UP, 1, 2));
|
||||
}
|
||||
private void simulateDoubleTouchDragDown() {
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_DOWN, 1, 1));
|
||||
layer.onGesture(Gesture.DOUBLE_TAP, new TestMotionEvent(MotionEvent.ACTION_MOVE, 1, 2));
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_MOVE, 100, 2));
|
||||
layer.onTouchEvent(new TestMotionEvent(MotionEvent.ACTION_UP, 1, 2));
|
||||
}
|
||||
|
||||
class TestMotionEvent extends MotionEvent {
|
||||
final int action;
|
||||
final float x;
|
||||
final float y;
|
||||
class TestMotionEvent extends MotionEvent {
|
||||
final int action;
|
||||
final float x;
|
||||
final float y;
|
||||
|
||||
public TestMotionEvent(int action, float x, float y) {
|
||||
this.action = action;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
}
|
||||
public TestMotionEvent(int action, float x, float y) {
|
||||
this.action = action;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getTime() {
|
||||
return 0;
|
||||
}
|
||||
@Override
|
||||
public long getTime() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAction() {
|
||||
return action;
|
||||
}
|
||||
@Override
|
||||
public int getAction() {
|
||||
return action;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getX() {
|
||||
return x;
|
||||
}
|
||||
@Override
|
||||
public float getX() {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getY() {
|
||||
return y;
|
||||
}
|
||||
@Override
|
||||
public float getY() {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getX(int idx) {
|
||||
return x;
|
||||
}
|
||||
@Override
|
||||
public float getX(int idx) {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getY(int idx) {
|
||||
return y;
|
||||
}
|
||||
@Override
|
||||
public float getY(int idx) {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPointerCount() {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public int getPointerCount() {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,168 +1,168 @@
|
||||
package org.oscim.layers.tile;
|
||||
|
||||
import static org.fest.assertions.api.Assertions.assertThat;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.oscim.layers.tile.MapTile.TileNode;
|
||||
import org.oscim.renderer.MapRenderer;
|
||||
|
||||
import static org.fest.assertions.api.Assertions.assertThat;
|
||||
|
||||
public class TileRendererTest {
|
||||
|
||||
static {
|
||||
/* makes default minFadeTime == 1000 */
|
||||
MapRenderer.frametime = 1050;
|
||||
}
|
||||
static {
|
||||
/* makes default minFadeTime == 1000 */
|
||||
MapRenderer.frametime = 1050;
|
||||
}
|
||||
|
||||
static TileNode makeNode(int fadeTime, TileNode parent) {
|
||||
TileNode n = new TileNode();
|
||||
n.item = new MapTile(n, 0, 0, 0);
|
||||
n.item.fadeTime = fadeTime;
|
||||
static TileNode makeNode(int fadeTime, TileNode parent) {
|
||||
TileNode n = new TileNode();
|
||||
n.item = new MapTile(n, 0, 0, 0);
|
||||
n.item.fadeTime = fadeTime;
|
||||
|
||||
if (parent == null) {
|
||||
// root node is its own parent
|
||||
n.parent = n;
|
||||
} else {
|
||||
parent.child00 = n;
|
||||
n.parent = parent;
|
||||
}
|
||||
if (parent == null) {
|
||||
// root node is its own parent
|
||||
n.parent = n;
|
||||
} else {
|
||||
parent.child00 = n;
|
||||
n.parent = parent;
|
||||
}
|
||||
|
||||
return n;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeOf1000() {
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeOf1000() {
|
||||
|
||||
TileNode r = makeNode(0, null);
|
||||
TileNode n = makeNode(0, r);
|
||||
TileNode r = makeNode(0, null);
|
||||
TileNode n = makeNode(0, r);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 0);
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 0);
|
||||
|
||||
assertThat(fadeTime).isEqualTo(1000);
|
||||
}
|
||||
assertThat(fadeTime).isEqualTo(1000);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromParent() {
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromParent() {
|
||||
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode n = makeNode(0, r);
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode n = makeNode(0, r);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 0);
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 0);
|
||||
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromGrandparent() {
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromGrandparent() {
|
||||
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode p = makeNode(200, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode p = makeNode(200, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 0);
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 0);
|
||||
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromParentWhenParentsTimeIsLessThanGrandpasTime() {
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromParentWhenParentsTimeIsLessThanGrandpasTime() {
|
||||
|
||||
TileNode r = makeNode(200, null);
|
||||
TileNode p = makeNode(100, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
TileNode r = makeNode(200, null);
|
||||
TileNode p = makeNode(100, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 0);
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 0);
|
||||
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromParentForParentProxy() {
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromParentForParentProxy() {
|
||||
|
||||
TileNode r = makeNode(200, null);
|
||||
TileNode p = makeNode(100, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
TileNode r = makeNode(200, null);
|
||||
TileNode p = makeNode(100, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, -1);
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, -1);
|
||||
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldNotGetMinFadeTimeFromGradparentForParentProxy() {
|
||||
/* (as the grandparent will not be locked) */
|
||||
@Test
|
||||
public void shouldNotGetMinFadeTimeFromGradparentForParentProxy() {
|
||||
/* (as the grandparent will not be locked) */
|
||||
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode p = makeNode(200, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode p = makeNode(200, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, -1);
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, -1);
|
||||
|
||||
assertThat(fadeTime).isNotEqualTo(100);
|
||||
assertThat(fadeTime).isEqualTo(200);
|
||||
}
|
||||
assertThat(fadeTime).isNotEqualTo(100);
|
||||
assertThat(fadeTime).isEqualTo(200);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromParentForChildProxy() {
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromParentForChildProxy() {
|
||||
|
||||
TileNode r = makeNode(200, null);
|
||||
TileNode p = makeNode(100, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
TileNode r = makeNode(200, null);
|
||||
TileNode p = makeNode(100, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 1);
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 1);
|
||||
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromGrandparentForChildProxy() {
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromGrandparentForChildProxy() {
|
||||
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode p = makeNode(200, r);
|
||||
TileNode c = makeNode(0, p);
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode p = makeNode(200, r);
|
||||
TileNode c = makeNode(0, p);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(c.item, 1);
|
||||
long fadeTime = TileRenderer.getMinFade(c.item, 1);
|
||||
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromGrandgrandparentForChildProxy() {
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromGrandgrandparentForChildProxy() {
|
||||
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode gp = makeNode(200, r);
|
||||
TileNode p = makeNode(200, gp);
|
||||
TileNode c = makeNode(0, p);
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode gp = makeNode(200, r);
|
||||
TileNode p = makeNode(200, gp);
|
||||
TileNode c = makeNode(0, p);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(c.item, 1);
|
||||
long fadeTime = TileRenderer.getMinFade(c.item, 1);
|
||||
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
assertThat(fadeTime).isEqualTo(100);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromChild() {
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeFromChild() {
|
||||
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode p = makeNode(200, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode p = makeNode(200, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
|
||||
n.child00 = makeNode(50, n);
|
||||
n.child00 = makeNode(50, n);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 0);
|
||||
long fadeTime = TileRenderer.getMinFade(n.item, 0);
|
||||
|
||||
assertThat(fadeTime).isEqualTo(50);
|
||||
}
|
||||
assertThat(fadeTime).isEqualTo(50);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeForParentFromChild() {
|
||||
@Test
|
||||
public void shouldGetMinFadeTimeForParentFromChild() {
|
||||
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode p = makeNode(200, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
TileNode r = makeNode(100, null);
|
||||
TileNode p = makeNode(200, r);
|
||||
TileNode n = makeNode(0, p);
|
||||
|
||||
n.child00 = makeNode(50, n);
|
||||
n.child00 = makeNode(50, n);
|
||||
|
||||
long fadeTime = TileRenderer.getMinFade(p.item, -1);
|
||||
long fadeTime = TileRenderer.getMinFade(p.item, -1);
|
||||
|
||||
assertThat(fadeTime).isEqualTo(50);
|
||||
}
|
||||
assertThat(fadeTime).isEqualTo(50);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user