From 4bc8ae781229211355380733834d88e62cf55eb8 Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Mon, 18 Sep 2023 08:59:13 +0530 Subject: [PATCH] Use Locale.forLanguageTag() in tests --- .../media_ccc/MediaCCCStreamExtractorTest.java | 17 ++++++++--------- .../YoutubeStreamExtractorDefaultTest.java | 3 +-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java index b68ce9ff4..b350d6341 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java @@ -1,5 +1,10 @@ package org.schabi.newpipe.extractor.services.media_ccc; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.schabi.newpipe.extractor.ExtractorAsserts.assertContainsImageUrlInImageCollection; +import static org.schabi.newpipe.extractor.ServiceList.MediaCCC; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.schabi.newpipe.downloader.DownloaderTestImpl; @@ -10,19 +15,13 @@ import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCStream import org.schabi.newpipe.extractor.stream.AudioStream; import org.schabi.newpipe.extractor.stream.StreamExtractor; import org.schabi.newpipe.extractor.stream.StreamType; -import org.schabi.newpipe.extractor.utils.LocaleCompat; - -import javax.annotation.Nullable; import java.util.Arrays; import java.util.List; import java.util.Locale; import java.util.Objects; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.schabi.newpipe.extractor.ExtractorAsserts.assertContainsImageUrlInImageCollection; -import static org.schabi.newpipe.extractor.ServiceList.MediaCCC; +import javax.annotation.Nullable; /** * Test {@link MediaCCCStreamExtractor} @@ -96,7 +95,7 @@ public class MediaCCCStreamExtractorTest { super.testAudioStreams(); final List audioStreams = extractor.getAudioStreams(); assertEquals(2, audioStreams.size()); - final Locale expectedLocale = LocaleCompat.forLanguageTag("deu"); + final Locale expectedLocale = Locale.forLanguageTag("deu"); assertTrue(audioStreams.stream().allMatch(audioStream -> Objects.equals(audioStream.getAudioLocale(), expectedLocale))); } @@ -174,7 +173,7 @@ public class MediaCCCStreamExtractorTest { super.testAudioStreams(); final List audioStreams = extractor.getAudioStreams(); assertEquals(2, audioStreams.size()); - final Locale expectedLocale = LocaleCompat.forLanguageTag("eng"); + final Locale expectedLocale = Locale.forLanguageTag("eng"); assertTrue(audioStreams.stream().allMatch(audioStream -> Objects.equals(audioStream.getAudioLocale(), expectedLocale))); } diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java index 22b5f6f99..a209f3aa0 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java @@ -50,7 +50,6 @@ import org.schabi.newpipe.extractor.stream.Description; import org.schabi.newpipe.extractor.stream.StreamExtractor; import org.schabi.newpipe.extractor.stream.StreamSegment; import org.schabi.newpipe.extractor.stream.StreamType; -import org.schabi.newpipe.extractor.utils.LocaleCompat; import java.io.IOException; import java.net.MalformedURLException; @@ -560,7 +559,7 @@ public class YoutubeStreamExtractorDefaultTest { .anyMatch(audioStream -> "English original".equals(audioStream.getAudioTrackName()))); - final Locale hindiLocale = LocaleCompat.forLanguageTag("hi"); + final Locale hindiLocale = Locale.forLanguageTag("hi"); assertTrue(audioStreams.stream() .anyMatch(audioStream -> Objects.equals(audioStream.getAudioLocale(), hindiLocale)));