mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 00:20:32 +00:00
Improve SubscriptionManager tests
- fix checkstyle errors - tests do not run in order, so each one has to do its own assertions separately from what others did - the uid of an entity in the database needn't be the same of the one created in-memory, since the uid gets assigned upon inserting in the database - some database functions return a `Completable` that doesn't do anything until it is subscribed to or awaited, so I added `.awaitBlocking()` where needed - the data of an entity in-memory does not get updated automatically when the corresponding entity in the database is changed, so some tests have been removed - `manager.insertSubscription` only inserts recent streams, so they need to have a date set on them (I also made related items hardcoded and not dependent on what the channel is currently doing)
This commit is contained in:
parent
90bc1905f5
commit
528bd502b4
@ -1,8 +1,6 @@
|
|||||||
package org.schabi.newpipe.local.subscription;
|
package org.schabi.newpipe.local.subscription;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertThat;
|
|
||||||
import static org.junit.Assert.assertTrue;
|
|
||||||
|
|
||||||
import androidx.test.core.app.ApplicationProvider;
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
@ -11,36 +9,43 @@ import org.junit.Before;
|
|||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.schabi.newpipe.database.AppDatabase;
|
import org.schabi.newpipe.database.AppDatabase;
|
||||||
|
import org.schabi.newpipe.database.feed.model.FeedGroupEntity;
|
||||||
|
import org.schabi.newpipe.database.stream.model.StreamEntity;
|
||||||
import org.schabi.newpipe.database.subscription.SubscriptionEntity;
|
import org.schabi.newpipe.database.subscription.SubscriptionEntity;
|
||||||
import org.schabi.newpipe.extractor.channel.ChannelInfo;
|
import org.schabi.newpipe.extractor.channel.ChannelInfo;
|
||||||
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
|
||||||
import org.schabi.newpipe.extractor.stream.StreamInfo;
|
import org.schabi.newpipe.extractor.localization.DateWrapper;
|
||||||
|
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
|
||||||
|
import org.schabi.newpipe.extractor.stream.StreamType;
|
||||||
import org.schabi.newpipe.testUtil.TestDatabase;
|
import org.schabi.newpipe.testUtil.TestDatabase;
|
||||||
import org.schabi.newpipe.testUtil.TrampolineSchedulerRule;
|
import org.schabi.newpipe.testUtil.TrampolineSchedulerRule;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.reflect.Method;
|
import java.time.OffsetDateTime;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class SubscriptionManagerTest {
|
public class SubscriptionManagerTest {
|
||||||
private AppDatabase database;
|
private AppDatabase database;
|
||||||
private SubscriptionManager manager;
|
private SubscriptionManager manager;
|
||||||
private SubscriptionEntity subscription;
|
|
||||||
private SubscriptionEntity anotherSubscription;
|
|
||||||
|
|
||||||
@Rule
|
@Rule
|
||||||
public TrampolineSchedulerRule trampolineScheduler = new TrampolineSchedulerRule();
|
public TrampolineSchedulerRule trampolineScheduler = new TrampolineSchedulerRule();
|
||||||
|
|
||||||
|
|
||||||
|
private SubscriptionEntity getAssertOneSubscriptionEntity() {
|
||||||
|
final List<SubscriptionEntity> entities = manager
|
||||||
|
.getSubscriptions(FeedGroupEntity.GROUP_ALL_ID, "", false)
|
||||||
|
.blockingFirst();
|
||||||
|
assertEquals(1, entities.size());
|
||||||
|
return entities.get(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setup() throws ExtractionException, IOException {
|
public void setup() {
|
||||||
database = TestDatabase.Companion.createReplacingNewPipeDatabase();
|
database = TestDatabase.Companion.createReplacingNewPipeDatabase();
|
||||||
manager = new SubscriptionManager(ApplicationProvider.getApplicationContext());
|
manager = new SubscriptionManager(ApplicationProvider.getApplicationContext());
|
||||||
|
|
||||||
ChannelInfo info = ChannelInfo.getInfo("https://www.youtube.com/c/3blue1brown");
|
|
||||||
subscription = SubscriptionEntity.from(info);
|
|
||||||
manager.insertSubscription(subscription, info);
|
|
||||||
var entities = manager.getSubscriptions(-1L, subscription.getName(), false).blockingFirst();
|
|
||||||
assertEquals(1, entities.size());
|
|
||||||
anotherSubscription = entities.get(0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@After
|
@After
|
||||||
@ -49,96 +54,66 @@ public class SubscriptionManagerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testInsert1() {
|
public void testInsert() throws ExtractionException, IOException {
|
||||||
//This test fails because the uid of those two SubscriptionEntity aren't the same.
|
final ChannelInfo info = ChannelInfo.getInfo("https://www.youtube.com/c/3blue1brown");
|
||||||
assertEquals(subscription, anotherSubscription);
|
final SubscriptionEntity subscription = SubscriptionEntity.from(info);
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testInsert2() {
|
|
||||||
assertEquals(subscription.getUid(), anotherSubscription.getUid());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testInsert3() {
|
|
||||||
assertEquals(subscription.getServiceId(), anotherSubscription.getServiceId());
|
|
||||||
assertEquals(subscription.getUrl(), anotherSubscription.getUrl());
|
|
||||||
assertEquals(subscription.getName(), anotherSubscription.getName());
|
|
||||||
assertEquals(subscription.getAvatarUrl(), anotherSubscription.getAvatarUrl());
|
|
||||||
assertEquals(subscription.getSubscriberCount(), anotherSubscription.getSubscriberCount());
|
|
||||||
assertEquals(subscription.getDescription(), anotherSubscription.getDescription());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testUpdateNotificationMode1() throws ExtractionException, IOException {
|
|
||||||
var info = ChannelInfo.getInfo("https://www.youtube.com/c/veritasium");
|
|
||||||
var subscription = SubscriptionEntity.from(info);
|
|
||||||
subscription.setNotificationMode(0);
|
|
||||||
assertEquals(0, subscription.getNotificationMode());
|
|
||||||
manager.insertSubscription(subscription, info);
|
manager.insertSubscription(subscription, info);
|
||||||
manager.updateNotificationMode(subscription.getServiceId(), subscription.getUrl(), 1);
|
final SubscriptionEntity readSubscription = getAssertOneSubscriptionEntity();
|
||||||
var entities = manager.getSubscriptions(-1L, subscription.getName(), false).blockingFirst();
|
|
||||||
assertEquals(1, entities.size());
|
|
||||||
var anotherSubscription = entities.get(0);
|
|
||||||
|
|
||||||
|
// the uid has changed, since the uid is chosen upon inserting, but the rest should match
|
||||||
|
assertEquals(subscription.getServiceId(), readSubscription.getServiceId());
|
||||||
|
assertEquals(subscription.getUrl(), readSubscription.getUrl());
|
||||||
|
assertEquals(subscription.getName(), readSubscription.getName());
|
||||||
|
assertEquals(subscription.getAvatarUrl(), readSubscription.getAvatarUrl());
|
||||||
|
assertEquals(subscription.getSubscriberCount(), readSubscription.getSubscriberCount());
|
||||||
|
assertEquals(subscription.getDescription(), readSubscription.getDescription());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateNotificationMode() throws ExtractionException, IOException {
|
||||||
|
final ChannelInfo info = ChannelInfo.getInfo("https://www.youtube.com/c/veritasium");
|
||||||
|
final SubscriptionEntity subscription = SubscriptionEntity.from(info);
|
||||||
|
subscription.setNotificationMode(0);
|
||||||
|
|
||||||
|
manager.insertSubscription(subscription, info);
|
||||||
|
manager.updateNotificationMode(subscription.getServiceId(), subscription.getUrl(), 1)
|
||||||
|
.blockingAwait();
|
||||||
|
final SubscriptionEntity anotherSubscription = getAssertOneSubscriptionEntity();
|
||||||
|
|
||||||
|
assertEquals(0, subscription.getNotificationMode());
|
||||||
assertEquals(subscription.getUrl(), anotherSubscription.getUrl());
|
assertEquals(subscription.getUrl(), anotherSubscription.getUrl());
|
||||||
assertEquals(1, anotherSubscription.getNotificationMode());
|
assertEquals(1, anotherSubscription.getNotificationMode());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testUpdateNotificationMode2() throws ExtractionException, IOException {
|
public void testRememberRecentStreams() throws ExtractionException, IOException {
|
||||||
var info = ChannelInfo.getInfo("https://www.youtube.com/c/Radiohead");
|
final ChannelInfo info = ChannelInfo.getInfo("https://www.youtube.com/c/Polyphia");
|
||||||
var subscription = SubscriptionEntity.from(info);
|
final List<StreamInfoItem> relatedItems = List.of(
|
||||||
subscription.setNotificationMode(0);
|
new StreamInfoItem(0, "a", "b", StreamType.VIDEO_STREAM),
|
||||||
assertEquals(0, subscription.getNotificationMode());
|
new StreamInfoItem(1, "c", "d", StreamType.AUDIO_STREAM),
|
||||||
|
new StreamInfoItem(2, "e", "f", StreamType.AUDIO_LIVE_STREAM),
|
||||||
|
new StreamInfoItem(3, "g", "h", StreamType.LIVE_STREAM));
|
||||||
|
relatedItems.forEach(item -> {
|
||||||
|
// these two fields must be non-null for the insert to succeed
|
||||||
|
item.setUploaderUrl(info.getUrl());
|
||||||
|
item.setUploaderName(info.getName());
|
||||||
|
// the upload date must not be too much in the past for the item to actually be inserted
|
||||||
|
item.setUploadDate(new DateWrapper(OffsetDateTime.now()));
|
||||||
|
});
|
||||||
|
info.setRelatedItems(relatedItems);
|
||||||
|
final SubscriptionEntity subscription = SubscriptionEntity.from(info);
|
||||||
|
|
||||||
manager.insertSubscription(subscription, info);
|
manager.insertSubscription(subscription, info);
|
||||||
manager.updateNotificationMode(subscription.getServiceId(), subscription.getUrl(), 1);
|
final List<StreamEntity> streams = database.streamDAO().getAll().blockingFirst();
|
||||||
|
|
||||||
assertEquals(1, subscription.getNotificationMode());
|
assertEquals(4, streams.size());
|
||||||
}
|
streams.sort(Comparator.comparing(StreamEntity::getServiceId));
|
||||||
|
for (int i = 0; i < 4; i++) {
|
||||||
@Test
|
assertEquals(relatedItems.get(0).getServiceId(), streams.get(0).getServiceId());
|
||||||
public void testUpdateNotificationMode3() throws ExtractionException, IOException {
|
assertEquals(relatedItems.get(0).getUrl(), streams.get(0).getUrl());
|
||||||
var info = ChannelInfo.getInfo("https://www.youtube.com/c/LinusTechTips");
|
assertEquals(relatedItems.get(0).getName(), streams.get(0).getTitle());
|
||||||
var subscription = SubscriptionEntity.from(info);
|
assertEquals(relatedItems.get(0).getStreamType(), streams.get(0).getStreamType());
|
||||||
subscription.setNotificationMode(1);
|
}
|
||||||
assertEquals(1, subscription.getNotificationMode());
|
|
||||||
manager.insertSubscription(subscription, info);
|
|
||||||
manager.updateNotificationMode(subscription.getServiceId(), subscription.getUrl(), 0);
|
|
||||||
var entities = manager.getSubscriptions(-1L, subscription.getName(), false).blockingFirst();
|
|
||||||
assertEquals(1, entities.size());
|
|
||||||
var anotherSubscription = entities.get(0);
|
|
||||||
|
|
||||||
assertEquals(subscription.getUrl(), anotherSubscription.getUrl());
|
|
||||||
assertEquals(0, anotherSubscription.getNotificationMode());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testUpdateNotificationMode4() throws ExtractionException, IOException {
|
|
||||||
var info = ChannelInfo.getInfo("https://www.youtube.com/c/JetBrainsTV");
|
|
||||||
var subscription = SubscriptionEntity.from(info);
|
|
||||||
subscription.setNotificationMode(1);
|
|
||||||
assertEquals(1, subscription.getNotificationMode());
|
|
||||||
manager.insertSubscription(subscription, info);
|
|
||||||
manager.updateNotificationMode(subscription.getServiceId(), subscription.getUrl(), 0);
|
|
||||||
|
|
||||||
assertEquals(0, subscription.getNotificationMode());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testRememberAllStreams() throws ExtractionException, IOException {
|
|
||||||
database.streamDAO().deleteAll();
|
|
||||||
var info = ChannelInfo.getInfo("https://www.youtube.com/c/Polyphia");
|
|
||||||
var subscription = SubscriptionEntity.from(info);
|
|
||||||
manager.insertSubscription(subscription, info);
|
|
||||||
|
|
||||||
// var Stream1 = StreamInfo.getInfo("https://www.youtube.com/watch?v=Z5NoQg8LdDk");
|
|
||||||
// var Stream2 = StreamInfo.getInfo("https://www.youtube.com/watch?v=2hln1TOQUZ0");
|
|
||||||
// var Stream3 = StreamInfo.getInfo("https://www.youtube.com/watch?v=9_gkpYORQLU");
|
|
||||||
// var Stream4 = StreamInfo.getInfo("https://www.youtube.com/watch?v=per9Wz0N-QA");
|
|
||||||
|
|
||||||
var streams = database.streamDAO().getAll().blockingFirst();
|
|
||||||
assertTrue(streams.size() >= 4);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user