Merge branch 'dev' of github.com:TeamNewPipe/NewPipeExtractor into audio-track-type

This commit is contained in:
ThetaDev 2023-03-21 00:48:23 +01:00
commit 6e5b6b76a2
2 changed files with 25 additions and 25 deletions

View File

@ -15,10 +15,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: set up JDK 8 - name: set up JDK 11
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: '8' java-version: '11'
distribution: 'temurin' distribution: 'temurin'
- name: Cache Gradle dependencies - name: Cache Gradle dependencies

View File

@ -48,7 +48,7 @@ public class PeertubeCommentsExtractorTest {
@Test @Test
void testGetCommentsFromCommentsInfo() throws IOException, ExtractionException { void testGetCommentsFromCommentsInfo() throws IOException, ExtractionException {
final String comment = "great video"; final String comment = "Thanks for creating such an informative video";
final CommentsInfo commentsInfo = final CommentsInfo commentsInfo =
CommentsInfo.getInfo("https://framatube.org/w/kkGMgK9ZtnKfYAgnEtQxbv"); CommentsInfo.getInfo("https://framatube.org/w/kkGMgK9ZtnKfYAgnEtQxbv");
@ -69,33 +69,33 @@ public class PeertubeCommentsExtractorTest {
@Test @Test
void testGetCommentsAllData() throws IOException, ExtractionException { void testGetCommentsAllData() throws IOException, ExtractionException {
InfoItemsPage<CommentsInfoItem> comments = extractor.getInitialPage(); extractor.getInitialPage()
for (CommentsInfoItem c : comments.getItems()) { .getItems()
assertFalse(Utils.isBlank(c.getUploaderUrl())); .forEach(commentsInfoItem -> {
assertFalse(Utils.isBlank(c.getUploaderName())); assertFalse(Utils.isBlank(commentsInfoItem.getUploaderUrl()));
assertFalse(Utils.isBlank(c.getUploaderAvatarUrl())); assertFalse(Utils.isBlank(commentsInfoItem.getUploaderName()));
assertFalse(Utils.isBlank(c.getCommentId())); assertFalse(Utils.isBlank(commentsInfoItem.getUploaderAvatarUrl()));
assertFalse(Utils.isBlank(c.getCommentText().getContent())); assertFalse(Utils.isBlank(commentsInfoItem.getCommentId()));
assertFalse(Utils.isBlank(c.getName())); assertFalse(Utils.isBlank(commentsInfoItem.getCommentText().getContent()));
assertFalse(Utils.isBlank(c.getTextualUploadDate())); assertFalse(Utils.isBlank(commentsInfoItem.getName()));
assertFalse(Utils.isBlank(c.getThumbnailUrl())); assertFalse(Utils.isBlank(commentsInfoItem.getTextualUploadDate()));
assertFalse(Utils.isBlank(c.getUrl())); assertFalse(Utils.isBlank(commentsInfoItem.getThumbnailUrl()));
assertEquals(-1, c.getLikeCount()); assertFalse(Utils.isBlank(commentsInfoItem.getUrl()));
assertTrue(Utils.isBlank(c.getTextualLikeCount())); assertEquals(-1, commentsInfoItem.getLikeCount());
} assertTrue(Utils.isBlank(commentsInfoItem.getTextualLikeCount()));
});
} }
private boolean findInComments(InfoItemsPage<CommentsInfoItem> comments, String comment) { private boolean findInComments(final InfoItemsPage<CommentsInfoItem> comments,
final String comment) {
return findInComments(comments.getItems(), comment); return findInComments(comments.getItems(), comment);
} }
private boolean findInComments(List<CommentsInfoItem> comments, String comment) { private boolean findInComments(final List<CommentsInfoItem> comments,
for (CommentsInfoItem c : comments) { final String comment) {
if (c.getCommentText().getContent().contains(comment)) { return comments.stream()
return true; .anyMatch(commentsInfoItem ->
} commentsInfoItem.getCommentText().getContent().contains(comment));
}
return false;
} }
} }