From 45b1fafdd51fa3ea634069888e076c613bd7073a Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Tue, 13 Aug 2019 23:04:09 +0200 Subject: [PATCH] Fixed test and implementation of DescriptionGenerator. --- .../opentracks/content/DescriptionGeneratorImplTest.java | 5 +++-- .../opentracks/content/DescriptionGeneratorImpl.java | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java index 1f4172168..2c06db464 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java @@ -67,8 +67,8 @@ public class DescriptionGeneratorImplTest { stats.setStartTime(START_TIME); track.setTripStatistics(stats); track.setCategory("hiking"); - String expected = "Created by" - + " TODO on Android

" + String expected = //"Created by" + "OpenTracks

" + "Name: -
" + "Activity type: hiking
" + "Description: -
" @@ -87,6 +87,7 @@ public class DescriptionGeneratorImplTest { + "Max grade: 42 %
" + "Min grade: 11 %
" + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "
"; + Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, null, null, true)); } diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java index d4cd05b8f..5625bb043 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java +++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java @@ -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 - ? "" + context.getString(R.string.app_name) + "" + ? "" + context.getString(R.string.app_name) + "" : context.getString(R.string.app_name); builder.append(creator);