Implement tap recenters map display, test passes now.

rlisle · Apr 25, 2013 · d9dd8cd · d9dd8cd
1 parent eba84b1
commit d9dd8cd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/ApplicationTests/HMFViewControllerTests.m b/ApplicationTests/HMFViewControllerTests.m
@@ -12,9 +12,8 @@
 #define HC_SHORTHAND
 #import <OCHamcrestIOS/OCHamcrestIOS.h>
 
-// Uncomment the next two lines to use OCMockito for mock objects:
-//#define MOCKITO_SHORTHAND
-//#import <OCMockitoIOS/OCMockitoIOS.h>
+#define MOCKITO_SHORTHAND
+#import <OCMockitoIOS/OCMockitoIOS.h>
 
 #import <MapKit/MKUserLocation.h>
 #import <MapKit/MKTypes.h>
@@ -83,7 +82,12 @@ - (void)testThatTapRecentersMap
 
     // Test that handleTap recenters the map
     map.userTrackingMode = MKUserTrackingModeNone;
-    [self.testObj handleTap];
+
+//    UITapGestureRecognizer *mock = mockClass([UITapGestureRecognizer class]);
+//    UIGestureRecognizerState gestureState = UIGestureRecognizerStateEnded;
+//    [given([mock state]) willReturnInt:gestureState];
+
+    [self.testObj handleMapTap:nil];
     MKUserTrackingMode mode = self.testObj.mapView.userTrackingMode;
     STAssertEquals(mode,MKUserTrackingModeFollow,@"mode not MKUserTrackingModeFollow");
 

diff --git a/HowsMyFuel/HMFViewController.h b/HowsMyFuel/HMFViewController.h
@@ -18,4 +18,6 @@
 @property (nonatomic, strong) HMFPresenter* presenter;
 @property (weak, nonatomic) IBOutlet MKMapView *mapView;
 
+- (void)handleMapTap:(UIGestureRecognizer *)sender;
+
 @end
diff --git a/HowsMyFuel/HMFViewController.m b/HowsMyFuel/HMFViewController.m
@@ -9,7 +9,6 @@
 #import "HMFViewController.h"
 
 @interface HMFViewController ()
-
 @end
 
 @implementation HMFViewController
@@ -27,6 +26,7 @@ - (void)viewDidLoad
     [super viewDidLoad];
     // Do any additional setup after loading the view from its nib.
     [self configureMapSettings];
+    [self setupGestureRecognizers];
 }
 
 - (void)didReceiveMemoryWarning
@@ -40,4 +40,18 @@ - (void)configureMapSettings
     [[self mapView]setUserTrackingMode:MKUserTrackingModeFollow];
 }
 
+- (void)setupGestureRecognizers
+{
+    // Setup gesture recognizers
+    UITapGestureRecognizer *mapTapRecognizer = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(handleMapTap:)];
+    [self.mapView addGestureRecognizer:mapTapRecognizer];
+}
+
+- (void)handleMapTap:(UIGestureRecognizer *)sender {
+//    if(sender.state == UIGestureRecognizerStateEnded){
+//        NSLog(@"Tap");
+        [[self mapView]setUserTrackingMode:MKUserTrackingModeFollow animated:YES];
+//    }
+}
+
 @end