Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move some tests from core module to their respective module (#7059)

This commit is contained in:
ByteHamster 2024-04-04 22:26:53 +02:00 committed by GitHub
parent 0288d4e51e
commit 2143ab1351
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
35 changed files with 62 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
View File

@ -10,12 +10,12 @@ import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.ui.screen.preferences.PreferenceActivity;
import de.danoeh.antennapod.core.storage.APCleanupAlgorithm;
import de.danoeh.antennapod.core.storage.APNullCleanupAlgorithm;
import de.danoeh.antennapod.core.storage.APQueueCleanupAlgorithm;
import de.danoeh.antennapod.core.storage.EpisodeCleanupAlgorithm;
import de.danoeh.antennapod.core.storage.EpisodeCleanupAlgorithmFactory;
import de.danoeh.antennapod.core.storage.ExceptFavoriteCleanupAlgorithm;
import de.danoeh.antennapod.net.download.service.episode.autodownload.APCleanupAlgorithm;
import de.danoeh.antennapod.net.download.service.episode.autodownload.APNullCleanupAlgorithm;
import de.danoeh.antennapod.net.download.service.episode.autodownload.APQueueCleanupAlgorithm;
import de.danoeh.antennapod.net.download.service.episode.autodownload.EpisodeCleanupAlgorithm;
import de.danoeh.antennapod.net.download.service.episode.autodownload.EpisodeCleanupAlgorithmFactory;
import de.danoeh.antennapod.net.download.service.episode.autodownload.ExceptFavoriteCleanupAlgorithm;
import de.danoeh.antennapod.storage.preferences.UserPreferences;
import de.danoeh.antennapod.storage.preferences.UserPreferences.EnqueueLocation;
import de.test.antennapod.EspressoTestUtils;

2
app/src/main/java/de/danoeh/antennapod/ClientConfigurator.java
View File

@ -3,7 +3,7 @@ package de.danoeh.antennapod;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import de.danoeh.antennapod.core.storage.AutoDownloadManagerImpl;
import de.danoeh.antennapod.net.download.service.episode.autodownload.AutoDownloadManagerImpl;
import de.danoeh.antennapod.net.download.service.feed.FeedUpdateManagerImpl;
import de.danoeh.antennapod.net.download.serviceinterface.AutoDownloadManager;
import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;

2
app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavDrawerFragment.java
View File

@ -33,7 +33,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.shape.MaterialShapeDrawable;
import com.google.android.material.shape.ShapeAppearanceModel;
import de.danoeh.antennapod.core.storage.EpisodeCleanupAlgorithmFactory;
import de.danoeh.antennapod.net.download.service.episode.autodownload.EpisodeCleanupAlgorithmFactory;
import de.danoeh.antennapod.ui.screen.AddFeedFragment;
import de.danoeh.antennapod.ui.screen.AllEpisodesFragment;
import de.danoeh.antennapod.ui.screen.InboxFragment;

1
build.gradle
View File

@ -41,6 +41,7 @@ project.ext {
runnerVersion = "1.5.0"
rulesVersion = "1.5.0"
testCoreVersion = "1.5.0"
mockitoVersion = "5.11.0"
}
checkstyle {

2
core/build.gradle
View File

@ -56,7 +56,7 @@ dependencies {
testImplementation "androidx.test:core:$testCoreVersion"
testImplementation "org.awaitility:awaitility:$awaitilityVersion"
testImplementation "junit:junit:$junitVersion"
testImplementation 'org.mockito:mockito-core:5.11.0'
testImplementation "org.mockito:mockito-core:$mockitoVersion"
testImplementation "org.robolectric:robolectric:$robolectricVersion"
testImplementation 'javax.inject:javax.inject:1'
androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"

1
model/build.gradle
View File

@ -18,4 +18,5 @@ dependencies {
testImplementation "junit:junit:$junitVersion"
testImplementation "androidx.test:core:$testCoreVersion"
testImplementation "org.mockito:mockito-core:$mockitoVersion"
}

13
core/src/test/java/de/danoeh/antennapod/core/feed/FeedFilterTest.java → model/src/test/java/de/danoeh/antennapod/model/feed/FeedFilterTest.java
View File

@ -1,12 +1,9 @@
package de.danoeh.antennapod.core.feed;
import de.danoeh.antennapod.ui.common.Converter;
import de.danoeh.antennapod.model.feed.FeedFilter;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.model.feed.FeedMedia;
package de.danoeh.antennapod.model.feed;
import org.junit.Test;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@ -133,7 +130,7 @@ public class FeedFilterTest {
FeedItem download = new FeedItem();
download.setTitle("Hello friend!");
FeedMedia downloadMedia = FeedMediaMother.anyFeedMedia();
downloadMedia.setDuration(Converter.durationStringShortToMs("05:00", false));
downloadMedia.setDuration((int) TimeUnit.MILLISECONDS.convert(5, TimeUnit.MINUTES));
download.setMedia(downloadMedia);
// because duration of the media in unknown
FeedItem download2 = new FeedItem();
@ -144,7 +141,7 @@ public class FeedFilterTest {
FeedItem doNotDownload = new FeedItem();
doNotDownload.setTitle("Hello friend!");
FeedMedia doNotDownloadMedia = FeedMediaMother.anyFeedMedia();
doNotDownloadMedia.setDuration(Converter.durationStringShortToMs("02:00", false));
doNotDownloadMedia.setDuration((int) TimeUnit.MILLISECONDS.convert(2, TimeUnit.MINUTES));
doNotDownload.setMedia(doNotDownloadMedia);
int minimalDurationFilter = 3 * 60;

6
core/src/test/java/de/danoeh/antennapod/core/feed/FeedItemMother.java → model/src/test/java/de/danoeh/antennapod/model/feed/FeedItemMother.java
View File

@ -1,10 +1,8 @@
package de.danoeh.antennapod.core.feed;
import de.danoeh.antennapod.model.feed.FeedItem;
package de.danoeh.antennapod.model.feed;
import java.util.Date;
import static de.danoeh.antennapod.core.feed.FeedMother.anyFeed;
import static de.danoeh.antennapod.model.feed.FeedMother.anyFeed;
class FeedItemMother {
private static final String IMAGE_URL = "http://example.com/image";

5
core/src/test/java/de/danoeh/antennapod/core/feed/FeedItemTest.java → model/src/test/java/de/danoeh/antennapod/model/feed/FeedItemTest.java
View File

@ -1,13 +1,12 @@
package de.danoeh.antennapod.core.feed;
package de.danoeh.antennapod.model.feed;
import de.danoeh.antennapod.model.feed.FeedItem;
import org.junit.Before;
import org.junit.Test;
import java.text.SimpleDateFormat;
import java.util.Date;
import static de.danoeh.antennapod.core.feed.FeedItemMother.anyFeedItemWithImage;
import static de.danoeh.antennapod.model.feed.FeedItemMother.anyFeedItemWithImage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

4
core/src/test/java/de/danoeh/antennapod/core/feed/FeedMediaMother.java → model/src/test/java/de/danoeh/antennapod/model/feed/FeedMediaMother.java
View File

@ -1,6 +1,4 @@
package de.danoeh.antennapod.core.feed;
import de.danoeh.antennapod.model.feed.FeedMedia;
package de.danoeh.antennapod.model.feed;
class FeedMediaMother {

6
core/src/test/java/de/danoeh/antennapod/core/feed/FeedMediaTest.java → model/src/test/java/de/danoeh/antennapod/model/feed/FeedMediaTest.java
View File

@ -1,11 +1,9 @@
package de.danoeh.antennapod.core.feed;
package de.danoeh.antennapod.model.feed;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.model.feed.FeedMedia;
import org.junit.Before;
import org.junit.Test;
import static de.danoeh.antennapod.core.feed.FeedMediaMother.anyFeedMedia;
import static de.danoeh.antennapod.model.feed.FeedMediaMother.anyFeedMedia;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

4
core/src/test/java/de/danoeh/antennapod/core/feed/FeedMother.java → model/src/test/java/de/danoeh/antennapod/model/feed/FeedMother.java
View File

@ -1,6 +1,4 @@
package de.danoeh.antennapod.core.feed;
import de.danoeh.antennapod.model.feed.Feed;
package de.danoeh.antennapod.model.feed;
public class FeedMother {
public static final String IMAGE_URL = "http://example.com/image";

7
core/src/test/java/de/danoeh/antennapod/core/feed/FeedTest.java → model/src/test/java/de/danoeh/antennapod/model/feed/FeedTest.java
View File

@ -1,12 +1,9 @@
package de.danoeh.antennapod.core.feed;
package de.danoeh.antennapod.model.feed;
import de.danoeh.antennapod.model.feed.Feed;
import org.junit.Before;
import org.junit.Test;
import de.danoeh.antennapod.model.feed.SortOrder;
import static de.danoeh.antennapod.core.feed.FeedMother.anyFeed;
import static de.danoeh.antennapod.model.feed.FeedMother.anyFeed;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;

3
net/download/service/build.gradle
View File

@ -43,5 +43,6 @@ dependencies {
testImplementation "junit:junit:$junitVersion"
testImplementation "org.robolectric:robolectric:$robolectricVersion"
testImplementation "org.awaitility:awaitility:$awaitilityVersion"
testImplementation 'org.mockito:mockito-core:5.11.0'
testImplementation "org.mockito:mockito-core:$mockitoVersion"
testImplementation "androidx.preference:preference:$preferenceVersion"
}

2
core/src/main/java/de/danoeh/antennapod/core/storage/APCleanupAlgorithm.java → net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/APCleanupAlgorithm.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;
import androidx.annotation.NonNull;

2
core/src/main/java/de/danoeh/antennapod/core/storage/APNullCleanupAlgorithm.java → net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/APNullCleanupAlgorithm.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;
import android.util.Log;

2
core/src/main/java/de/danoeh/antennapod/core/storage/APQueueCleanupAlgorithm.java → net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/APQueueCleanupAlgorithm.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;
import androidx.annotation.NonNull;

2
core/src/main/java/de/danoeh/antennapod/core/storage/AutoDownloadManagerImpl.java → net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/AutoDownloadManagerImpl.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;
import android.util.Log;

2
core/src/main/java/de/danoeh/antennapod/core/storage/AutomaticDownloadAlgorithm.java → net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/AutomaticDownloadAlgorithm.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;
import android.content.Intent;

2
core/src/main/java/de/danoeh/antennapod/core/storage/EpisodeCleanupAlgorithm.java → net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/EpisodeCleanupAlgorithm.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;

2
core/src/main/java/de/danoeh/antennapod/core/storage/EpisodeCleanupAlgorithmFactory.java → net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/EpisodeCleanupAlgorithmFactory.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import de.danoeh.antennapod.storage.preferences.UserPreferences;

2
core/src/main/java/de/danoeh/antennapod/core/storage/ExceptFavoriteCleanupAlgorithm.java → net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/ExceptFavoriteCleanupAlgorithm.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;
import android.util.Log;

2
core/src/test/java/de/danoeh/antennapod/core/storage/APCleanupAlgorithmTest.java → net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/APCleanupAlgorithmTest.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import org.junit.Test;

4
core/src/test/java/de/danoeh/antennapod/core/storage/DbCleanupTests.java → net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbCleanupTests.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;
import android.content.SharedPreferences;
@ -28,7 +28,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import static de.danoeh.antennapod.core.storage.DbTestUtils.saveFeedlist;
import static de.danoeh.antennapod.net.download.service.episode.autodownload.DbTestUtils.saveFeedlist;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

2
core/src/test/java/de/danoeh/antennapod/core/storage/DbNullCleanupAlgorithmTest.java → net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbNullCleanupAlgorithmTest.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;
import android.content.SharedPreferences;

2
core/src/test/java/de/danoeh/antennapod/core/storage/DbQueueCleanupAlgorithmTest.java → net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbQueueCleanupAlgorithmTest.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import java.io.File;
import java.io.IOException;

4
core/src/test/java/de/danoeh/antennapod/core/storage/DbReaderTest.java → net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbReaderTest.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;
@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
import org.robolectric.RobolectricTestRunner;
import static de.danoeh.antennapod.core.storage.DbTestUtils.saveFeedlist;
import static de.danoeh.antennapod.net.download.service.episode.autodownload.DbTestUtils.saveFeedlist;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;

2
core/src/test/java/de/danoeh/antennapod/core/storage/DbTasksTest.java → net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbTasksTest.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;

2
core/src/test/java/de/danoeh/antennapod/core/storage/DbTestUtils.java → net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbTestUtils.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import java.util.ArrayList;
import java.util.Date;

2
core/src/test/java/de/danoeh/antennapod/core/storage/DbWriterTest.java → net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbWriterTest.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import android.content.Context;
import android.content.SharedPreferences;

2
core/src/test/java/de/danoeh/antennapod/core/storage/ExceptFavoriteCleanupAlgorithmTest.java → net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/ExceptFavoriteCleanupAlgorithmTest.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.net.download.service.episode.autodownload;
import de.danoeh.antennapod.net.download.serviceinterface.AutoDownloadManager;
import org.junit.Test;

2
playback/service/build.gradle
View File

@ -40,5 +40,5 @@ dependencies {
implementation "org.apache.commons:commons-lang3:$commonslangVersion"
testImplementation "junit:junit:$junitVersion"
testImplementation 'org.mockito:mockito-core:5.11.0'
testImplementation "org.mockito:mockito-core:$mockitoVersion"
}

2
core/src/test/java/de/danoeh/antennapod/core/util/CollectionTestUtil.java → storage/database/src/test/java/de/danoeh/antennapod/storage/database/CollectionTestUtil.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.util;
package de.danoeh.antennapod.storage.database;
import java.util.ArrayList;
import java.util.Arrays;

2
core/src/test/java/de/danoeh/antennapod/core/storage/FeedItemDuplicateGuesserTest.java → storage/database/src/test/java/de/danoeh/antennapod/storage/database/FeedItemDuplicateGuesserTest.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.storage.database;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.model.feed.FeedMedia;

20
core/src/test/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculatorTest.java → storage/database/src/test/java/de/danoeh/antennapod/storage/database/ItemEnqueuePositionCalculatorTest.java
View File

@ -1,9 +1,9 @@
package de.danoeh.antennapod.core.storage;
package de.danoeh.antennapod.storage.database;
import de.danoeh.antennapod.model.feed.Feed;
import de.danoeh.antennapod.model.playback.RemoteMedia;
import de.danoeh.antennapod.net.download.serviceinterface.DownloadServiceInterface;
import de.danoeh.antennapod.net.download.serviceinterface.DownloadServiceInterfaceStub;
import de.danoeh.antennapod.storage.database.ItemEnqueuePositionCalculator;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@ -19,16 +19,14 @@ import java.util.stream.Collectors;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.model.feed.FeedMedia;
import de.danoeh.antennapod.core.feed.FeedMother;
import de.danoeh.antennapod.storage.preferences.UserPreferences.EnqueueLocation;
import de.danoeh.antennapod.model.playback.Playable;
import static de.danoeh.antennapod.storage.preferences.UserPreferences.EnqueueLocation.AFTER_CURRENTLY_PLAYING;
import static de.danoeh.antennapod.storage.preferences.UserPreferences.EnqueueLocation.BACK;
import static de.danoeh.antennapod.storage.preferences.UserPreferences.EnqueueLocation.FRONT;
import static de.danoeh.antennapod.core.util.CollectionTestUtil.concat;
import static de.danoeh.antennapod.core.util.CollectionTestUtil.list;
import static de.danoeh.antennapod.core.util.FeedItemUtil.getIdList;
import static de.danoeh.antennapod.storage.database.CollectionTestUtil.concat;
import static de.danoeh.antennapod.storage.database.CollectionTestUtil.list;
import static java.util.Collections.emptyList;
import static org.junit.Assert.assertEquals;
@ -136,7 +134,10 @@ public class ItemEnqueuePositionCalculatorTest {
List<Long> idsExpected) {
int posActual = calculator.calcPosition(queue, currentlyPlaying);
queue.add(posActual, itemToAdd);
assertEquals(message, idsExpected, getIdList(queue));
assertEquals(message, idsExpected.size(), queue.size());
for (int i = 0; i < idsExpected.size(); i++) {
assertEquals(message, (long) idsExpected.get(i), queue.get(i).getId());
}
}
static final List<FeedItem> QUEUE_EMPTY = Collections.unmodifiableList(emptyList());
@ -167,8 +168,11 @@ public class ItemEnqueuePositionCalculatorTest {
static FeedItem createFeedItem(long id) {
Feed feed = new Feed(0, null, "title", "http://example.com", "This is the description",
"http://example.com/payment", "Daniel", "en", null, "http://example.com/feed",
"http://example.com/image", null, "http://example.com/feed", System.currentTimeMillis());
FeedItem item = new FeedItem(id, "Item" + id, "ItemId" + id, "url",
new Date(), FeedItem.PLAYED, FeedMother.anyFeed());
new Date(), FeedItem.PLAYED, feed);
FeedMedia media = new FeedMedia(item, "http://download.url.net/" + id, 1234567, "audio/mpeg");
media.setId(item.getId());
item.setMedia(media);