Repository navigation
[MediaCCC] Fix regressions and improve MediaCCCLiveStreamKioskExtractor #1097
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
TobiGr
wants to merge
1
commit into
dev
Choose a base branch
from
ccc
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+341
−6
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
extractor/src/test/java/org/schabi/newpipe/downloader/MockOnly.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package org.schabi.newpipe.downloader; | ||
|
|
||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
|
|
||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
|
|
||
| /** | ||
| * Use this to annotate tests methods/classes that should only be run when the downloader is of type | ||
| * {@link DownloaderType#MOCK} or {@link DownloaderType#RECORDING}. This should be used when e.g. an | ||
| * extractor returns different results each time because the underlying service web page does so. In | ||
| * that case it makes sense to only run the tests with the mock downloader, since the real web page | ||
| * is not reliable, but we still want to make sure that the code correctly interprets the stored and | ||
| * mocked web page data. | ||
| * @see MockOnlyCondition | ||
| */ | ||
| @Retention(RetentionPolicy.RUNTIME) | ||
| @ExtendWith(MockOnlyCondition.class) | ||
| public @interface MockOnly { | ||
|
|
||
| /** | ||
| * The reason why the test is mockonly. | ||
| */ | ||
| String value(); | ||
| } |
21 changes: 21 additions & 0 deletions
21
extractor/src/test/java/org/schabi/newpipe/downloader/MockOnlyCondition.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package org.schabi.newpipe.downloader; | ||
|
|
||
| import org.junit.jupiter.api.extension.ConditionEvaluationResult; | ||
| import org.junit.jupiter.api.extension.ExecutionCondition; | ||
| import org.junit.jupiter.api.extension.ExtensionContext; | ||
|
|
||
| /** | ||
| * @see MockOnly | ||
| */ | ||
| public class MockOnlyCondition implements ExecutionCondition { | ||
| private static final String MOCK_ONLY_REASON = "Mock only"; | ||
|
|
||
| @Override | ||
| public ConditionEvaluationResult evaluateExecutionCondition(final ExtensionContext context) { | ||
| if (DownloaderFactory.getDownloaderType() == DownloaderType.REAL) { | ||
| return ConditionEvaluationResult.disabled(MOCK_ONLY_REASON); | ||
| } else { | ||
| return ConditionEvaluationResult.enabled(MOCK_ONLY_REASON); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
...ctor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCTestUtils.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package org.schabi.newpipe.extractor.services.media_ccc; | ||
|
|
||
| import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper; | ||
|
|
||
| public final class MediaCCCTestUtils { | ||
|
|
||
| /** | ||
| * Clears static MediaCCC states. | ||
| * | ||
| * <p> | ||
| * This method needs to be called in every class before running and recording mock tests. | ||
| * </p> | ||
| */ | ||
| public static void ensureStateless() { | ||
| MediaCCCParsingHelper.resetCachedLiveStreamInfo(); | ||
| } | ||
|
|
||
| } |
47 changes: 47 additions & 0 deletions
47
...r/services/media_ccc/mediaccclivestreamlistextractor/liveconference/generated_mock_0.json
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How MediaCCC's website displays paused rooms? I don't think hardcoding
- Pauseat the end of a room name is a good idea for localization purposes.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what else do you suggest? just remove it? Or use "Break"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know so let's use this for now :P