Skip to content

Commit 4160891

Browse files
Fix failing tests.
1 parent ff5f223 commit 4160891

2 files changed

Lines changed: 24 additions & 22 deletions

File tree

extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampSearchExtractorTest.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,28 @@
22

33
package org.schabi.newpipe.extractor.services.bandcamp;
44

5+
import static org.junit.jupiter.api.Assertions.assertEquals;
6+
import static org.junit.jupiter.api.Assertions.assertTrue;
7+
import static org.schabi.newpipe.extractor.ServiceList.Bandcamp;
8+
59
import org.junit.jupiter.api.BeforeAll;
610
import org.junit.jupiter.api.Test;
711
import org.schabi.newpipe.downloader.DownloaderTestImpl;
8-
import org.schabi.newpipe.extractor.*;
12+
import org.schabi.newpipe.extractor.InfoItem;
13+
import org.schabi.newpipe.extractor.ListExtractor;
14+
import org.schabi.newpipe.extractor.NewPipe;
15+
import org.schabi.newpipe.extractor.Page;
16+
import org.schabi.newpipe.extractor.StreamingService;
917
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
1018
import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
1119
import org.schabi.newpipe.extractor.search.SearchExtractor;
1220
import org.schabi.newpipe.extractor.services.DefaultSearchExtractorTest;
1321
import org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampSearchExtractor;
1422
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
1523

16-
import javax.annotation.Nullable;
1724
import java.io.IOException;
1825

19-
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertTrue;
21-
import static org.schabi.newpipe.extractor.ServiceList.Bandcamp;
26+
import javax.annotation.Nullable;
2227

2328
/**
2429
* Test for {@link BandcampSearchExtractor}
@@ -73,20 +78,17 @@ void testChannelSearch() throws ExtractionException, IOException {
7378
@Test
7479
void testAlbumSearch() throws ExtractionException, IOException {
7580
final SearchExtractor extractor = Bandcamp.getSearchExtractor("minecraft volume alpha");
76-
InfoItem minecraft = extractor.getInitialPage()
77-
.getItems().get(0);
81+
final InfoItem minecraft = extractor.getInitialPage().getItems().get(0);
7882

7983
// Minecraft volume alpha should be the first result, no?
80-
assertEquals("Minecraft: Volume Alpha (cover)", minecraft.getName());
84+
assertEquals("Minecraft - Volume Alpha", minecraft.getName());
8185
assertTrue(minecraft.getThumbnailUrl().endsWith(".jpg"));
8286
assertTrue(minecraft.getThumbnailUrl().contains("f4.bcbits.com/img/"));
83-
assertEquals(
84-
"https://chromacat248.bandcamp.com/album/minecraft-volume-alpha-cover",
87+
assertEquals("https://c418.bandcamp.com/album/minecraft-volume-alpha",
8588
minecraft.getUrl());
8689

8790
// Verify that playlist tracks counts get extracted correctly
88-
assertEquals(3, ((PlaylistInfoItem) minecraft).getStreamCount());
89-
91+
assertEquals(24, ((PlaylistInfoItem) minecraft).getStreamCount());
9092
}
9193

9294
/**

extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubePlaylistExtractorTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.schabi.newpipe.extractor.services.peertube;
22

3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.schabi.newpipe.extractor.ServiceList.PeerTube;
5+
36
import org.junit.jupiter.api.BeforeAll;
47
import org.junit.jupiter.api.Disabled;
58
import org.junit.jupiter.api.Test;
@@ -9,9 +12,6 @@
912
import org.schabi.newpipe.extractor.exceptions.ParsingException;
1013
import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubePlaylistExtractor;
1114

12-
import static org.junit.jupiter.api.Assertions.assertEquals;
13-
import static org.schabi.newpipe.extractor.ServiceList.PeerTube;
14-
1515
public class PeertubePlaylistExtractorTest {
1616

1717
public static class Shocking {
@@ -39,41 +39,41 @@ void testGetThumbnailUrl() throws ParsingException {
3939
}
4040

4141
@Test
42-
void testGetUploaderUrl() throws ParsingException {
42+
void testGetUploaderUrl() {
4343
assertEquals("https://skeptikon.fr/accounts/metadechoc", extractor.getUploaderUrl());
4444
}
4545

4646
@Test
4747
void testGetUploaderAvatarUrl() throws ParsingException {
4848
assertEquals(
49-
"https://framatube.org/lazy-static/avatars/cd0f781d-0287-4be2-94f1-24cd732337b2.jpg",
49+
"https://framatube.org/lazy-static/avatars/c6801ff9-cb49-42e6-b2db-3db623248115.jpg",
5050
extractor.getUploaderAvatarUrl());
5151
}
5252

5353
@Test
54-
void testGetUploaderName() throws ParsingException {
54+
void testGetUploaderName() {
5555
assertEquals("Méta de Choc", extractor.getUploaderName());
5656
}
5757

5858
@Test
59-
void testGetStreamCount() throws ParsingException {
59+
void testGetStreamCount() {
6060
ExtractorAsserts.assertGreaterOrEqual(39, extractor.getStreamCount());
6161
}
6262

6363
@Test
64-
void testGetSubChannelUrl() throws ParsingException {
64+
void testGetSubChannelUrl() {
6565
assertEquals("https://skeptikon.fr/video-channels/metadechoc_channel", extractor.getSubChannelUrl());
6666
}
6767

6868
@Test
69-
void testGetSubChannelName() throws ParsingException {
69+
void testGetSubChannelName() {
7070
assertEquals("SHOCKING !", extractor.getSubChannelName());
7171
}
7272

7373
@Test
7474
void testGetSubChannelAvatarUrl() throws ParsingException {
7575
assertEquals(
76-
"https://framatube.org/lazy-static/avatars/637753af-fcf2-4b61-88f9-b9857c953457.png",
76+
"https://framatube.org/lazy-static/avatars/e801ccce-8694-4309-b0ab-e6f0e552ef77.png",
7777
extractor.getSubChannelAvatarUrl());
7878
}
7979
}

0 commit comments

Comments
 (0)