karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

fix eclipse warnings

Browse Source
This commit is contained in:
Jimmy Shih
2012-09-11 16:03:39 -07:00
parent c9d4a07756
commit ef1964eeff
2 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImplTest.java
+5 -10
View File
@@ -635,13 +635,10 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
assertEquals(TEST_DESC_NEW, providerUtils.getWaypoint(1).getDescription()); assertEquals(TEST_DESC_NEW, providerUtils.getWaypoint(1).getDescription());
} }
/** /**
* Tests the method * Tests the method {@link MyTracksProviderUtilsImpl#bulkInsertTrackPoint(Location[],
* {@link MyTracksProviderUtilsImpl#bulkInsertTrackPoint(Location[], int, long)} * int, long)}.
* . This test also covers the method
* {@link MyTracksProviderUtilsImpl#createContentValues(Location, long)} and
* the inner class {@link MyTracksProviderUtilsImpl.CachedTrackPointsIndexes}.
*/ */
public void testBulkInsertTrackPoint() { public void testBulkInsertTrackPoint() {
// Insert track, point at first. // Insert track, point at first.
@@ -730,16 +727,14 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
/** /**
* Tests the method * Tests the method
* {@link MyTracksProviderUtilsImpl#insertTrackPoint(Location, long)}. This * {@link MyTracksProviderUtilsImpl#insertTrackPoint(Location, long)}.
* test also covers the method
* {@link MyTracksProviderUtilsImpl#createContentValues(Location, long)}.
*/ */
public void testInsertTrackPoint() { public void testInsertTrackPoint() {
// Insert track, point at first. // Insert track, point at first.
long trackId = System.currentTimeMillis(); long trackId = System.currentTimeMillis();
Track track = getTrack(trackId, 10); Track track = getTrack(trackId, 10);
insertTrackWithLocations(track); insertTrackWithLocations(track);
providerUtils.insertTrackPoint(createLocation(22), trackId); providerUtils.insertTrackPoint(createLocation(22), trackId);
assertEquals(11, providerUtils.getTrackPointCursor(trackId, 0, 1000, false).getCount()); assertEquals(11, providerUtils.getTrackPointCursor(trackId, 0, 1000, false).getCount());
} }
MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
+31 -37
View File
@@ -792,13 +792,11 @@ public class TrackDataHubTest extends AndroidTestCase {
// Do nothing // Do nothing
} }
} }
/** /**
* Tests the method {@link TrackDataHub#start()}. This method would also cover * Tests the method {@link TrackDataHub#start()}.
* some logic of {@link TrackDataHub#loadDataForAll()} and
* {@link TrackDataHub#notifySelectedTrackChanged(Set)}.
*/ */
public void testRegisterSelectedTrackListener() { public void testRegisterSelectedTrackListener() {
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
Track track = TrackStubUtils.createTrack(1); Track track = TrackStubUtils.createTrack(1);
expect(myTracksProviderUtils.getTrack(capture(new Capture<Long>()))).andReturn(track); expect(myTracksProviderUtils.getTrack(capture(new Capture<Long>()))).andReturn(track);
@@ -807,16 +805,15 @@ public class TrackDataHubTest extends AndroidTestCase {
trackDataListener1.onSelectedTrackChanged(track); trackDataListener1.onSelectedTrackChanged(track);
replay(); replay();
trackDataHub.start(); trackDataHub.start();
trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.SELECTED_TRACK)); trackDataHub.registerTrackDataListener(
trackDataListener1, EnumSet.of(TrackDataType.SELECTED_TRACK));
verifyAndReset(); verifyAndReset();
} }
/** /**
* Tests the method {@link TrackDataHub#start()}. This method would also cover * Tests the method {@link TrackDataHub#start()}.
* some logic of PreferencesUtils and
* {@link TrackDataHub#notifyTracksTableUpdate(Set)}.
*/ */
public void testRegisterTracksTableListener() { public void testRegisterTracksTableListener() {
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>(); Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
dataSource.registerContentObserver(eq(TracksColumns.CONTENT_URI), capture(observerCapture)); dataSource.registerContentObserver(eq(TracksColumns.CONTENT_URI), capture(observerCapture));
@@ -827,39 +824,38 @@ public class TrackDataHubTest extends AndroidTestCase {
trackDataListener1.onTrackUpdated(track); trackDataListener1.onTrackUpdated(track);
replay(); replay();
trackDataHub.start(); trackDataHub.start();
trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.TRACKS_TABLE)); trackDataHub.registerTrackDataListener(
trackDataListener1, EnumSet.of(TrackDataType.TRACKS_TABLE));
verifyAndReset(); verifyAndReset();
} }
/** /**
* Tests the method {@link TrackDataHub#start()}. This method would also cover * Tests the method {@link TrackDataHub#start()}.
* some logic of {@link TrackDataHub#loadDataForAll()} and
* {@link TrackDataHub#notifyWaypointsTableUpdate(Set)}.
*/ */
public void testRegisterWaypointsTableListener() { public void testRegisterWaypointsTableListener() {
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
Capture<ContentObserver> observerCapture = new Capture<ContentObserver>(); Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
dataSource.registerContentObserver(eq(WaypointsColumns.CONTENT_URI), capture(observerCapture)); dataSource.registerContentObserver(eq(WaypointsColumns.CONTENT_URI), capture(observerCapture));
expect(myTracksProviderUtils.getWaypointCursor(capture(new Capture<Long>()), capture(new Capture<Long>()), expect(myTracksProviderUtils.getWaypointCursor(
capture(new Capture<Long>()), capture(new Capture<Long>()),
capture(new Capture<Integer>()))).andReturn(null); capture(new Capture<Integer>()))).andReturn(null);
trackDataListener1.clearWaypoints(); trackDataListener1.clearWaypoints();
trackDataListener1.onNewWaypointsDone(); trackDataListener1.onNewWaypointsDone();
replay(); replay();
trackDataHub.start(); trackDataHub.start();
trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.WAYPOINTS_TABLE)); trackDataHub.registerTrackDataListener(
trackDataListener1, EnumSet.of(TrackDataType.WAYPOINTS_TABLE));
verifyAndReset(); verifyAndReset();
} }
/** /**
* Tests the method {@link TrackDataHub#start()}. This method would also cover * Tests the method {@link TrackDataHub#start()} when no last seen location.
* some logic of {@link TrackDataHub#loadDataForAll()} and
* {@link TrackDataHub#notifyLocationStateChanged(Set)} when no last seen
* location.
*/ */
public void testRegisterLocationListener_noLastSeenLocation() { public void testRegisterLocationListener_noLastSeenLocation() {
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
Capture<CurrentLocationListener> currentLocationListener = new Capture<CurrentLocationListener>(); Capture<CurrentLocationListener> currentLocationListener = new Capture<
dataSource.registerLocationListener(capture(currentLocationListener)); CurrentLocationListener>();
dataSource.registerLocationListener(capture(currentLocationListener));
trackDataListener1.onLocationStateChanged(capture(new Capture<LocationState>())); trackDataListener1.onLocationStateChanged(capture(new Capture<LocationState>()));
replay(); replay();
trackDataHub.setLastSeenLocation(null); trackDataHub.setLastSeenLocation(null);
@@ -867,17 +863,15 @@ public class TrackDataHubTest extends AndroidTestCase {
trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.LOCATION)); trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.LOCATION));
verifyAndReset(); verifyAndReset();
} }
/** /**
* Tests the method {@link TrackDataHub#start()}. This method would also cover * Tests the method {@link TrackDataHub#start()} when has last seen location.
* some logic of {@link TrackDataHub#loadDataForAll()} and
* {@link TrackDataHub#notifyLocationChanged(Location, boolean, Set)} when has
* last seen location.
*/ */
public void testRegisterLocationListener_hasLastSeenLocation() { public void testRegisterLocationListener_hasLastSeenLocation() {
dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
Capture<CurrentLocationListener> currentLocationListener = new Capture<CurrentLocationListener>(); Capture<CurrentLocationListener> currentLocationListener = new Capture<
dataSource.registerLocationListener(capture(currentLocationListener)); CurrentLocationListener>();
dataSource.registerLocationListener(capture(currentLocationListener));
trackDataListener1.onLocationStateChanged(capture(new Capture<LocationState>())); trackDataListener1.onLocationStateChanged(capture(new Capture<LocationState>()));
trackDataListener1.onLocationChanged(capture(new Capture<Location>())); trackDataListener1.onLocationChanged(capture(new Capture<Location>()));
replay(); replay();
@@ -886,7 +880,7 @@ public class TrackDataHubTest extends AndroidTestCase {
trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.LOCATION)); trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.LOCATION));
verifyAndReset(); verifyAndReset();
} }
/** /**
* Tests the method {@link TrackDataHub#start()}. This method would also cover * Tests the method {@link TrackDataHub#start()}. This method would also cover
* some logic of {@link TrackDataHub#notifyHeadingChanged(float)}. * some logic of {@link TrackDataHub#notifyHeadingChanged(float)}.