Automated code cleanup using AndroidStudio.

src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java

@@ -42,7 +42,7 @@ public class DescriptionGeneratorTest {
     private static final long START_TIME = 1288721514000L;
     private DescriptionGenerator descriptionGenerator;
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     @Before
     public void setUp() {

src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java

@@ -56,7 +56,7 @@ public class SearchEngineTest {
     private ContentProviderUtils providerUtils;
     private SearchEngine engine;
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
 
     @Before
@@ -66,7 +66,7 @@ public class SearchEngineTest {
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
         providerUtils.deleteAllTracks(context);
     }
 

src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java

@@ -38,7 +38,7 @@ import de.dennisguse.opentracks.content.data.WaypointsColumns;
 public class CustomContentProviderTest {
 
     private CustomContentProvider customContentProvider;
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     @Before
     public void setUp() {

src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java

@@ -58,7 +58,7 @@ public class CustomContentProviderUtilsTest {
     private static final String TEST_DESC = "Test Desc!";
     private static final String TEST_DESC_NEW = "Test Desc new!";
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
     private ContentProviderUtils contentProviderUtils;
 
     @Mock
@@ -107,7 +107,7 @@ public class CustomContentProviderUtilsTest {
         testIterator(1, 20000, 2000, false);
     }
 
-    private List<TrackPoint> testIterator(long trackId, int numPoints, int batchSize, boolean descending) {
+    private void testIterator(long trackId, int numPoints, int batchSize, boolean descending) {
         long lastPointId = initializeTrack(trackId, numPoints);
         contentProviderUtils.setDefaultCursorBatchSize(batchSize);
         List<TrackPoint> locations = new ArrayList<>(numPoints);
@@ -122,7 +122,6 @@ public class CustomContentProviderUtilsTest {
             }
             Assert.assertEquals(numPoints, locations.size());
         }
-        return locations;
     }
 
     private long initializeTrack(long id, int numPoints) {

src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelperTest.java

@@ -29,7 +29,7 @@ public class CustomSQLiteOpenHelperTest {
 
     private static final String DATABASE_NAME = "test.db";
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     /**
      * Get the SQL create statements for all tables (ordered by name).

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java

@@ -40,16 +40,16 @@ public class ExportImportTest {
 
     private static final String TAG = ExportImportTest.class.getSimpleName();
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
-    private ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
+    private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
 
     private static final String TRACK_ICON = "the track icon";
     private static final String TRACK_CATEGORY = "the category";
     private static final String TRACK_DESCRIPTION = "the description";
     private final List<Waypoint> waypoints = new ArrayList<>();
     private long importTrackId;
-    private long trackId = System.currentTimeMillis();
+    private final long trackId = System.currentTimeMillis();
 
     @Before
     public void setUp() {

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java

@@ -73,9 +73,9 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter {
         String longitude = Double.toString(TRACK_LONGITUDE + index);
         String elevation = Double.toString(TRACK_ELEVATION + index);
         StringBuilder buffer = new StringBuilder();
-        buffer.append("<trkpt lat=\"" + latitude + "\" lon=\"" + longitude + "\"><ele>" + elevation + "</ele>");
+        buffer.append("<trkpt lat=\"").append(latitude).append("\" lon=\"").append(longitude).append("\"><ele>").append(elevation).append("</ele>");
         if (time != null) {
-            buffer.append("<time>" + time + "</time>");
+            buffer.append("<time>").append(time).append("</time>");
         }
         buffer.append("</trkpt>");
         return buffer.toString();

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java

@@ -22,7 +22,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class TrackRecordingServiceNotificationManagerTest {
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     @Mock
     private TrackPoint locationMock;

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java

@@ -66,7 +66,7 @@ public class TrackRecordingServiceTest {
     @Rule
     public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
     private ContentProviderUtils contentProviderUtils;
 
     private final long trackId = Math.abs(new Random().nextLong());

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java

@@ -45,7 +45,7 @@ public class TrackRecordingServiceTestLooper {
     @Rule
     public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     private ContentProviderUtils contentProviderUtils;
 

src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java

@@ -36,7 +36,7 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class AnnouncementPeriodicTaskFactoryTest {
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     @BeforeClass
     public static void preSetUp() {

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

@@ -14,7 +14,7 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
 @RunWith(AndroidJUnit4.class)
 public class AnnouncementUtilsTest {
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
     @Test
     public void getAnnouncement() {

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

@@ -21,6 +21,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 import java.io.File;
+import java.util.Arrays;
 
 /**
  * Tests for {@link FileUtils}.
@@ -108,9 +109,7 @@ public class FileUtilsTest {
         File directory = new File("/dir1/dir2/");
         String suffix = ".gpx";
         char[] name = new char[FileUtils.MAX_FAT32_PATH_LENGTH];
-        for (int i = 0; i < name.length; i++) {
-            name[i] = 'a';
-        }
+        Arrays.fill(name, 'a');
         String nameString = new String(name);
         String truncated = FileUtils.truncateFileName(directory, nameString, suffix);
 

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

@@ -36,7 +36,7 @@ import java.util.TimeZone;
 @RunWith(AndroidJUnit4.class)
 public class StringUtilsTest {
 
-    private Context context = ApplicationProvider.getApplicationContext();
+    private final Context context = ApplicationProvider.getApplicationContext();
 
 
     /**