Cleanup.

src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java

@@ -1,96 +0,0 @@
-package de.dennisguse.opentracks.chart;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.time.Duration;
-
-import de.dennisguse.opentracks.data.models.Altitude;
-import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.data.models.Statistics;
-import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.settings.UnitSystem;
-
-//TODO assertEquals with ChartPoint (instead of individual comparisons)
-@RunWith(AndroidJUnit4.class)
-public class ChartPointTest {
-
-    private static final Statistics STATISTIC_NULL = new Statistics(null, null, Duration.ZERO, null, null, null, null, null, null, null);
-
-    @Test
-    public void create_by_time() {
-        // given
-        Statistics statistics = new Statistics(null, null, Duration.ofSeconds(1000), null, null, null, null, null, null, null);
-
-        // when
-        ChartPoint point = ChartPoint.create(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.ZERO, false, UnitSystem.IMPERIAL_FEET);
-
-        // then
-        assertEquals(1000000, (long) point.timeOrDistance());
-    }
-
-    @Test
-    public void create_by_distance() {
-        // given
-        Statistics statistics = new Statistics(null, null, null, null, Distance.of(1000), null, null, null, null, null);
-
-        // when
-        ChartPoint point = ChartPoint.create(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.ZERO, true, UnitSystem.METRIC);
-
-        // then
-        assertEquals(1, (long) point.timeOrDistance());
-    }
-
-    @Test
-    public void create_get_altitude_speed_and_pace() {
-        // given
-        TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint()
-                .setAltitude(Altitude.EGM2008.of(50));
-
-        // when
-        ChartPoint point = ChartPoint.create(STATISTIC_NULL, trackPoint, Speed.of(10), false, UnitSystem.METRIC);
-
-        // then
-        assertEquals(50, point.altitude(), 0.01);
-        assertEquals(36, point.speed(), 0.01);
-        assertEquals(1.66, point.pace(), 0.01);
-    }
-
-    @Test
-    public void create_sensorNotAvailable() {
-        // given
-        TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint()
-                .setAltitude(Altitude.EGM2008.of(50));
-        // when
-        ChartPoint point = ChartPoint.create(STATISTIC_NULL, trackPoint, Speed.of(10), false, UnitSystem.METRIC);
-
-        // then
-        assertNull(point.heartRate());
-        assertNull(point.cadence());
-        assertNull(point.power());
-    }
-
-    @Test
-    public void create_sensorAvailable() {
-        // given
-        TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint()
-                .setAltitude(Altitude.EGM2008.of(50))
-                .setHeartRate(100f)
-                .setCadence(101f)
-                .setPower(102f);
-
-        // when
-        ChartPoint point = ChartPoint.create(STATISTIC_NULL, trackPoint, Speed.of(10), false, UnitSystem.METRIC);
-
-        // then
-        assertEquals(100.0, point.heartRate(), 0.01);
-        assertEquals(101.0, point.cadence(), 0.01);
-        assertEquals(102.0, point.power(), 0.01);
-    }
-}

src/androidTest/java/de/dennisguse/opentracks/chart/TrackStubUtils.java

@@ -1,70 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks.chart;
-
-import java.time.Instant;
-
-import de.dennisguse.opentracks.data.models.Altitude;
-import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.Position;
-import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.data.models.TrackPoint;
-
-/**
- * Commons utilities for creating stubs of track, location.
- *
- * @author Youtao Liu
- */
-//TODO Move to ChartPointTest
-class TrackStubUtils {
-
-    public static final double INITIAL_ALTITUDE = 22;
-    public static final long INITIAL_TIME = 1000L;
-    private static final double INITIAL_LATITUDE = 22;
-    private static final double INITIAL_LONGITUDE = 22;
-    private static final Distance INITIAL_ACCURACY = Distance.of(5);
-    private static final Speed INITIAL_SPEED = Speed.of(10);
-    private static final float INITIAL_BEARING = 3.0f;
-
-    /**
-     * Create a MyTracks location with default values.
-     *
-     * @return a track stub.
-     */
-    public static TrackPoint createDefaultTrackPoint() {
-        return createDefaultTrackPoint(INITIAL_LATITUDE, INITIAL_LONGITUDE, INITIAL_ALTITUDE);
-    }
-
-    /**
-     * Creates a {@link TrackPoint} stub with specified values.
-     *
-     * @return a SensorDataSetLocation stub.
-     */
-    private static TrackPoint createDefaultTrackPoint(double latitude, double longitude, double altitude) {
-        return new TrackPoint(TrackPoint.Type.TRACKPOINT,
-                new Position(
-                        Instant.ofEpochMilli(INITIAL_TIME),
-                        latitude,
-                        longitude,
-                        INITIAL_ACCURACY,
-                        Altitude.WGS84.of(altitude),
-                        INITIAL_ACCURACY,
-                        INITIAL_BEARING,
-                        INITIAL_SPEED
-                ));
-    }
-}

src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java

@@ -236,20 +236,14 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
             viewBinding.trackListItemCategoryDescription.setText(categoryDescription);
             viewBinding.trackListItemCategoryDescription.setVisibility(categoryDescription.isEmpty() ? View.GONE : View.VISIBLE);
 
-            setSelected(selection.get((int) getId()));
+            setSelected(selection.get((int) trackId.id()));
         }
 
         public void setSelected(boolean isSelected) {
-            selection.put((int) getId(), isSelected);
+            selection.put((int) trackId.id(), isSelected);
             viewBinding.getRoot().setActivated(isSelected);
         }
 
-        //TODO Check if this still required.
-        public long getId() {
-            return trackId.id();
-        }
-
-
         @Override
         public void onClick(View v) {
             if (selectionMode) {