From 86b782e2f0c5a054525f69019d52aac6d178c6e3 Mon Sep 17 00:00:00 2001 From: youtaol Date: Fri, 3 Aug 2012 17:05:55 +0800 Subject: [PATCH] Change code style of TrackDataHubTest. --- .../apps/mytracks/content/TrackDataHub.java | 14 ++-- .../mytracks/content/TrackDataHubTest.java | 73 ++++++++----------- 2 files changed, 38 insertions(+), 49 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java index cb3a55dac..c80257e2f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java @@ -781,7 +781,7 @@ public class TrackDataHub implements DataSourceListener { * @return the selectedTrackId */ @VisibleForTesting - protected long getSelectedTrackId() { + long getSelectedTrackId() { return selectedTrackId; } @@ -791,7 +791,7 @@ public class TrackDataHub implements DataSourceListener { * @return the minRequiredAccuracy */ @VisibleForTesting - protected int getMinRequiredAccuracy() { + int getMinRequiredAccuracy() { return minRequiredAccuracy; } @@ -801,7 +801,7 @@ public class TrackDataHub implements DataSourceListener { * @return the metricUnits */ @VisibleForTesting - protected boolean getMetricUnits() { + boolean isMetricUnits() { return metricUnits; } @@ -811,7 +811,7 @@ public class TrackDataHub implements DataSourceListener { * @return the reportSpeed */ @VisibleForTesting - protected boolean getReportSpeed() { + boolean isReportSpeed() { return reportSpeed; } @@ -821,17 +821,17 @@ public class TrackDataHub implements DataSourceListener { * @param startStatus status of started */ @VisibleForTesting - protected void setStartStatus(boolean startStatus) { + void setStarted(boolean startStatus) { started = startStatus; } /** * Sets the value of lastSeenLocation. * - * @param value of lastSeenLocation + * @param lastSeenLocation value of lastSeenLocation */ @VisibleForTesting - protected void setLastSeenLocation(Location lastSeenLocation) { + void setLastSeenLocation(Location lastSeenLocation) { this.lastSeenLocation = lastSeenLocation; } } \ No newline at end of file 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 1bc6ab33b..54269d067 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java @@ -785,21 +785,17 @@ public class TrackDataHubTest extends AndroidTestCase { } } - private void expectStart() { - dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); - } - /** * Tests the method {@link TrackDataHub#start()}. This method would also cover * some logic of {@link TrackDataHub#loadDataForAll()} and * {@link TrackDataHub#notifySelectedTrackChanged(Set)}. */ - public void testStart_notifySelectedTrackChanged() { - expectStart(); + public void testRegisterSelectedTrackListener() { + dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); Track track = TrackStubUtils.createTrack(1); expect(myTracksProviderUtils.getTrack(capture(new Capture()))).andReturn(track); - // Make the recording track id is not euqal with selected track id. - PreferencesUtils.setLong(context, R.string.recording_track_id_key, 1L); + // Make the track id is unique. + PreferencesUtils.setLong(context, R.string.recording_track_id_key, System.currentTimeMillis()); trackDataListener1.onSelectedTrackChanged(track, false); replay(); trackDataHub.start(); @@ -809,23 +805,22 @@ public class TrackDataHubTest extends AndroidTestCase { /** * Tests the method {@link TrackDataHub#start()}. This method would also cover - * some logic of {@link TrackDataHub#loadDataForAll()} and + * some logic of PreferencesUtils and * {@link TrackDataHub#notifyTracksTableUpdate(Set)}. */ - public void testStart_notifyTracksTableUpdate() { - expectStart(); + public void testRegisterTracksTableListener() { + dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); Capture observerCapture = new Capture(); dataSource.registerContentObserver(eq(TracksColumns.CONTENT_URI), capture(observerCapture)); Track track = TrackStubUtils.createTrack(1); expect(myTracksProviderUtils.getTrack(capture(new Capture()))).andReturn(track); // Make the recording track id is not euqal with selected track id. - PreferencesUtils.setLong(context, R.string.recording_track_id_key, 1L); + PreferencesUtils.setLong(context, R.string.recording_track_id_key, System.currentTimeMillis()); trackDataListener1.onTrackUpdated(track); replay(); trackDataHub.start(); trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.TRACKS_TABLE)); verifyAndReset(); - trackDataHub.setStartStatus(false); } /** @@ -833,8 +828,8 @@ public class TrackDataHubTest extends AndroidTestCase { * some logic of {@link TrackDataHub#loadDataForAll()} and * {@link TrackDataHub#notifyWaypointsTableUpdate(Set)}. */ - public void testStart_notifyWaypointsTableUpdate() { - expectStart(); + public void testRegisterWaypointsTableListener() { + dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); Capture observerCapture = new Capture(); dataSource.registerContentObserver(eq(WaypointsColumns.CONTENT_URI), capture(observerCapture)); expect(myTracksProviderUtils.getWaypointsCursor(capture(new Capture()), capture(new Capture()), @@ -845,16 +840,16 @@ public class TrackDataHubTest extends AndroidTestCase { trackDataHub.start(); trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.WAYPOINTS_TABLE)); verifyAndReset(); - trackDataHub.setStartStatus(false); } /** * Tests the method {@link TrackDataHub#start()}. This method would also cover - * some logic of {@link TrackDataHub#loadDataForAll()} and - * {@link TrackDataHub#notifyLocationStateChanged(Set)}. + * some logic of {@link TrackDataHub#loadDataForAll()} and + * {@link TrackDataHub#notifyLocationStateChanged(Set)} when no last seen + * location. */ - public void testStart_notifyLocationStateChanged() { - expectStart(); + public void testRegisterLocationListener_noLastSeenLocation() { + dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); Capture currentLocationListener = new Capture(); dataSource.registerLocationListener(capture(currentLocationListener)); trackDataListener1.onLocationStateChanged(capture(new Capture())); @@ -863,16 +858,16 @@ public class TrackDataHubTest extends AndroidTestCase { trackDataHub.start(); trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.LOCATION)); verifyAndReset(); - trackDataHub.setStartStatus(false); } /** * Tests the method {@link TrackDataHub#start()}. This method would also cover - * some logic of {@link TrackDataHub#loadDataForAll()} and - * {@link TrackDataHub#notifyLocationChanged(Location, boolean, Set)}. + * some logic of {@link TrackDataHub#loadDataForAll()} and + * {@link TrackDataHub#notifyLocationChanged(Location, boolean, Set)} when has + * last seen location. */ - public void testStart_notifyLocationChanged() { - expectStart(); + public void testRegisterLocationListener_hasLastSeenLocation() { + dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); Capture currentLocationListener = new Capture(); dataSource.registerLocationListener(capture(currentLocationListener)); trackDataListener1.onLocationStateChanged(capture(new Capture())); @@ -882,7 +877,6 @@ public class TrackDataHubTest extends AndroidTestCase { trackDataHub.start(); trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.LOCATION)); verifyAndReset(); - trackDataHub.setStartStatus(false); } /** @@ -890,8 +884,8 @@ public class TrackDataHubTest extends AndroidTestCase { * some logic of {@link TrackDataHub#loadDataForAllListeners()} and * {@link TrackDataHub#notifyHeadingChanged(float)}. */ - public void testStart_HeadingChanged() { - expectStart(); + public void testRegisterHeadingListener() { + dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture)); Capture compassListener = new Capture(); dataSource.registerHeadingListener(capture(compassListener)); trackDataListener1.onHeadingChanged(capture(new Capture())); @@ -899,10 +893,7 @@ public class TrackDataHubTest extends AndroidTestCase { trackDataHub.start(); trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.HEADING)); verifyAndReset(); - trackDataHub.setStartStatus(false); } - - /** * Tests the method {@link TrackDataHub#notifyPreferenceChanged(String)} when @@ -924,17 +915,16 @@ public class TrackDataHubTest extends AndroidTestCase { * Tests the method {@link TrackDataHub#notifyPreferenceChanged(String)} when * the key is R.string.metric_units_key and started status is false. */ - public void testNotifyPreferenceChanged_metricUnits_noNotify() { + public void testNotifyPreferenceChanged_metricUnitsNoNotify() { boolean value = false; PreferencesUtils.setBoolean(context, R.string.metric_units_key, value); - trackDataHub.setStartStatus(false); trackDataHub.notifyPreferenceChanged(PreferencesUtils .getKey(context, R.string.metric_units_key)); - assertEquals(value, trackDataHub.getMetricUnits()); + assertEquals(value, trackDataHub.isMetricUnits()); PreferencesUtils.setBoolean(context, R.string.metric_units_key, !value); trackDataHub.notifyPreferenceChanged(PreferencesUtils .getKey(context, R.string.metric_units_key)); - assertEquals(!value, trackDataHub.getMetricUnits()); + assertEquals(!value, trackDataHub.isMetricUnits()); } @@ -942,26 +932,24 @@ public class TrackDataHubTest extends AndroidTestCase { * Tests the method {@link TrackDataHub#notifyPreferenceChanged(String)} when * the key is R.string.metric_units_key and started status is false. */ - public void testNotifyPreferenceChanged_reportSpeed_noNotify() { + public void testNotifyPreferenceChanged_reportSpeedNoNotify() { boolean value = false; PreferencesUtils.setBoolean(context, R.string.report_speed_key, value); - trackDataHub.setStartStatus(false); trackDataHub.notifyPreferenceChanged(PreferencesUtils .getKey(context, R.string.report_speed_key)); - assertEquals(value, trackDataHub.getReportSpeed()); + assertEquals(value, trackDataHub.isReportSpeed()); PreferencesUtils.setBoolean(context, R.string.report_speed_key, !value); trackDataHub.notifyPreferenceChanged(PreferencesUtils .getKey(context, R.string.report_speed_key)); - assertEquals(!value, trackDataHub.getReportSpeed()); + assertEquals(!value, trackDataHub.isReportSpeed()); } /** * Tests the method {@link TrackDataHub#notifyPreferenceChanged(String)} when * the key is R.string.selected_track_id_key and no listener is registered. */ - public void testNotifyPreferenceChanged_trackId_noListener() { + public void testNotifyPreferenceChanged_trackIdNoListener() { long value = 1; - trackDataHub.setStartStatus(true); PreferencesUtils.setLong(context, R.string.selected_track_id_key, value); trackDataHub.notifyPreferenceChanged(PreferencesUtils .getKey(context, R.string.selected_track_id_key)); @@ -970,6 +958,7 @@ public class TrackDataHubTest extends AndroidTestCase { trackDataHub.notifyPreferenceChanged(PreferencesUtils .getKey(context, R.string.selected_track_id_key)); assertEquals(value + 1, trackDataHub.getSelectedTrackId()); - trackDataHub.setStartStatus(false); + // Avoid the stop() call in tearDown(). + trackDataHub.setStarted(false); } }