diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/NewPipe.java b/extractor/src/main/java/org/schabi/newpipe/extractor/NewPipe.java index 7d4eb6536..7e2906771 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/NewPipe.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/NewPipe.java @@ -25,9 +25,10 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException; import org.schabi.newpipe.extractor.localization.ContentCountry; import org.schabi.newpipe.extractor.localization.Localization; +import java.util.List; + import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.List; /** * Provides access to streaming services supported by NewPipe. @@ -92,24 +93,6 @@ public final class NewPipe { throw new ExtractionException("No service can handle the url = \"" + url + "\""); } - public static int getIdOfService(final String serviceName) { - try { - return getService(serviceName).getServiceId(); - } catch (final ExtractionException ignored) { - return -1; - } - } - - public static String getNameOfService(final int id) { - try { - return getService(id).getServiceInfo().getName(); - } catch (final Exception e) { - System.err.println("Service id not known"); - e.printStackTrace(); - return ""; - } - } - /*////////////////////////////////////////////////////////////////////////// // Localization //////////////////////////////////////////////////////////////////////////*/ diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/NewPipeTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/NewPipeTest.java index 5c7d3bbe7..127442b48 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/NewPipeTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/NewPipeTest.java @@ -1,14 +1,15 @@ package org.schabi.newpipe.extractor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.schabi.newpipe.extractor.NewPipe.getServiceByUrl; +import static org.schabi.newpipe.extractor.ServiceList.SoundCloud; +import static org.schabi.newpipe.extractor.ServiceList.YouTube; + import org.junit.jupiter.api.Test; import java.util.HashSet; -import static org.junit.jupiter.api.Assertions.*; -import static org.schabi.newpipe.extractor.NewPipe.getServiceByUrl; -import static org.schabi.newpipe.extractor.ServiceList.SoundCloud; -import static org.schabi.newpipe.extractor.ServiceList.YouTube; - public class NewPipeTest { @Test public void getAllServicesTest() throws Exception { @@ -17,8 +18,8 @@ public class NewPipeTest { @Test public void testAllServicesHaveDifferentId() throws Exception { - HashSet servicesId = new HashSet<>(); - for (StreamingService streamingService : NewPipe.getServices()) { + final HashSet servicesId = new HashSet<>(); + for (final StreamingService streamingService : NewPipe.getServices()) { final String errorMsg = "There are services with the same id = " + streamingService.getServiceId() + " (current service > " + streamingService.getServiceInfo().getName() + ")"; @@ -32,11 +33,6 @@ public class NewPipeTest { assertEquals(NewPipe.getService(YouTube.getServiceId()), YouTube); } - @Test - public void getServiceWithName() throws Exception { - assertEquals(NewPipe.getService(YouTube.getServiceInfo().getName()), YouTube); - } - @Test public void getServiceWithUrl() throws Exception { assertEquals(getServiceByUrl("https://www.youtube.com/watch?v=_r6CgaFNAGg"), YouTube); @@ -47,14 +43,4 @@ public class NewPipeTest { assertEquals(getServiceByUrl("https://soundcloud.com/pegboardnerds"), SoundCloud); assertEquals(getServiceByUrl("https://www.google.com/url?sa=t&url=https%3A%2F%2Fsoundcloud.com%2Fciaoproduction&rct=j&q=&esrc=s&source=web&cd="), SoundCloud); } - - @Test - public void getIdWithServiceName() throws Exception { - assertEquals(NewPipe.getIdOfService(YouTube.getServiceInfo().getName()), YouTube.getServiceId()); - } - - @Test - public void getServiceNameWithId() throws Exception { - assertEquals(NewPipe.getNameOfService(YouTube.getServiceId()), YouTube.getServiceInfo().getName()); - } }