Skip to content

Commit 4bc8ae7

Browse files
Use Locale.forLanguageTag() in tests
1 parent 90aed06 commit 4bc8ae7

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java

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

3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertTrue;
5+
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertContainsImageUrlInImageCollection;
6+
import static org.schabi.newpipe.extractor.ServiceList.MediaCCC;
7+
38
import org.junit.jupiter.api.BeforeAll;
49
import org.junit.jupiter.api.Test;
510
import org.schabi.newpipe.downloader.DownloaderTestImpl;
@@ -10,19 +15,13 @@
1015
import org.schabi.newpipe.extractor.stream.AudioStream;
1116
import org.schabi.newpipe.extractor.stream.StreamExtractor;
1217
import org.schabi.newpipe.extractor.stream.StreamType;
13-
import org.schabi.newpipe.extractor.utils.LocaleCompat;
14-
15-
import javax.annotation.Nullable;
1618

1719
import java.util.Arrays;
1820
import java.util.List;
1921
import java.util.Locale;
2022
import java.util.Objects;
2123

22-
import static org.junit.jupiter.api.Assertions.assertEquals;
23-
import static org.junit.jupiter.api.Assertions.assertTrue;
24-
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertContainsImageUrlInImageCollection;
25-
import static org.schabi.newpipe.extractor.ServiceList.MediaCCC;
24+
import javax.annotation.Nullable;
2625

2726
/**
2827
* Test {@link MediaCCCStreamExtractor}
@@ -96,7 +95,7 @@ public void testAudioStreams() throws Exception {
9695
super.testAudioStreams();
9796
final List<AudioStream> audioStreams = extractor.getAudioStreams();
9897
assertEquals(2, audioStreams.size());
99-
final Locale expectedLocale = LocaleCompat.forLanguageTag("deu");
98+
final Locale expectedLocale = Locale.forLanguageTag("deu");
10099
assertTrue(audioStreams.stream().allMatch(audioStream ->
101100
Objects.equals(audioStream.getAudioLocale(), expectedLocale)));
102101
}
@@ -174,7 +173,7 @@ public void testAudioStreams() throws Exception {
174173
super.testAudioStreams();
175174
final List<AudioStream> audioStreams = extractor.getAudioStreams();
176175
assertEquals(2, audioStreams.size());
177-
final Locale expectedLocale = LocaleCompat.forLanguageTag("eng");
176+
final Locale expectedLocale = Locale.forLanguageTag("eng");
178177
assertTrue(audioStreams.stream().allMatch(audioStream ->
179178
Objects.equals(audioStream.getAudioLocale(), expectedLocale)));
180179
}

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.schabi.newpipe.extractor.stream.StreamExtractor;
5151
import org.schabi.newpipe.extractor.stream.StreamSegment;
5252
import org.schabi.newpipe.extractor.stream.StreamType;
53-
import org.schabi.newpipe.extractor.utils.LocaleCompat;
5453

5554
import java.io.IOException;
5655
import java.net.MalformedURLException;
@@ -560,7 +559,7 @@ void testCheckAudioStreams() throws Exception {
560559
.anyMatch(audioStream ->
561560
"English original".equals(audioStream.getAudioTrackName())));
562561

563-
final Locale hindiLocale = LocaleCompat.forLanguageTag("hi");
562+
final Locale hindiLocale = Locale.forLanguageTag("hi");
564563
assertTrue(audioStreams.stream()
565564
.anyMatch(audioStream ->
566565
Objects.equals(audioStream.getAudioLocale(), hindiLocale)));

0 commit comments

Comments
 (0)