AndroidStudio: code cleanup.

src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator2Test.java

@@ -14,7 +14,7 @@ import de.dennisguse.opentracks.data.models.Track;
 //TODO Merge with TrackFilenameGeneratorTest whenever Junit5 gets available.
 //https://github.com/android/android-test/issues/224
 @RunWith(Parameterized.class)
-public class TrackFilenameGeneratorTest2 {
+public class TrackFilenameGenerator2Test {
 
     @Parameterized.Parameters
     public static Collection<String> data() {
@@ -26,7 +26,7 @@ public class TrackFilenameGeneratorTest2 {
 
     private final TrackFilenameGenerator subject;
 
-    public TrackFilenameGeneratorTest2(String template) {
+    public TrackFilenameGenerator2Test(String template) {
         this.subject = new TrackFilenameGenerator(template);
     }
 

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

@@ -112,7 +112,7 @@ public class ExportImportTest {
     private TrackImporter trackImporter;
 
     @Before
-    public void fileSetup() throws IOException, TimeoutException {
+    public void fileSetup() throws IOException {
         TrackRecordingServiceTestUtils.resetService(mServiceRule, context);
 
         tmpFile = File.createTempFile("test", "test", context.getFilesDir());
@@ -124,7 +124,7 @@ public class ExportImportTest {
     }
 
     @After
-    public void tearDown() throws TimeoutException {
+    public void tearDown() {
         tmpFile.deleteOnExit();
         tmpFileUri = null;
 

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

@@ -51,7 +51,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 
 @RunWith(AndroidJUnit4.class)
-public class TrackRecordingServiceTestMarker {
+public class TrackRecordingServiceMarkerTest {
 
     @Rule
     public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
@@ -86,7 +86,7 @@ public class TrackRecordingServiceTestMarker {
     }
 
     @After
-    public void tearDown() throws TimeoutException {
+    public void tearDown() {
         TrackRecordingServiceTestUtils.resetService(mServiceRule, context);
 
         // Ensure that the database is empty after every test

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

@@ -49,7 +49,7 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
  * So, if something fails, subsequent tests may be affected.
  */
 @RunWith(AndroidJUnit4.class)
-public class TrackRecordingServiceTestRecording {
+public class TrackRecordingServiceRecordingTest {
 
     @Rule
     public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
@@ -96,7 +96,7 @@ public class TrackRecordingServiceTestRecording {
     }
 
     @After
-    public void tearDown() throws TimeoutException {
+    public void tearDown() {
         TrackRecordingServiceTestUtils.resetService(mServiceRule, context);
         // Ensure that the database is empty after every test
         contentProviderUtils.deleteAllTracks(context);

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

@@ -54,7 +54,7 @@ import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
  * As states are checked against MutableLiveData that are updated via `postValue()` (is asynchronous to be inform other Threads), Thread.sleep() is required.
  */
 @RunWith(AndroidJUnit4.class)
-public class TrackRecordingServiceTestStateMachine {
+public class TrackRecordingServiceStateMachineTest {
 
     @Rule
     public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);
@@ -93,7 +93,7 @@ public class TrackRecordingServiceTestStateMachine {
     }
 
     @After
-    public void tearDown() throws TimeoutException {
+    public void tearDown() {
         TrackRecordingServiceTestUtils.resetService(mServiceRule, context);
         // Ensure that the database is empty after every test
         contentProviderUtils.deleteAllTracks(context);