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;