commit 606ba47ada44526522ba234d3f9aece790627ad1
author Lasse Holmstedt <lasse.holmstedt@here.com> Sun May 17 17:59:12 2015 +0200
committer Lasse Holmstedt <lasse.holmstedt@here.com> Mon May 18 13:55:53 2015 +0200
tree f87f3cc9b3e57e72e9a0449d00e00708fe607d70
parent c85d2daf9efd4d17144f3f856e0428f705de2fe6

Use real code from GestureDetector for the shadow

Since da0b674b6a36f6a58735 which introduced a ShadowVelocityTracker,
shadowing the GestureDetector has become mostly unnecessary. Now,
the shadow executes actual code, which makes the class behave as
expected.

Change-Id: Ifbfa8d49e02b40fd57260e387f6889188b488305

robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowGestureDetector.java

diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowGestureDetector.java b/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowGestureDetector.java
index 6e90d62..0b46c2f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowGestureDetector.java
+++ b/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowGestureDetector.java
@@ -1,13 +1,17 @@
 package org.robolectric.shadows;
 
 import android.content.Context;
+import android.os.Handler;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.RealObject;
+import org.robolectric.internal.Shadow;
 
 import static android.view.GestureDetector.OnDoubleTapListener;
+import static org.robolectric.internal.Shadow.directlyOn;
+import static org.robolectric.util.ReflectionHelpers.ClassParameter.from;
 
 @SuppressWarnings({"UnusedDeclaration"})
 @Implements(GestureDetector.class)
@@ -15,33 +19,31 @@
   @RealObject
   private GestureDetector realObject;
 
-  private MotionEvent onTouchEventMotionEvent;
-  private boolean onTouchEventNextReturnValue = true;
-
-  private GestureDetector.OnGestureListener listener;
   private static GestureDetector lastActiveGestureDetector;
+
+  private MotionEvent onTouchEventMotionEvent;
+  private GestureDetector.OnGestureListener listener;
   private OnDoubleTapListener onDoubleTapListener;
 
-  public void __constructor__(GestureDetector.OnGestureListener listener) {
-    __constructor__(null, listener);
-  }
-
-  public void __constructor__(Context context, GestureDetector.OnGestureListener listener) {
+  public void __constructor__(Context context, GestureDetector.OnGestureListener listener, Handler handler) {
+    Shadow.invokeConstructor(GestureDetector.class, realObject,
+        from(Context.class, context),
+        from(GestureDetector.OnGestureListener.class, listener),
+        from(Handler.class, handler));
     this.listener = listener;
-    if (listener instanceof OnDoubleTapListener) {
-      setOnDoubleTapListener((OnDoubleTapListener) listener);
-    }
   }
 
   @Implementation
   public boolean onTouchEvent(MotionEvent ev) {
     lastActiveGestureDetector = realObject;
     onTouchEventMotionEvent = ev;
-    return onTouchEventNextReturnValue;
+
+    return directlyOn(realObject, GestureDetector.class).onTouchEvent(ev);
   }
 
   @Implementation
   public void setOnDoubleTapListener(OnDoubleTapListener onDoubleTapListener) {
+    directlyOn(realObject, GestureDetector.class).setOnDoubleTapListener(onDoubleTapListener);
     this.onDoubleTapListener = onDoubleTapListener;
   }
 
@@ -53,10 +55,6 @@
     onTouchEventMotionEvent = null;
   }
 
-  public void setNextOnTouchEventReturnValue(boolean nextReturnValue) {
-    onTouchEventNextReturnValue = nextReturnValue;
-  }
-
   public GestureDetector.OnGestureListener getListener() {
     return listener;
   }

robolectric/src/test/java/org/robolectric/shadows/ShadowGestureDetectorTest.java

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowGestureDetectorTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowGestureDetectorTest.java
index 2214daf..657aecc 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowGestureDetectorTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowGestureDetectorTest.java
@@ -2,6 +2,7 @@
 
 import android.view.GestureDetector;
 import android.view.MotionEvent;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,17 +41,6 @@
   }
 
   @Test
-  public void test_setNextOnTouchEventReturnValue() throws Exception {
-    assertTrue(detector.onTouchEvent(motionEvent));
-
-    shadowOf(detector).setNextOnTouchEventReturnValue(true);
-    assertTrue(detector.onTouchEvent(motionEvent));
-
-    shadowOf(detector).setNextOnTouchEventReturnValue(false);
-    assertFalse(detector.onTouchEvent(motionEvent));
-  }
-
-  @Test
   public void test_getListener() throws Exception {
     TestOnGestureListener listener = new TestOnGestureListener();
     assertSame(listener, shadowOf(new GestureDetector(listener)).getListener());