Code cleanup.

src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -19,6 +18,8 @@ import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
 
+import static org.junit.Assert.assertEquals;
+
 @RunWith(AndroidJUnit4.class)
 public class AnnouncementUtilsTest {
 
@@ -37,7 +38,7 @@ public class AnnouncementUtilsTest {
         String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane", null);
 
         // then
-        Assert.assertEquals("OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour", announcement);
+        assertEquals("OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour", announcement);
     }
 
     @Test
@@ -65,7 +66,7 @@ public class AnnouncementUtilsTest {
         String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane", lastInterval);
 
         // then
-        Assert.assertEquals(msg, announcement);
+        assertEquals(msg, announcement);
     }
 
     private int getQuantityCount(double d) {

src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java

@@ -2,11 +2,13 @@ package de.dennisguse.opentracks.util;
 
 import android.bluetooth.BluetoothGattCharacteristic;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 public class BluetoothUtilsTest {
 
     @Test
@@ -19,7 +21,7 @@ public class BluetoothUtilsTest {
         int heartRate = BluetoothUtils.parseHeartRate(characteristic);
 
         // then
-        Assert.assertEquals(60, heartRate);
+        assertEquals(60, heartRate);
     }
 
     @Test
@@ -32,7 +34,7 @@ public class BluetoothUtilsTest {
         int heartRate = BluetoothUtils.parseHeartRate(characteristic);
 
         // then
-        Assert.assertEquals(257, heartRate);
+        assertEquals(257, heartRate);
     }
 
     @Test
@@ -44,8 +46,8 @@ public class BluetoothUtilsTest {
         SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
 
         // then
-        Assert.assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
-        Assert.assertNull(sensor.getSpeed());
+        assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
+        assertNull(sensor.getSpeed());
     }
 
     @Test
@@ -57,8 +59,8 @@ public class BluetoothUtilsTest {
         SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
 
         // then
-        Assert.assertNull(sensor.getCadence());
-        Assert.assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
+        assertNull(sensor.getCadence());
+        assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
     }
 
     @Test
@@ -70,7 +72,7 @@ public class BluetoothUtilsTest {
         SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
 
         // then
-        Assert.assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
-        Assert.assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
+        assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
+        assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount());
     }
 }

src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java

@@ -15,7 +15,6 @@
  */
 package de.dennisguse.opentracks.util;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -23,6 +22,8 @@ import org.junit.runners.JUnit4;
 import java.io.File;
 import java.util.Arrays;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Tests for {@link FileUtils}.
  *
@@ -37,7 +38,7 @@ public class FileUtilsTest {
     @Test
     public void testBuildUniqueFileName_new() {
         String filename = FileUtils.buildUniqueFileName(new File("/dir"), "Filename", "ext");
-        Assert.assertEquals("Filename.ext", filename);
+        assertEquals("Filename.ext", filename);
     }
 
     /**
@@ -47,7 +48,7 @@ public class FileUtilsTest {
     public void testBuildUniqueFileName_exist() {
         // Expect "/default.prop" to exist on the phone/emulator
         String filename = FileUtils.buildUniqueFileName(new File("/"), "default", "prop");
-        Assert.assertEquals("default(1).prop", filename);
+        assertEquals("default(1).prop", filename);
     }
 
     /**
@@ -58,13 +59,13 @@ public class FileUtilsTest {
     public void testSanitizeFileName() {
         String name = "Swim\10ming-^across:/the/ pacific (ocean).";
         String expected = "Swim_ming-^across_the_ pacific (ocean).";
-        Assert.assertEquals(expected, FileUtils.sanitizeFileName(name));
+        assertEquals(expected, FileUtils.sanitizeFileName(name));
     }
 
     @Test
     public void testSanitizeFileNameWithSuffix() {
         String name = "FileName.jpeg";
-        Assert.assertEquals(name, FileUtils.sanitizeFileName(name));
+        assertEquals(name, FileUtils.sanitizeFileName(name));
     }
 
     /**
@@ -75,7 +76,7 @@ public class FileUtilsTest {
     public void testSanitizeFileName_i18n() {
         String name = "您好-привет";
         String expected = "您好-привет";
-        Assert.assertEquals(expected, FileUtils.sanitizeFileName(name));
+        assertEquals(expected, FileUtils.sanitizeFileName(name));
     }
 
     /**
@@ -86,7 +87,7 @@ public class FileUtilsTest {
     public void testSanitizeFileName_special_characters() {
         String name = "$%'-_@~`!(){}^#&+,;=[] ";
         String expected = "$%'-_@~`!(){}^#&+,;=[] ";
-        Assert.assertEquals(expected, FileUtils.sanitizeFileName(name));
+        assertEquals(expected, FileUtils.sanitizeFileName(name));
     }
 
     /**
@@ -97,7 +98,7 @@ public class FileUtilsTest {
     public void testSanitizeFileName_collapse() {
         String name = "hello//there";
         String expected = "hello_there";
-        Assert.assertEquals(expected, FileUtils.sanitizeFileName(name));
+        assertEquals(expected, FileUtils.sanitizeFileName(name));
     }
 
     /**
@@ -114,8 +115,8 @@ public class FileUtilsTest {
         String truncated = FileUtils.truncateFileName(directory, nameString, suffix);
 
         for (int i = 0; i < truncated.length(); i++) {
-            Assert.assertEquals('a', truncated.charAt(i));
+            assertEquals('a', truncated.charAt(i));
         }
-        Assert.assertEquals(FileUtils.MAX_FAT32_PATH_LENGTH, new File(directory, truncated + suffix).getPath().length());
+        assertEquals(FileUtils.MAX_FAT32_PATH_LENGTH, new File(directory, truncated + suffix).getPath().length());
     }
 }

src/androidTest/java/de/dennisguse/opentracks/util/PreferencesUtilsTest.java

@@ -6,13 +6,14 @@ import android.content.SharedPreferences;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 
+import static org.junit.Assert.assertEquals;
+
 @RunWith(AndroidJUnit4.class)
 public class PreferencesUtilsTest {
 
@@ -29,7 +30,7 @@ public class PreferencesUtilsTest {
         TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(context);
 
         // then
-        Assert.assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL, trackFileFormat);
+        assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL, trackFileFormat);
     }
 
     @Test
@@ -43,7 +44,7 @@ public class PreferencesUtilsTest {
         TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(context);
 
         // then
-        Assert.assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat);
+        assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat);
     }
 
     @Test
@@ -57,6 +58,6 @@ public class PreferencesUtilsTest {
         TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(context);
 
         // then
-        Assert.assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat);
+        assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat);
     }
 }

src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java

@@ -21,13 +21,15 @@ import android.content.Context;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests for {@link StringUtils}.
  *
@@ -44,7 +46,7 @@ public class StringUtilsTest {
      */
     @Test
     public void testFormatDateTimeIso8601() {
-        Assert.assertEquals("1970-01-01T00:00:12.345Z", StringUtils.formatDateTimeIso8601(12345));
+        assertEquals("1970-01-01T00:00:12.345Z", StringUtils.formatDateTimeIso8601(12345));
     }
 
     /**
@@ -53,19 +55,19 @@ public class StringUtilsTest {
     @Test
     public void testformatElapsedTime() {
         // 1 second
-        Assert.assertEquals("00:01", StringUtils.formatElapsedTime(1000));
+        assertEquals("00:01", StringUtils.formatElapsedTime(1000));
         // 10 seconds
-        Assert.assertEquals("00:10", StringUtils.formatElapsedTime(10000));
+        assertEquals("00:10", StringUtils.formatElapsedTime(10000));
         // 1 minute
-        Assert.assertEquals("01:00", StringUtils.formatElapsedTime(60000));
+        assertEquals("01:00", StringUtils.formatElapsedTime(60000));
         // 10 minutes
-        Assert.assertEquals("10:00", StringUtils.formatElapsedTime(600000));
+        assertEquals("10:00", StringUtils.formatElapsedTime(600000));
         // 1 hour
-        Assert.assertEquals("1:00:00", StringUtils.formatElapsedTime(3600000));
+        assertEquals("1:00:00", StringUtils.formatElapsedTime(3600000));
         // 10 hours
-        Assert.assertEquals("10:00:00", StringUtils.formatElapsedTime(36000000));
+        assertEquals("10:00:00", StringUtils.formatElapsedTime(36000000));
         // 100 hours
-        Assert.assertEquals("100:00:00", StringUtils.formatElapsedTime(360000000));
+        assertEquals("100:00:00", StringUtils.formatElapsedTime(360000000));
     }
 
     /**
@@ -74,19 +76,19 @@ public class StringUtilsTest {
     @Test
     public void testformatElapsedTimeWithHour() {
         // 1 second
-        Assert.assertEquals("0:00:01", StringUtils.formatElapsedTimeWithHour(1000));
+        assertEquals("0:00:01", StringUtils.formatElapsedTimeWithHour(1000));
         // 10 seconds
-        Assert.assertEquals("0:00:10", StringUtils.formatElapsedTimeWithHour(10000));
+        assertEquals("0:00:10", StringUtils.formatElapsedTimeWithHour(10000));
         // 1 minute
-        Assert.assertEquals("0:01:00", StringUtils.formatElapsedTimeWithHour(60000));
+        assertEquals("0:01:00", StringUtils.formatElapsedTimeWithHour(60000));
         // 10 minutes
-        Assert.assertEquals("0:10:00", StringUtils.formatElapsedTimeWithHour(600000));
+        assertEquals("0:10:00", StringUtils.formatElapsedTimeWithHour(600000));
         // 1 hour
-        Assert.assertEquals("1:00:00", StringUtils.formatElapsedTimeWithHour(3600000));
+        assertEquals("1:00:00", StringUtils.formatElapsedTimeWithHour(3600000));
         // 10 hours
-        Assert.assertEquals("10:00:00", StringUtils.formatElapsedTimeWithHour(36000000));
+        assertEquals("10:00:00", StringUtils.formatElapsedTimeWithHour(36000000));
         // 100 hours
-        Assert.assertEquals("100:00:00", StringUtils.formatElapsedTimeWithHour(360000000));
+        assertEquals("100:00:00", StringUtils.formatElapsedTimeWithHour(360000000));
     }
 
     /**
@@ -96,13 +98,13 @@ public class StringUtilsTest {
     @Test
     public void testFormatDistance() {
         // A large number in metric
-        Assert.assertEquals("5.00 km", StringUtils.formatDistance(context, 5000, true));
+        assertEquals("5.00 km", StringUtils.formatDistance(context, 5000, true));
         // A large number in imperial
-        Assert.assertEquals("3.11 mi", StringUtils.formatDistance(context, 5000, false));
+        assertEquals("3.11 mi", StringUtils.formatDistance(context, 5000, false));
         // A small number in metric
-        Assert.assertEquals("100.00 m", StringUtils.formatDistance(context, 100, true));
+        assertEquals("100.00 m", StringUtils.formatDistance(context, 100, true));
         // A small number in imperial
-        Assert.assertEquals("328.08 ft", StringUtils.formatDistance(context, 100, false));
+        assertEquals("328.08 ft", StringUtils.formatDistance(context, 100, false));
     }
 
     /**
@@ -110,8 +112,8 @@ public class StringUtilsTest {
      */
     @Test
     public void testFormatCData() {
-        Assert.assertEquals("<![CDATA[hello]]>", StringUtils.formatCData("hello"));
-        Assert.assertEquals("<![CDATA[hello]]]]><![CDATA[>there]]>", StringUtils.formatCData("hello]]>there"));
+        assertEquals("<![CDATA[hello]]>", StringUtils.formatCData("hello"));
+        assertEquals("<![CDATA[hello]]]]><![CDATA[>there]]>", StringUtils.formatCData("hello]]>there"));
     }
 
     /**
@@ -168,7 +170,7 @@ public class StringUtilsTest {
 
         // This comparision tends to be flaky (difference of 1ms)
         // Assert.assertEquals(calendar.getTimeInMillis(), StringUtils.parseTime(xmlDateTime));
-        Assert.assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime)) <= 1);
+        assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime)) <= 1);
     }
 
     /**
@@ -177,9 +179,9 @@ public class StringUtilsTest {
     @Test
     public void testGetTimeParts_positive() {
         int[] parts = StringUtils.getTimeParts(61000);
-        Assert.assertEquals(1, parts[0]);
-        Assert.assertEquals(1, parts[1]);
-        Assert.assertEquals(0, parts[2]);
+        assertEquals(1, parts[0]);
+        assertEquals(1, parts[1]);
+        assertEquals(0, parts[2]);
     }
 
     /**
@@ -188,40 +190,40 @@ public class StringUtilsTest {
     @Test
     public void testGetTimeParts_negative() {
         int[] parts = StringUtils.getTimeParts(-61000);
-        Assert.assertEquals(-1, parts[0]);
-        Assert.assertEquals(-1, parts[1]);
-        Assert.assertEquals(0, parts[2]);
+        assertEquals(-1, parts[0]);
+        assertEquals(-1, parts[1]);
+        assertEquals(0, parts[2]);
     }
 
     @Test
     public void testFormatDecimal() {
-        Assert.assertEquals("0", StringUtils.formatDecimal(0.0, 0));
-        Assert.assertEquals("0", StringUtils.formatDecimal(0.1, 0));
-        Assert.assertEquals("1", StringUtils.formatDecimal(1.1, 0));
-        Assert.assertEquals("10", StringUtils.formatDecimal(10, 0));
-        Assert.assertEquals("10", StringUtils.formatDecimal(10.1, 0));
-        Assert.assertEquals("0", StringUtils.formatDecimal(-0.1, 0));
+        assertEquals("0", StringUtils.formatDecimal(0.0, 0));
+        assertEquals("0", StringUtils.formatDecimal(0.1, 0));
+        assertEquals("1", StringUtils.formatDecimal(1.1, 0));
+        assertEquals("10", StringUtils.formatDecimal(10, 0));
+        assertEquals("10", StringUtils.formatDecimal(10.1, 0));
+        assertEquals("0", StringUtils.formatDecimal(-0.1, 0));
 
-        Assert.assertEquals("0", StringUtils.formatDecimal(0.0, 2));
-        Assert.assertEquals("0.1", StringUtils.formatDecimal(0.1, 2));
-        Assert.assertEquals("1.1", StringUtils.formatDecimal(1.1, 2));
-        Assert.assertEquals("10", StringUtils.formatDecimal(10, 2));
-        Assert.assertEquals("10.1", StringUtils.formatDecimal(10.1, 2));
-        Assert.assertEquals("10.11", StringUtils.formatDecimal(10.111, 2));
-        Assert.assertEquals("-0.1", StringUtils.formatDecimal(-0.1, 2));
+        assertEquals("0", StringUtils.formatDecimal(0.0, 2));
+        assertEquals("0.1", StringUtils.formatDecimal(0.1, 2));
+        assertEquals("1.1", StringUtils.formatDecimal(1.1, 2));
+        assertEquals("10", StringUtils.formatDecimal(10, 2));
+        assertEquals("10.1", StringUtils.formatDecimal(10.1, 2));
+        assertEquals("10.11", StringUtils.formatDecimal(10.111, 2));
+        assertEquals("-0.1", StringUtils.formatDecimal(-0.1, 2));
 
-        Assert.assertEquals("1", StringUtils.formatDecimal(0.99, 1));
+        assertEquals("1", StringUtils.formatDecimal(0.99, 1));
     }
 
     @Test
     public void testGetSpeedParts() {
-        Assert.assertEquals("4:59", StringUtils.getSpeedParts(context, 3.34, true, false).first);
-        Assert.assertEquals("5:00", StringUtils.getSpeedParts(context, 3.33, true, false).first);
+        assertEquals("4:59", StringUtils.getSpeedParts(context, 3.34, true, false).first);
+        assertEquals("5:00", StringUtils.getSpeedParts(context, 3.33, true, false).first);
 
-        Assert.assertEquals("11.99", StringUtils.getSpeedParts(context, 3.33, true, true).first);
-        Assert.assertEquals("7.45", StringUtils.getSpeedParts(context, 3.33, false, true).first);
+        assertEquals("11.99", StringUtils.getSpeedParts(context, 3.33, true, true).first);
+        assertEquals("7.45", StringUtils.getSpeedParts(context, 3.33, false, true).first);
 
-        Assert.assertEquals("min/km", StringUtils.getSpeedParts(context, 0, true, false).second);
-        Assert.assertEquals("min/mi", StringUtils.getSpeedParts(context, 0, false, false).second);
+        assertEquals("min/km", StringUtils.getSpeedParts(context, 0, true, false).second);
+        assertEquals("min/mi", StringUtils.getSpeedParts(context, 0, false, false).second);
     }
 }

src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java

@@ -21,7 +21,6 @@ import android.content.Context;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -32,6 +31,8 @@ import java.util.Locale;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Track;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Tests {@link TrackNameUtils}.
  *
@@ -51,7 +52,7 @@ public class TrackNameUtilsTest {
     @Test
     public void testTrackName_date_local() {
         PreferencesUtils.setString(CONTEXT, R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_local_value));
-        Assert.assertEquals(StringUtils.formatDateTime(CONTEXT, START_TIME), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals(StringUtils.formatDateTime(CONTEXT, START_TIME), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
     }
 
     /**
@@ -61,7 +62,7 @@ public class TrackNameUtilsTest {
     public void testTrackName_date_iso_8601() {
         PreferencesUtils.setString(CONTEXT, R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_iso_8601_value));
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(TrackNameUtils.ISO_8601_FORMAT, Locale.US);
-        Assert.assertEquals(simpleDateFormat.format(new Date(START_TIME)), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals(simpleDateFormat.format(new Date(START_TIME)), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
     }
 
     /**
@@ -70,6 +71,6 @@ public class TrackNameUtilsTest {
     @Test
     public void testTrackName_number() {
         PreferencesUtils.setString(CONTEXT, R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_number_value));
-        Assert.assertEquals("Track " + TRACK_ID.getId(), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
+        assertEquals("Track " + TRACK_ID.getId(), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME));
     }
 }

src/androidTest/java/de/dennisguse/opentracks/util/TrackPointUtilsTest.java

@@ -1,10 +1,11 @@
 package de.dennisguse.opentracks.util;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import de.dennisguse.opentracks.content.data.TrackPoint;
 
+import static org.junit.Assert.assertEquals;
+
 public class TrackPointUtilsTest {
 
     @Test
@@ -18,7 +19,7 @@ public class TrackPointUtilsTest {
         TrackPointUtils.fixTime(trackPoint);
 
         // then
-        Assert.assertEquals(time, trackPoint.getTime());
+        assertEquals(time, trackPoint.getTime());
     }
 
     @Test
@@ -32,7 +33,7 @@ public class TrackPointUtilsTest {
         TrackPointUtils.fixTime(trackPoint);
 
         // then
-        Assert.assertEquals(time, trackPoint.getTime(), 1000);
+        assertEquals(time, trackPoint.getTime(), 1000);
     }
 
     @Test
@@ -46,7 +47,7 @@ public class TrackPointUtilsTest {
         TrackPointUtils.fixTime(trackPoint);
 
         // then
-        Assert.assertEquals(time, trackPoint.getTime());
+        assertEquals(time, trackPoint.getTime());
     }
 
 }

src/androidTest/java/de/dennisguse/opentracks/util/UUIDUtilsTest.java

@@ -2,12 +2,13 @@ package de.dennisguse.opentracks.util;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.UUID;
 
+import static org.junit.Assert.assertEquals;
+
 @RunWith(AndroidJUnit4.class)
 public class UUIDUtilsTest {
 
@@ -18,6 +19,6 @@ public class UUIDUtilsTest {
         byte[] bytes = UUIDUtils.toBytes(uuid);
         UUID output = UUIDUtils.fromBytes(bytes);
 
-        Assert.assertEquals(uuid, output);
+        assertEquals(uuid, output);
     }
 }