Fixed test and implementation of DescriptionGenerator.

This commit is contained in:
Dennis Guse
2019-08-13 23:04:09 +02:00
parent e89258c173
commit 45b1fafdd5
2 changed files with 7 additions and 6 deletions
@@ -67,8 +67,8 @@ public class DescriptionGeneratorImplTest {
stats.setStartTime(START_TIME);
track.setTripStatistics(stats);
track.setCategory("hiking");
String expected = "Created by"
+ " <a href='TODO'>TODO</a> on Android<p>"
String expected = //"Created by"
"<a href='https://github.com/dennisguse/opentracks'>OpenTracks</a><p>"
+ "Name: -<br>"
+ "Activity type: hiking<br>"
+ "Description: -<br>"
@@ -87,6 +87,7 @@ public class DescriptionGeneratorImplTest {
+ "Max grade: 42 %<br>"
+ "Min grade: 11 %<br>"
+ "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";
Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, null, null, true));
}
@@ -20,12 +20,12 @@ import android.content.Context;
import androidx.annotation.VisibleForTesting;
import java.util.Vector;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.stats.TripStatistics;
import de.dennisguse.opentracks.util.StringUtils;
import de.dennisguse.opentracks.util.UnitConversions;
import de.dennisguse.opentracks.R;
import java.util.Vector;
/**
* @author Jimmy Shih
@@ -51,7 +51,7 @@ public class DescriptionGeneratorImpl implements DescriptionGenerator {
// Created by
String creator = html
? "<a href='http://" + context.getString(R.string.app_web_url) + "'>" + context.getString(R.string.app_name) + "</a>"
? "<a href='" + context.getString(R.string.app_web_url) + "'>" + context.getString(R.string.app_name) + "</a>"
: context.getString(R.string.app_name);
builder.append(creator);