diff options
3 files changed, 18 insertions, 3 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java index cb205cbf7..84cc4b6a8 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java @@ -21,6 +21,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import de.danoeh.antennapod.core.R; import de.danoeh.antennapod.core.event.DownloadLogEvent; @@ -73,6 +74,18 @@ public class DBWriter { } /** + * Wait until all threads are finished to avoid the "Illegal connection pointer" error of + * Robolectric. Call this method only for unit tests. + */ + public static void tearDownTests() { + try { + dbExec.awaitTermination(1, TimeUnit.SECONDS); + } catch (InterruptedException e) { + // ignore error + } + } + + /** * Deletes a downloaded FeedMedia file from the storage device. * * @param context A context that is used for opening a database connection. diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 2f00ebf89..118317f18 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -4,8 +4,8 @@ tools:ignore="MissingTranslation"> <!-- Activity and fragment titles --> - <string name="app_name" translate="false">AntennaPod</string> - <string name="provider_authority" translate="false">de.danoeh.antennapod.provider</string> + <string name="app_name" translatable="false">AntennaPod</string> + <string name="provider_authority" translatable="false">de.danoeh.antennapod.provider</string> <string name="feed_update_receiver_name">Update Subscriptions</string> <string name="feeds_label">Podcasts</string> <string name="statistics_label">Statistics</string> @@ -290,7 +290,7 @@ <string name="playback_error_source">Unable to access media file</string> <string name="playback_error_unknown">Unknown Error</string> <string name="no_media_playing_label">No media playing</string> - <string name="position_default_label" translate="false">00:00:00</string> + <string name="position_default_label" translatable="false">00:00:00</string> <string name="player_buffering_msg">Buffering</string> <string name="player_go_to_picture_in_picture">Picture-in-picture mode</string> <string name="unknown_media_key">AntennaPod - Unknown media key: %1$d</string> diff --git a/core/src/test/java/de/danoeh/antennapod/core/feed/LocalFeedUpdaterTest.java b/core/src/test/java/de/danoeh/antennapod/core/feed/LocalFeedUpdaterTest.java index a634833c9..fbe4c6ace 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/feed/LocalFeedUpdaterTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/feed/LocalFeedUpdaterTest.java @@ -30,6 +30,7 @@ import de.danoeh.antennapod.core.ClientConfig; import de.danoeh.antennapod.core.R; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.storage.DBReader; +import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.core.storage.PodDBAdapter; import static org.junit.Assert.assertEquals; @@ -81,6 +82,7 @@ public class LocalFeedUpdaterTest { @After public void tearDown() { + DBWriter.tearDownTests(); PodDBAdapter.tearDownTests(); } |