Small cleanups and improvements code.

This commit is contained in:
Dennis Guse
2020-10-31 19:34:49 +01:00
committed by Román Martínez
parent acc2627bde
commit 9541a92657
3 changed files with 12 additions and 22 deletions
@@ -1,7 +1,6 @@
package de.dennisguse.opentracks.io.file.importer;
import android.content.Context;
import android.database.sqlite.SQLiteConstraintException;
import android.util.Log;
import android.util.Pair;
@@ -10,9 +9,7 @@ import androidx.test.filters.LargeTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -62,9 +59,6 @@ public class ExportImportTest {
private Track.Id importTrackId;
private final Track.Id trackId = new Track.Id(System.currentTimeMillis());
@Rule
public ExpectedException exception = ExpectedException.none();
@Before
public void setUp() {
Pair<Track, TrackPoint[]> track = TestDataUtil.createTrack(trackId, 10);
@@ -179,7 +173,7 @@ public class ExportImportTest {
}
@LargeTest
@Test
@Test(expected = ImportAlreadyExistsException.class)
public void kml_with_trackdetail_and_sensordata_duplicate_trackUUID() {
// given
PreferencesUtils.setBoolean(context, R.string.import_prevent_reimport_key, true);
@@ -187,8 +181,6 @@ public class ExportImportTest {
TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.newTrackExporter(context);
exception.expect(ImportAlreadyExistsException.class);
// when
// 1. export
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -270,7 +262,7 @@ public class ExportImportTest {
}
@LargeTest
@Test
@Test(expected = ImportAlreadyExistsException.class)
public void gpx_duplicate_trackUUID() {
// given
PreferencesUtils.setBoolean(context, R.string.import_prevent_reimport_key, true);
@@ -278,8 +270,6 @@ public class ExportImportTest {
TrackExporter trackExporter = TrackFileFormat.GPX.newTrackExporter(context);
exception.expect(ImportAlreadyExistsException.class);
// when
// 1. export
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();