From d0fde46027580622aba91c6236ca5b4fbb275a78 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 6 Nov 2019 18:40:27 +0100 Subject: [PATCH] Android does not allow referencing integer in string-arrays: store everything as string and parse it later (also for tests). --- .../opentracks/services/TrackRecordingServiceTest.java | 10 +++++----- .../services/TrackRecordingServiceTestLooper.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java index bbb57c835..4f63b1a42 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java @@ -135,7 +135,7 @@ public class TrackRecordingServiceTest { createDummyTrack(trackId, System.currentTimeMillis(), true); // Clear the number of attempts and set the timeout to 10 min. - updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, context.getResources().getInteger(R.integer.auto_resume_track_timeout_default)); + updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default))); // Start the service in "resume" mode (simulates the on-reboot action). Intent startIntent = createStartIntent(context); @@ -154,7 +154,7 @@ public class TrackRecordingServiceTest { @MediumTest @Test public void testResumeAfterReboot_simulateReboot() throws Exception { - updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, context.getResources().getInteger(R.integer.auto_resume_track_timeout_default)); + updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default))); ITrackRecordingService service = ((ITrackRecordingService) mServiceRule.bindService(createStartIntent(context))); Assert.assertFalse(service.isRecording()); @@ -184,7 +184,7 @@ public class TrackRecordingServiceTest { createDummyTrack(trackId, System.currentTimeMillis(), false); // Clear the number of attempts and set the timeout to 10 min. - updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, context.getResources().getInteger(R.integer.auto_resume_track_timeout_default)); + updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default))); // Start the service in "resume" mode (simulates the on-reboot action). Intent startIntent = createStartIntent(context); @@ -207,7 +207,7 @@ public class TrackRecordingServiceTest { createDummyTrack(trackId, System.currentTimeMillis() - 1500 * 60 * 1000, true); // Clear the number of attempts and set the timeout to 10 min. - updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, context.getResources().getInteger(R.integer.auto_resume_track_timeout_default)); + updateAutoResumePrefs(context, PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default))); // Start the service in "resume" mode (simulates the on-reboot action). Intent startIntent = createStartIntent(context); @@ -230,7 +230,7 @@ public class TrackRecordingServiceTest { createDummyTrack(trackId, System.currentTimeMillis(), true); // Set the number of attempts to max. - updateAutoResumePrefs(context, TrackRecordingService.MAX_AUTO_RESUME_TRACK_RETRY_ATTEMPTS, context.getResources().getInteger(R.integer.auto_resume_track_timeout_default)); + updateAutoResumePrefs(context, TrackRecordingService.MAX_AUTO_RESUME_TRACK_RETRY_ATTEMPTS, Integer.parseInt(context.getResources().getString(R.string.auto_resume_track_timeout_default))); // Start the service in "resume" mode (simulates the on-reboot action). Intent startIntent = createStartIntent(context); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java index e78dc69c3..5b8fd912f 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java @@ -103,7 +103,7 @@ public class TrackRecordingServiceTestLooper { @MediumTest @Test public void testWithProperties_voiceFrequencyDefault() throws TimeoutException { - PreferencesUtils.setInt(context, R.string.voice_frequency_key, context.getResources().getInteger(R.integer.voice_frequency_default)); + PreferencesUtils.setInt(context, R.string.voice_frequency_key, Integer.parseInt(context.getResources().getString(R.string.voice_frequency_default))); fullRecordingSession(); } @@ -125,7 +125,7 @@ public class TrackRecordingServiceTestLooper { @MediumTest @Test public void testWithProperties_maxRecordingDistanceDefault() throws TimeoutException { - PreferencesUtils.setInt(context, R.string.max_recording_distance_key, context.getResources().getInteger(R.integer.max_recording_distance_default)); + PreferencesUtils.setInt(context, R.string.max_recording_distance_key, Integer.parseInt(context.getResources().getString(R.string.max_recording_distance_default))); fullRecordingSession(); } @@ -153,7 +153,7 @@ public class TrackRecordingServiceTestLooper { @MediumTest @Test public void testWithProperties_splitFrequencyDefault() throws TimeoutException { - PreferencesUtils.setInt(context, R.string.split_frequency_key, context.getResources().getInteger(R.integer.split_frequency_default)); + PreferencesUtils.setInt(context, R.string.split_frequency_key, Integer.parseInt(context.getResources().getString(R.string.split_frequency_default))); fullRecordingSession(); } @@ -188,7 +188,7 @@ public class TrackRecordingServiceTestLooper { @MediumTest @Test public void testWithProperties_minRecordingIntervalDefault() throws TimeoutException { - PreferencesUtils.setInt(context, R.string.min_recording_interval_key, context.getResources().getInteger(R.integer.min_recording_interval_default)); + PreferencesUtils.setInt(context, R.string.min_recording_interval_key, Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default))); fullRecordingSession(); }