forked from upstream-mirrors/OpenTracks
Merge to head
This commit is contained in:
@@ -32,6 +32,7 @@ import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockC
|
||||
import com.google.android.maps.mytracks.R;
|
||||
import com.google.android.testing.mocking.AndroidMock;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
|
||||
import android.database.ContentObserver;
|
||||
@@ -86,7 +87,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
getContext(), getContext(), "test.");
|
||||
context = new MockContext(mockContentResolver, targetContext);
|
||||
|
||||
prefs = context.getSharedPreferences(Constants.SETTINGS_NAME, 0);
|
||||
prefs = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
|
||||
providerUtils = AndroidMock.createMock("providerUtils", MyTracksProviderUtils.class);
|
||||
dataSources = AndroidMock.createNiceMock("dataSources", DataSourcesWrapper.class);
|
||||
|
||||
@@ -138,7 +139,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
|
||||
Track track = new Track();
|
||||
prefs.edit().putLong("recordingTrack", TRACK_ID)
|
||||
.putLong("selectedTrack", TRACK_ID).commit();
|
||||
.putLong("selectedTrack", TRACK_ID).apply();
|
||||
expect(providerUtils.getTrack(TRACK_ID)).andStubReturn(track);
|
||||
expectStart();
|
||||
dataSources.registerContentObserver(
|
||||
@@ -297,7 +298,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
public void testWaypointListen() {
|
||||
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
|
||||
prefs.edit().putLong("recordingTrack", TRACK_ID)
|
||||
.putLong("selectedTrack", TRACK_ID).commit();
|
||||
.putLong("selectedTrack", TRACK_ID).apply();
|
||||
|
||||
Waypoint wpt1 = new Waypoint(),
|
||||
wpt2 = new Waypoint(),
|
||||
@@ -411,7 +412,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
public void testPointsListen() {
|
||||
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
|
||||
prefs.edit().putLong("recordingTrack", TRACK_ID)
|
||||
.putLong("selectedTrack", TRACK_ID).commit();
|
||||
.putLong("selectedTrack", TRACK_ID).apply();
|
||||
|
||||
expectStart();
|
||||
dataSources.registerContentObserver(
|
||||
@@ -498,7 +499,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
public void testPointsListen_reRegister() {
|
||||
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
|
||||
prefs.edit().putLong("recordingTrack", TRACK_ID)
|
||||
.putLong("selectedTrack", TRACK_ID).commit();
|
||||
.putLong("selectedTrack", TRACK_ID).apply();
|
||||
|
||||
expectStart();
|
||||
dataSources.registerContentObserver(
|
||||
@@ -570,7 +571,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
public void testPointsListen_reRegisterTrackChanged() {
|
||||
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
|
||||
prefs.edit().putLong("recordingTrack", TRACK_ID)
|
||||
.putLong("selectedTrack", TRACK_ID).commit();
|
||||
.putLong("selectedTrack", TRACK_ID).apply();
|
||||
|
||||
expectStart();
|
||||
dataSources.registerContentObserver(
|
||||
@@ -628,7 +629,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
public void testPointsListen_largeTrackSampling() {
|
||||
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
|
||||
prefs.edit().putLong("recordingTrack", TRACK_ID)
|
||||
.putLong("selectedTrack", TRACK_ID).commit();
|
||||
.putLong("selectedTrack", TRACK_ID).apply();
|
||||
|
||||
expectStart();
|
||||
dataSources.registerContentObserver(
|
||||
@@ -661,7 +662,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
public void testPointsListen_resampling() {
|
||||
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
|
||||
prefs.edit().putLong("recordingTrack", TRACK_ID)
|
||||
.putLong("selectedTrack", TRACK_ID).commit();
|
||||
.putLong("selectedTrack", TRACK_ID).apply();
|
||||
|
||||
expectStart();
|
||||
dataSources.registerContentObserver(
|
||||
@@ -814,7 +815,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
prefs.edit()
|
||||
.putBoolean(metricUnitsKey, true)
|
||||
.putBoolean(speedKey, true)
|
||||
.commit();
|
||||
.apply();
|
||||
|
||||
Capture<OnSharedPreferenceChangeListener> listenerCapture =
|
||||
new Capture<OnSharedPreferenceChangeListener>();
|
||||
@@ -840,7 +841,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
|
||||
prefs.edit()
|
||||
.putBoolean(speedKey, false)
|
||||
.commit();
|
||||
.apply();
|
||||
OnSharedPreferenceChangeListener listener = listenerCapture.getValue();
|
||||
listener.onSharedPreferenceChanged(prefs, speedKey);
|
||||
|
||||
@@ -854,7 +855,7 @@ public class TrackDataHubTest extends AndroidTestCase {
|
||||
|
||||
prefs.edit()
|
||||
.putBoolean(metricUnitsKey, false)
|
||||
.commit();
|
||||
.apply();
|
||||
listener.onSharedPreferenceChanged(prefs, metricUnitsKey);
|
||||
|
||||
verifyAndReset();
|
||||
|
||||
Reference in New Issue
Block a user