From 832e2499c91d287824ae4b191b169b76bfcaf104 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 20 Aug 2012 11:00:16 -0700
Subject: [PATCH] merge heads

---
 .../google/android/apps/mytracks/content/TrackDataHubTest.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
index 421b1f6ab..3174b1fc9 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
@@ -126,6 +126,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     dataSource.unregisterHeadingListener(isA(SensorEventListener.class));
     dataSource.unregisterOnSharedPreferenceChangeListener(
         isA(OnSharedPreferenceChangeListener.class));
+    dataSource.close();
     AndroidMock.replay(dataSource);
 
     trackDataHub.stop();
@@ -579,6 +580,7 @@ public class TrackDataHubTest extends AndroidTestCase {
 
     // Expect a heading update with declination
     trackDataListener1.onHeadingChanged(52.0);
+    AndroidMock.expect(dataSource.isAllowed()).andReturn(true);
     replay();
 
     // Update location and sensor