Cleanup: mainly code formatting and made LocationIterator implement autoclosable.

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

@@ -32,16 +32,13 @@ public class FileUtilsTest extends TestCase {
      * Tests {@link FileUtils#getPath(String...)}.
      */
     public void testBuildExternalDirectoryPath() {
-        String expectedName = Environment.getExternalStorageDirectory() + File.separator
-                + FileUtils.SDCARD_TOP_DIR + File.separator + "a" + File.separator + "b" + File.separator
-                + "c";
+        String expectedName = Environment.getExternalStorageDirectory() + File.separator + FileUtils.SDCARD_TOP_DIR + File.separator + "a" + File.separator + "b" + File.separator + "c";
         String dirName = FileUtils.getPath("a", "b", "c");
         assertEquals(expectedName, dirName);
     }
 
     /**
-     * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the
-     * file is new.
+     * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the file is new.
      */
     public void testBuildUniqueFileName_new() {
         String filename = FileUtils.buildUniqueFileName(new File("/dir"), "Filename", "ext");
@@ -49,8 +46,7 @@ public class FileUtilsTest extends TestCase {
     }
 
     /**
-     * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the
-     * file exists already.
+     * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the file exists already.
      */
     public void testBuildUniqueFileName_exist() {
         // Expect "/default.prop" to exist on the phone/emulator
@@ -69,8 +65,8 @@ public class FileUtilsTest extends TestCase {
     }
 
     /**
-     * Tests {@link FileUtils#sanitizeFileName(String)} with i18n characters (in
-     * Chinese and Russian). Verifies that they are allowed.
+     * Tests {@link FileUtils#sanitizeFileName(String)} with i18n characters (in Chinese and Russian).
+     * Verifies that they are allowed.
      */
     public void testSanitizeFileName_i18n() {
         String name = "您好-привет";
@@ -79,8 +75,8 @@ public class FileUtilsTest extends TestCase {
     }
 
     /**
-     * Tests {@link FileUtils#sanitizeFileName(String)} with special FAT32
-     * characters. Verifies that they are allowed.
+     * Tests {@link FileUtils#sanitizeFileName(String)} with special FAT32 characters.
+     * Verifies that they are allowed.
      */
     public void testSanitizeFileName_special_characters() {
         String name = "$%'-_@~`!(){}^#&+,;=[] ";
@@ -89,8 +85,8 @@ public class FileUtilsTest extends TestCase {
     }
 
     /**
-     * Tests {@link FileUtils#sanitizeFileName(String)} with multiple escaped
-     * characters in a row. Verifies that they are collapsed into one underscore.
+     * Tests {@link FileUtils#sanitizeFileName(String)} with multiple escaped characters in a row.
+     * Verifies that they are collapsed into one underscore.
      */
     public void testSanitizeFileName_collapse() {
         String name = "hello//there";
@@ -99,8 +95,8 @@ public class FileUtilsTest extends TestCase {
     }
 
     /**
-     * Tests {@link FileUtils#truncateFileName(File, String, String)}. Verifies
-     * the a long file name is truncated.
+     * Tests {@link FileUtils#truncateFileName(File, String, String)}.
+     * Verifies the a long file name is truncated.
      */
     public void testTruncateFileName() {
         File directory = new File("/dir1/dir2/");
@@ -115,7 +111,6 @@ public class FileUtilsTest extends TestCase {
         for (int i = 0; i < truncated.length(); i++) {
             assertEquals('a', truncated.charAt(i));
         }
-        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/StringUtilsTest.java

@@ -161,8 +161,7 @@ public class StringUtilsTest {
     }
 
     /**
-     * Asserts the {@link StringUtils#getTime(String)} returns the expected
-     * values.
+     * Asserts the {@link StringUtils#getTime(String)} returns the expected values.
      *
      * @param xmlDateTime the xml date time string
      * @param year        the expected year
@@ -173,8 +172,7 @@ public class StringUtilsTest {
      * @param second      the expected second
      * @param millisecond the expected milliseconds
      */
-    private void assertGetTime(String xmlDateTime, int year, int month, int day, int hour, int minute,
-                               int second, int millisecond) {
+    private void assertGetTime(String xmlDateTime, int year, int month, int day, int hour, int minute, int second, int millisecond) {
         GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
         calendar.set(year, month - 1, day, hour, minute, second);
         calendar.set(GregorianCalendar.MILLISECOND, millisecond);

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

@@ -45,8 +45,7 @@ public class TrackNameUtilsTest {
     private static final Context CONTEXT = ApplicationProvider.getApplicationContext();
 
     /**
-     * Tests when the track_name_key is
-     * settings_recording_track_name_date_local_value.
+     * Tests when the track_name_key is settings_recording_track_name_date_local_value.
      */
     @Test
     public void testTrackName_date_local() {
@@ -55,8 +54,7 @@ public class TrackNameUtilsTest {
     }
 
     /**
-     * Tests when the track_name_key is
-     * settings_recording_track_name_date_iso_8601_value.
+     * Tests when the track_name_key is settings_recording_track_name_date_iso_8601_value.
      */
     @Test
     public void testTrackName_date_iso_8601() {
@@ -66,8 +64,7 @@ public class TrackNameUtilsTest {
     }
 
     /**
-     * Tests when the track_name_key is
-     * settings_recording_track_name_number_value.
+     * Tests when the track_name_key is settings_recording_track_name_number_value.
      */
     @Test
     public void testTrackName_number() {