From 3c8b67792649a5a9f165dc649a57cd67aacb0950 Mon Sep 17 00:00:00 2001 From: soloturn Date: Tue, 13 Jun 2023 07:00:21 +0200 Subject: [PATCH] new URI instead of new URL in tests, 8. --- .../ripper/rippers/EightmusesRipperTest.java | 21 +++++++------- .../ripper/rippers/EroShareRipperTest.java | 1 - .../tst/ripper/rippers/EromeRipperTest.java | 29 ++++++++++--------- .../ripper/rippers/ImagevenueRipperTest.java | 10 ++++--- .../ripper/rippers/MastodonRipperTest.java | 7 +++-- .../ripper/rippers/MastodonXyzRipperTest.java | 7 +++-- .../tst/ripper/rippers/MeituriRipperTest.java | 11 +++---- .../ripper/rippers/ModelmayhemRipperTest.java | 13 +++++---- 8 files changed, 53 insertions(+), 46 deletions(-) diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java index 70799d96..2a016b66 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java @@ -1,7 +1,8 @@ package com.rarchives.ripme.tst.ripper.rippers; import java.io.IOException; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import com.rarchives.ripme.ripper.rippers.EightmusesRipper; import org.junit.jupiter.api.Assertions; @@ -11,25 +12,25 @@ import org.junit.jupiter.api.Test; public class EightmusesRipperTest extends RippersTest { @Test @Tag("flaky") - public void testEightmusesAlbum() throws IOException { + public void testEightmusesAlbum() throws IOException, URISyntaxException { // A simple image album - EightmusesRipper ripper = new EightmusesRipper(new URL("https://www.8muses.com/comix/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore")); + EightmusesRipper ripper = new EightmusesRipper(new URI("https://www.8muses.com/comix/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore").toURL()); testRipper(ripper); // Test the new url format - ripper = new EightmusesRipper(new URL("https://www.8muses.com/comics/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore")); + ripper = new EightmusesRipper(new URI("https://www.8muses.com/comics/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore").toURL()); testRipper(ripper); // Test pages with subalbums - ripper = new EightmusesRipper(new URL("https://www.8muses.com/comix/album/Blacknwhitecomics_com-Comix/BlacknWhiteComics/The-Mayor")); + ripper = new EightmusesRipper(new URI("https://www.8muses.com/comix/album/Blacknwhitecomics_com-Comix/BlacknWhiteComics/The-Mayor").toURL()); testRipper(ripper); } @Test - public void testGID() throws IOException { - EightmusesRipper ripper = new EightmusesRipper(new URL("https://www.8muses.com/comix/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore")); - Assertions.assertEquals("Affect3D-Comics", ripper.getGID(new URL("https://www.8muses.com/comics/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore"))); + public void testGID() throws IOException, URISyntaxException { + EightmusesRipper ripper = new EightmusesRipper(new URI("https://www.8muses.com/comix/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore").toURL()); + Assertions.assertEquals("Affect3D-Comics", ripper.getGID(new URI("https://www.8muses.com/comics/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore").toURL())); } @Test - public void testGetSubdir() throws IOException { - EightmusesRipper ripper = new EightmusesRipper(new URL("https://www.8muses.com/comix/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore")); + public void testGetSubdir() throws IOException, URISyntaxException { + EightmusesRipper ripper = new EightmusesRipper(new URI("https://www.8muses.com/comix/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore").toURL()); Assertions.assertEquals("After-Party-Issue-1", ripper.getSubdir("After Party - Issue 1")); } } \ No newline at end of file diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EroShareRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EroShareRipperTest.java index 2af1a11a..98d6be8f 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EroShareRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EroShareRipperTest.java @@ -3,7 +3,6 @@ package com.rarchives.ripme.tst.ripper.rippers; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.net.URL; import com.rarchives.ripme.ripper.rippers.EroShareRipper; import com.rarchives.ripme.ripper.rippers.RedditRipper; diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EromeRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EromeRipperTest.java index b18762e9..18ddf4bb 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EromeRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EromeRipperTest.java @@ -1,7 +1,8 @@ package com.rarchives.ripme.tst.ripper.rippers; import java.io.IOException; -import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import com.rarchives.ripme.ripper.rippers.EromeRipper; @@ -10,39 +11,39 @@ import org.junit.jupiter.api.Test; public class EromeRipperTest extends RippersTest { @Test - public void testGetGIDProfilePage() throws IOException { - URL url = new URL("https://www.erome.com/Jay-Jenna"); + public void testGetGIDProfilePage() throws IOException, URISyntaxException { + URL url = new URI("https://www.erome.com/Jay-Jenna").toURL(); EromeRipper ripper = new EromeRipper(url); Assertions.assertEquals("Jay-Jenna", ripper.getGID(url)); } @Test - public void testGetGIDAlbum() throws IOException { - URL url = new URL("https://www.erome.com/a/KbDAM1XT"); + public void testGetGIDAlbum() throws IOException, URISyntaxException { + URL url = new URI("https://www.erome.com/a/KbDAM1XT").toURL(); EromeRipper ripper = new EromeRipper(url); Assertions.assertEquals("KbDAM1XT", ripper.getGID(url)); } @Test - public void testGetAlbumsToQueue() throws IOException { - URL url = new URL("https://www.erome.com/Jay-Jenna"); + public void testGetAlbumsToQueue() throws IOException, URISyntaxException { + URL url = new URI("https://www.erome.com/Jay-Jenna").toURL(); EromeRipper ripper = new EromeRipper(url); assert (2 >= ripper.getAlbumsToQueue(ripper.getFirstPage()).size()); } @Test - public void testPageContainsAlbums() throws IOException { - URL url = new URL("https://www.erome.com/Jay-Jenna"); + public void testPageContainsAlbums() throws IOException, URISyntaxException { + URL url = new URI("https://www.erome.com/Jay-Jenna").toURL(); EromeRipper ripper = new EromeRipper(url); assert (ripper.pageContainsAlbums(url)); - assert (!ripper.pageContainsAlbums(new URL("https://www.erome.com/a/KbDAM1XT"))); + assert (!ripper.pageContainsAlbums(new URI("https://www.erome.com/a/KbDAM1XT").toURL())); } - public void testRip() throws IOException { - URL url = new URL("https://www.erome.com/a/vlefBdsg"); + public void testRip() throws IOException, URISyntaxException { + URL url = new URI("https://www.erome.com/a/vlefBdsg").toURL(); EromeRipper ripper = new EromeRipper(url); testRipper(ripper); } @Test - public void testGetURLsFromPage() throws IOException { - URL url = new URL("https://www.erome.com/a/Tak8F2h6"); + public void testGetURLsFromPage() throws IOException, URISyntaxException { + URL url = new URI("https://www.erome.com/a/Tak8F2h6").toURL(); EromeRipper ripper = new EromeRipper(url); assert (35 == ripper.getURLsFromPage(ripper.getFirstPage()).size()); } diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagevenueRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagevenueRipperTest.java index 43d211a7..f604d1f7 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagevenueRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagevenueRipperTest.java @@ -1,6 +1,8 @@ package com.rarchives.ripme.tst.ripper.rippers; import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import com.rarchives.ripme.ripper.rippers.ImagevenueRipper; @@ -12,15 +14,15 @@ import org.junit.jupiter.api.Test; public class ImagevenueRipperTest extends RippersTest { @Test @Disabled("See https://github.com/RipMeApp/ripme/issues/1202") - public void testImagevenueRip() throws IOException { + public void testImagevenueRip() throws IOException, URISyntaxException { ImagevenueRipper ripper = new ImagevenueRipper( - new URL("http://img120.imagevenue.com/galshow.php?gal=gallery_1373818527696_191lo")); + new URI("http://img120.imagevenue.com/galshow.php?gal=gallery_1373818527696_191lo").toURL()); testRipper(ripper); } @Test - public void testGetGID() throws IOException { - URL url = new URL("http://img120.imagevenue.com/galshow.php?gal=gallery_1373818527696_191lo"); + public void testGetGID() throws IOException, URISyntaxException { + URL url = new URI("http://img120.imagevenue.com/galshow.php?gal=gallery_1373818527696_191lo").toURL(); ImagevenueRipper ripper = new ImagevenueRipper(url); Assertions.assertEquals("gallery_1373818527696_191lo", ripper.getGID(url)); } diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MastodonRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MastodonRipperTest.java index def7525a..9e50e9a5 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MastodonRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MastodonRipperTest.java @@ -1,7 +1,8 @@ package com.rarchives.ripme.tst.ripper.rippers; import java.io.IOException; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import com.rarchives.ripme.ripper.rippers.MastodonRipper; import org.junit.jupiter.api.Tag; @@ -10,8 +11,8 @@ import org.junit.jupiter.api.Test; public class MastodonRipperTest extends RippersTest { @Test @Tag("flaky") - public void testRip() throws IOException { - MastodonRipper ripper = new MastodonRipper(new URL("https://mastodon.social/@pythonhub/media")); + public void testRip() throws IOException, URISyntaxException { + MastodonRipper ripper = new MastodonRipper(new URI("https://mastodon.social/@pythonhub/media").toURL()); testRipper(ripper); } } diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MastodonXyzRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MastodonXyzRipperTest.java index adbd09c0..0ad1b3f1 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MastodonXyzRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MastodonXyzRipperTest.java @@ -1,7 +1,8 @@ package com.rarchives.ripme.tst.ripper.rippers; import java.io.IOException; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import com.rarchives.ripme.ripper.rippers.MastodonXyzRipper; import org.junit.jupiter.api.Tag; @@ -10,8 +11,8 @@ import org.junit.jupiter.api.Test; public class MastodonXyzRipperTest extends RippersTest { @Test @Tag("flaky") - public void testRip() throws IOException { - MastodonXyzRipper ripper = new MastodonXyzRipper(new URL("https://mastodon.xyz/@artwo/media")); + public void testRip() throws IOException, URISyntaxException { + MastodonXyzRipper ripper = new MastodonXyzRipper(new URI("https://mastodon.xyz/@artwo/media").toURL()); testRipper(ripper); } } diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MeituriRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MeituriRipperTest.java index eb0970fd..441fd5c6 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MeituriRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MeituriRipperTest.java @@ -1,26 +1,27 @@ package com.rarchives.ripme.tst.ripper.rippers; import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import com.rarchives.ripme.ripper.rippers.MeituriRipper; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; public class MeituriRipperTest extends RippersTest { @Test @Tag("flaky") - public void testMeituriRip() throws IOException { - MeituriRipper ripper = new MeituriRipper(new URL("https://www.tujigu.com/a/14449/")); + public void testMeituriRip() throws IOException, URISyntaxException { + MeituriRipper ripper = new MeituriRipper(new URI("https://www.tujigu.com/a/14449/").toURL()); testRipper(ripper); } @Test - public void testGetGID() throws IOException { - URL url = new URL("https://www.tujigu.com/a/14449/"); + public void testGetGID() throws IOException, URISyntaxException { + URL url = new URI("https://www.tujigu.com/a/14449/").toURL(); MeituriRipper ripper = new MeituriRipper(url); Assertions.assertEquals("14449", ripper.getGID(url)); } diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ModelmayhemRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ModelmayhemRipperTest.java index 9e81102a..c8c10ce6 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ModelmayhemRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ModelmayhemRipperTest.java @@ -1,7 +1,8 @@ package com.rarchives.ripme.tst.ripper.rippers; import java.io.IOException; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import com.rarchives.ripme.ripper.rippers.ModelmayhemRipper; @@ -13,16 +14,16 @@ public class ModelmayhemRipperTest extends RippersTest { @Test @Disabled("Broken ripper") - public void testModelmayhemRip() throws IOException { + public void testModelmayhemRip() throws IOException, URISyntaxException { ModelmayhemRipper ripper = new ModelmayhemRipper( - new URL("https://www.modelmayhem.com/portfolio/520206/viewall")); + new URI("https://www.modelmayhem.com/portfolio/520206/viewall").toURL()); testRipper(ripper); } @Test - public void testGetGID() throws IOException { + public void testGetGID() throws IOException, URISyntaxException { ModelmayhemRipper ripper = new ModelmayhemRipper( - new URL("https://www.modelmayhem.com/portfolio/520206/viewall")); - Assertions.assertEquals("520206", ripper.getGID(new URL("https://www.modelmayhem.com/portfolio/520206/viewall"))); + new URI("https://www.modelmayhem.com/portfolio/520206/viewall").toURL()); + Assertions.assertEquals("520206", ripper.getGID(new URI("https://www.modelmayhem.com/portfolio/520206/viewall").toURL())); } }