upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix comment for b287683b8500

Browse Source
This commit is contained in:
Jimmy Shih
2012-01-09 14:28:11 -08:00
parent 43cf0659fd
commit 362dcda90c
2 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
+12 -16
View File
@@ -27,11 +27,11 @@ import java.text.SimpleDateFormat;
/**
* Creates a default track name based on the track name setting.
*
*
* @author Matthew Simmons
*/
public class DefaultTrackNameFactory {
@VisibleForTesting
static final String ISO_8601_FORMAT = "yyyy-MM-dd HH:mm";
private final Context context;
@@ -42,12 +42,17 @@ public class DefaultTrackNameFactory {
/**
* Gets the default track name.
*
*
* @param trackId the track id
* @param startTime the track start time
*/
public String getDefaultTrackName(long trackId, long startTime) {
String trackNameSetting = getTrackNameSetting();
SharedPreferences sharedPreferences = context.getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
String trackNameSetting = sharedPreferences.getString(
context.getString(R.string.settings_recording_track_name_key),
context.getString(R.string.settings_recording_track_name_date_local_value));
if (trackNameSetting.equals(
context.getString(R.string.settings_recording_track_name_date_local_value))) {
return StringUtils.formatDateTime(context, startTime);
@@ -56,19 +61,10 @@ public class DefaultTrackNameFactory {
SimpleDateFormat dateFormat = new SimpleDateFormat(ISO_8601_FORMAT);
return dateFormat.format(startTime);
} else {
// trackNameSetting equals
// R.string.settings_recording_track_name_number_value
return String.format(context.getString(R.string.track_name_format), trackId);
}
}
/**
* Gets the track name setting from the shared preferences.
*/
@VisibleForTesting
String getTrackNameSetting() {
SharedPreferences sharedPreferences = context.getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
return sharedPreferences.getString(
context.getString(R.string.settings_recording_track_name_key),
context.getString(R.string.settings_recording_track_name_date_local_value));
}
}
MyTracksTest/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactoryTest.java
+24 -19
View File
@@ -15,9 +15,12 @@
*/
package com.google.android.apps.mytracks.services;
import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.maps.mytracks.R;
import android.content.Context;
import android.content.SharedPreferences;
import android.test.AndroidTestCase;
import java.text.SimpleDateFormat;
@@ -30,27 +33,24 @@ import java.util.Date;
*/
public class DefaultTrackNameFactoryTest extends AndroidTestCase {
private static final int TRACK_ID = 1;
private static final long TRACK_ID = 1L;
private static final long START_TIME = 1288213406000L;
public void testDefaultTrackName_date_local() {
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext()) {
@Override
String getTrackNameSetting() {
return getContext().getString(R.string.settings_recording_track_name_date_local_value);
}
};
String value = getContext().getString(R.string.settings_recording_track_name_date_local_value);
setTrackNameSeting(value);
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext());
assertEquals(StringUtils.formatDateTime(getContext(), START_TIME),
defaultTrackNameFactory.getDefaultTrackName(TRACK_ID, START_TIME));
}
public void testDefaultTrackName_date_iso_8601() {
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext()) {
@Override
String getTrackNameSetting() {
return getContext().getString(R.string.settings_recording_track_name_date_iso_8601_value);
}
};
String value = getContext().getString(
R.string.settings_recording_track_name_date_iso_8601_value);
setTrackNameSeting(value);
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(
DefaultTrackNameFactory.ISO_8601_FORMAT);
assertEquals(simpleDateFormat.format(new Date(START_TIME)),
@@ -58,13 +58,18 @@ public class DefaultTrackNameFactoryTest extends AndroidTestCase {
}
public void testDefaultTrackName_number() {
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext()) {
@Override
String getTrackNameSetting() {
return getContext().getString(R.string.settings_recording_track_name_number_value);
}
};
String value = getContext().getString(R.string.settings_recording_track_name_number_value);
setTrackNameSeting(value);
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext());
assertEquals(
"Track " + TRACK_ID, defaultTrackNameFactory.getDefaultTrackName(TRACK_ID, START_TIME));
}
private void setTrackNameSeting(String value) {
SharedPreferences sharedPreferences = getContext().getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
String key = getContext().getString(R.string.settings_recording_track_name_key);
sharedPreferences.edit().putString(key, value).apply();
}
}