From 42d9400cac1ecc37796c7f4568a4923f81818ed7 Mon Sep 17 00:00:00 2001 From: soloturn Date: Tue, 13 Jun 2023 06:27:06 +0200 Subject: [PATCH] new URI instead of new URL in tests, 2. --- .../rippers/DynastyscansRipperTest.java | 13 ++++---- .../ripper/rippers/EroShareRipperTest.java | 30 ++++++++++--------- .../tst/ripper/rippers/ErofusRipperTest.java | 13 ++++---- .../tst/ripper/rippers/ErotivRipperTest.java | 14 +++++---- .../rippers/FemjoyhunterRipperTest.java | 9 +++--- 5 files changed, 43 insertions(+), 36 deletions(-) diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/DynastyscansRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/DynastyscansRipperTest.java index fb920545..a2855e98 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/DynastyscansRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/DynastyscansRipperTest.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.DynastyscansRipper; import org.junit.jupiter.api.Assertions; @@ -11,14 +12,14 @@ import org.junit.jupiter.api.Test; public class DynastyscansRipperTest extends RippersTest { @Test @Tag("flaky") - public void testRip() throws IOException { - DynastyscansRipper ripper = new DynastyscansRipper(new URL("https://dynasty-scans.com/chapters/under_one_roof_ch01")); + public void testRip() throws IOException, URISyntaxException { + DynastyscansRipper ripper = new DynastyscansRipper(new URI("https://dynasty-scans.com/chapters/under_one_roof_ch01").toURL()); testRipper(ripper); } @Test - public void testGetGID() throws IOException { - DynastyscansRipper ripper = new DynastyscansRipper(new URL("https://dynasty-scans.com/chapters/under_one_roof_ch01")); - Assertions.assertEquals("under_one_roof_ch01", ripper.getGID(new URL("https://dynasty-scans.com/chapters/under_one_roof_ch01"))); + public void testGetGID() throws IOException, URISyntaxException { + DynastyscansRipper ripper = new DynastyscansRipper(new URI("https://dynasty-scans.com/chapters/under_one_roof_ch01").toURL()); + Assertions.assertEquals("under_one_roof_ch01", ripper.getGID(new URI("https://dynasty-scans.com/chapters/under_one_roof_ch01").toURL())); } } 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 780460ce..2af1a11a 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 @@ -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.EroShareRipper; @@ -14,46 +16,46 @@ public class EroShareRipperTest extends RippersTest { // single image posts @Test @Disabled("https://github.com/RipMeApp/ripme/issues/306 : EroShareRipper broken (even for eroshae links)") - public void testImageEroshareFromRedditRip() throws IOException { - RedditRipper ripper = new RedditRipper(new URL( - "https://www.reddit.com/r/BestOfEroshare/comments/5z7foo/good_morning_who_likes_abstract_asian_artwork_f/")); + public void testImageEroshareFromRedditRip() throws IOException, URISyntaxException { + RedditRipper ripper = new RedditRipper(new URI( + "https://www.reddit.com/r/BestOfEroshare/comments/5z7foo/good_morning_who_likes_abstract_asian_artwork_f/").toURL()); testRipper(ripper); } @Test @Disabled("https://github.com/RipMeApp/ripme/issues/306 : EroShareRipper broken (even for eroshae links)") - public void testImageEroshareRip() throws IOException { - EroShareRipper ripper = new EroShareRipper(new URL("https://eroshare.com/i/5j2qln3f")); + public void testImageEroshareRip() throws IOException, URISyntaxException { + EroShareRipper ripper = new EroShareRipper(new URI("https://eroshare.com/i/5j2qln3f").toURL()); testRipper(ripper); } @Test @Disabled("https://github.com/RipMeApp/ripme/issues/306 : EroShareRipper broken (even for eroshae links)") - public void testImageEroshaeRip() throws IOException { - EroShareRipper ripper = new EroShareRipper(new URL("https://eroshae.com/i/5j2qln3f")); + public void testImageEroshaeRip() throws IOException, URISyntaxException { + EroShareRipper ripper = new EroShareRipper(new URI("https://eroshae.com/i/5j2qln3f").toURL()); testRipper(ripper); } // video album post @Test @Disabled("https://github.com/RipMeApp/ripme/issues/306 : EroShareRipper broken (even for eroshae links)") - public void testVideoAlbumFromRedditRip() throws IOException { - EroShareRipper ripper = new EroShareRipper(new URL( - "https://www.reddit.com/r/BestOfEroshare/comments/5vyfnw/asian_mf_heard_i_should_post_here_date_night_her/")); + public void testVideoAlbumFromRedditRip() throws IOException, URISyntaxException { + EroShareRipper ripper = new EroShareRipper(new URI( + "https://www.reddit.com/r/BestOfEroshare/comments/5vyfnw/asian_mf_heard_i_should_post_here_date_night_her/").toURL()); testRipper(ripper); } @Test @Disabled("https://github.com/RipMeApp/ripme/issues/306 : EroShareRipper broken (even for eroshae links)") - public void testVideoAlbumEroshareRip() throws IOException { - EroShareRipper ripper = new EroShareRipper(new URL("https://eroshare.com/wqnl6f00")); + public void testVideoAlbumEroshareRip() throws IOException, URISyntaxException { + EroShareRipper ripper = new EroShareRipper(new URI("https://eroshare.com/wqnl6f00").toURL()); testRipper(ripper); } @Test @Disabled("https://github.com/RipMeApp/ripme/issues/306 : EroShareRipper broken (even for eroshae links)") - public void testVideoAlbumEroshaeRip() throws IOException { - EroShareRipper ripper = new EroShareRipper(new URL("https://eroshae.com/wqnl6f00")); + public void testVideoAlbumEroshaeRip() throws IOException, URISyntaxException { + EroShareRipper ripper = new EroShareRipper(new URI("https://eroshae.com/wqnl6f00").toURL()); testRipper(ripper); } } diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErofusRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErofusRipperTest.java index 81192040..a06f0e70 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErofusRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErofusRipperTest.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.ErofusRipper; import org.junit.jupiter.api.Assertions; @@ -11,15 +12,15 @@ import org.junit.jupiter.api.Test; public class ErofusRipperTest extends RippersTest { @Test @Tag("flaky") // if url does not exist, erofusripper test ends in out of memory - public void testRip() throws IOException { - ErofusRipper ripper = new ErofusRipper(new URL("https://www.erofus.com/comics/be-story-club-comics/a-kiss/issue-1")); + public void testRip() throws IOException, URISyntaxException { + ErofusRipper ripper = new ErofusRipper(new URI("https://www.erofus.com/comics/be-story-club-comics/a-kiss/issue-1").toURL()); testRipper(ripper); } @Test @Tag("flaky") - public void testGetGID() throws IOException { - ErofusRipper ripper = new ErofusRipper(new URL("https://www.erofus.com/comics/be-story-club-comics/a-kiss/issue-1")); - Assertions.assertEquals("be-story-club-comics", ripper.getGID(new URL("https://www.erofus.com/comics/be-story-club-comics/a-kiss/issue-1"))); + public void testGetGID() throws IOException, URISyntaxException { + ErofusRipper ripper = new ErofusRipper(new URI("https://www.erofus.com/comics/be-story-club-comics/a-kiss/issue-1").toURL()); + Assertions.assertEquals("be-story-club-comics", ripper.getGID(new URI("https://www.erofus.com/comics/be-story-club-comics/a-kiss/issue-1").toURL())); } } diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErotivRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErotivRipperTest.java index b4afdd67..11f2b59f 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErotivRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErotivRipperTest.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.ErotivRipper; @@ -9,22 +11,22 @@ import org.junit.jupiter.api.Test; public class ErotivRipperTest extends RippersTest { @Test - public void testGetGID() throws IOException { - URL url = new URL("https://erotiv.io/e/1568314255"); + public void testGetGID() throws IOException, URISyntaxException { + URL url = new URI("https://erotiv.io/e/1568314255").toURL(); ErotivRipper ripper = new ErotivRipper(url); assert("1568314255".equals(ripper.getGID(url))); } - public void testRip() throws IOException { - URL url = new URL("https://erotiv.io/e/1568314255"); + public void testRip() throws IOException, URISyntaxException { + URL url = new URI("https://erotiv.io/e/1568314255").toURL(); ErotivRipper ripper = new ErotivRipper(url); testRipper(ripper); } @Test @Disabled("test or ripper broken") - public void testGetURLsFromPage() throws IOException { - URL url = new URL("https://erotiv.io/e/1568314255"); + public void testGetURLsFromPage() throws IOException, URISyntaxException { + URL url = new URI("https://erotiv.io/e/1568314255").toURL(); ErotivRipper ripper = new ErotivRipper(url); assert(1 == ripper.getURLsFromPage(ripper.getFirstPage()).size()); } diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FemjoyhunterRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FemjoyhunterRipperTest.java index 5520441a..ce1a221f 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FemjoyhunterRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FemjoyhunterRipperTest.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.FemjoyhunterRipper; @@ -9,9 +10,9 @@ import org.junit.jupiter.api.Test; public class FemjoyhunterRipperTest extends RippersTest { @Test - public void testRip() throws IOException { - FemjoyhunterRipper ripper = new FemjoyhunterRipper(new URL( - "https://www.femjoyhunter.com/alisa-i-got-nice-big-breasts-and-fine-ass-so-she-seems-to-be-a-hottest-brunette-5936/")); + public void testRip() throws IOException, URISyntaxException { + FemjoyhunterRipper ripper = new FemjoyhunterRipper(new URI( + "https://www.femjoyhunter.com/alisa-i-got-nice-big-breasts-and-fine-ass-so-she-seems-to-be-a-hottest-brunette-5936/").toURL()); testRipper(ripper); } } \ No newline at end of file