mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-13 17:34:13 +02:00
Code Issues Releases Wiki Activity

new URI instead of new URL in tests, 8.

Browse Source
This commit is contained in:
soloturn
2023-06-13 07:00:21 +02:00
parent 78e6e7d51e
commit 3c8b677926
8 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java
View File

@@ -1,7 +1,8 @@
package com.rarchives.ripme.tst.ripper.rippers; package com.rarchives.ripme.tst.ripper.rippers;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URI;
import java.net.URISyntaxException;
import com.rarchives.ripme.ripper.rippers.EightmusesRipper; import com.rarchives.ripme.ripper.rippers.EightmusesRipper;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
@@ -11,25 +12,25 @@ import org.junit.jupiter.api.Test;
public class EightmusesRipperTest extends RippersTest { public class EightmusesRipperTest extends RippersTest {
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testEightmusesAlbum() throws IOException { public void testEightmusesAlbum() throws IOException, URISyntaxException {
// A simple image album // 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); testRipper(ripper);
// Test the new url format // 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); testRipper(ripper);
// Test pages with subalbums // 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); testRipper(ripper);
} }
@Test @Test
public void testGID() throws IOException { public void testGID() throws IOException, URISyntaxException {
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());
Assertions.assertEquals("Affect3D-Comics", ripper.getGID(new URL("https://www.8muses.com/comics/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore"))); 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 @Test
public void testGetSubdir() throws IOException { public void testGetSubdir() throws IOException, URISyntaxException {
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());
Assertions.assertEquals("After-Party-Issue-1", ripper.getSubdir("After Party - Issue 1")); Assertions.assertEquals("After-Party-Issue-1", ripper.getSubdir("After Party - Issue 1"));
} }
} }

1
src/test/java/com/rarchives/ripme/tst/ripper/rippers/EroShareRipperTest.java
View File

@@ -3,7 +3,6 @@ package com.rarchives.ripme.tst.ripper.rippers;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL;
import com.rarchives.ripme.ripper.rippers.EroShareRipper; import com.rarchives.ripme.ripper.rippers.EroShareRipper;
import com.rarchives.ripme.ripper.rippers.RedditRipper; import com.rarchives.ripme.ripper.rippers.RedditRipper;

29
src/test/java/com/rarchives/ripme/tst/ripper/rippers/EromeRipperTest.java
View File

@@ -1,7 +1,8 @@
package com.rarchives.ripme.tst.ripper.rippers; package com.rarchives.ripme.tst.ripper.rippers;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import com.rarchives.ripme.ripper.rippers.EromeRipper; import com.rarchives.ripme.ripper.rippers.EromeRipper;
@@ -10,39 +11,39 @@ import org.junit.jupiter.api.Test;
public class EromeRipperTest extends RippersTest { public class EromeRipperTest extends RippersTest {
@Test @Test
public void testGetGIDProfilePage() throws IOException { public void testGetGIDProfilePage() throws IOException, URISyntaxException {
URL url = new URL("https://www.erome.com/Jay-Jenna"); URL url = new URI("https://www.erome.com/Jay-Jenna").toURL();
EromeRipper ripper = new EromeRipper(url); EromeRipper ripper = new EromeRipper(url);
Assertions.assertEquals("Jay-Jenna", ripper.getGID(url)); Assertions.assertEquals("Jay-Jenna", ripper.getGID(url));
} }
@Test @Test
public void testGetGIDAlbum() throws IOException { public void testGetGIDAlbum() throws IOException, URISyntaxException {
URL url = new URL("https://www.erome.com/a/KbDAM1XT"); URL url = new URI("https://www.erome.com/a/KbDAM1XT").toURL();
EromeRipper ripper = new EromeRipper(url); EromeRipper ripper = new EromeRipper(url);
Assertions.assertEquals("KbDAM1XT", ripper.getGID(url)); Assertions.assertEquals("KbDAM1XT", ripper.getGID(url));
} }
@Test @Test
public void testGetAlbumsToQueue() throws IOException { public void testGetAlbumsToQueue() throws IOException, URISyntaxException {
URL url = new URL("https://www.erome.com/Jay-Jenna"); URL url = new URI("https://www.erome.com/Jay-Jenna").toURL();
EromeRipper ripper = new EromeRipper(url); EromeRipper ripper = new EromeRipper(url);
assert (2 >= ripper.getAlbumsToQueue(ripper.getFirstPage()).size()); assert (2 >= ripper.getAlbumsToQueue(ripper.getFirstPage()).size());
} }
@Test @Test
public void testPageContainsAlbums() throws IOException { public void testPageContainsAlbums() throws IOException, URISyntaxException {
URL url = new URL("https://www.erome.com/Jay-Jenna"); URL url = new URI("https://www.erome.com/Jay-Jenna").toURL();
EromeRipper ripper = new EromeRipper(url); EromeRipper ripper = new EromeRipper(url);
assert (ripper.pageContainsAlbums(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 { public void testRip() throws IOException, URISyntaxException {
URL url = new URL("https://www.erome.com/a/vlefBdsg"); URL url = new URI("https://www.erome.com/a/vlefBdsg").toURL();
EromeRipper ripper = new EromeRipper(url); EromeRipper ripper = new EromeRipper(url);
testRipper(ripper); testRipper(ripper);
} }
@Test @Test
public void testGetURLsFromPage() throws IOException { public void testGetURLsFromPage() throws IOException, URISyntaxException {
URL url = new URL("https://www.erome.com/a/Tak8F2h6"); URL url = new URI("https://www.erome.com/a/Tak8F2h6").toURL();
EromeRipper ripper = new EromeRipper(url); EromeRipper ripper = new EromeRipper(url);
assert (35 == ripper.getURLsFromPage(ripper.getFirstPage()).size()); assert (35 == ripper.getURLsFromPage(ripper.getFirstPage()).size());
} }

10
src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagevenueRipperTest.java
View File

@@ -1,6 +1,8 @@
package com.rarchives.ripme.tst.ripper.rippers; package com.rarchives.ripme.tst.ripper.rippers;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import com.rarchives.ripme.ripper.rippers.ImagevenueRipper; import com.rarchives.ripme.ripper.rippers.ImagevenueRipper;
@@ -12,15 +14,15 @@ import org.junit.jupiter.api.Test;
public class ImagevenueRipperTest extends RippersTest { public class ImagevenueRipperTest extends RippersTest {
@Test @Test
@Disabled("See https://github.com/RipMeApp/ripme/issues/1202") @Disabled("See https://github.com/RipMeApp/ripme/issues/1202")
public void testImagevenueRip() throws IOException { public void testImagevenueRip() throws IOException, URISyntaxException {
ImagevenueRipper ripper = new ImagevenueRipper( 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); testRipper(ripper);
} }
@Test @Test
public void testGetGID() throws IOException { public void testGetGID() throws IOException, URISyntaxException {
URL url = new URL("http://img120.imagevenue.com/galshow.php?gal=gallery_1373818527696_191lo"); URL url = new URI("http://img120.imagevenue.com/galshow.php?gal=gallery_1373818527696_191lo").toURL();
ImagevenueRipper ripper = new ImagevenueRipper(url); ImagevenueRipper ripper = new ImagevenueRipper(url);
Assertions.assertEquals("gallery_1373818527696_191lo", ripper.getGID(url)); Assertions.assertEquals("gallery_1373818527696_191lo", ripper.getGID(url));
} }

7
src/test/java/com/rarchives/ripme/tst/ripper/rippers/MastodonRipperTest.java
View File

@@ -1,7 +1,8 @@
package com.rarchives.ripme.tst.ripper.rippers; package com.rarchives.ripme.tst.ripper.rippers;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URI;
import java.net.URISyntaxException;
import com.rarchives.ripme.ripper.rippers.MastodonRipper; import com.rarchives.ripme.ripper.rippers.MastodonRipper;
import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tag;
@@ -10,8 +11,8 @@ import org.junit.jupiter.api.Test;
public class MastodonRipperTest extends RippersTest { public class MastodonRipperTest extends RippersTest {
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testRip() throws IOException { public void testRip() throws IOException, URISyntaxException {
MastodonRipper ripper = new MastodonRipper(new URL("https://mastodon.social/@pythonhub/media")); MastodonRipper ripper = new MastodonRipper(new URI("https://mastodon.social/@pythonhub/media").toURL());
testRipper(ripper); testRipper(ripper);
} }
} }

7
src/test/java/com/rarchives/ripme/tst/ripper/rippers/MastodonXyzRipperTest.java
View File

@@ -1,7 +1,8 @@
package com.rarchives.ripme.tst.ripper.rippers; package com.rarchives.ripme.tst.ripper.rippers;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URI;
import java.net.URISyntaxException;
import com.rarchives.ripme.ripper.rippers.MastodonXyzRipper; import com.rarchives.ripme.ripper.rippers.MastodonXyzRipper;
import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tag;
@@ -10,8 +11,8 @@ import org.junit.jupiter.api.Test;
public class MastodonXyzRipperTest extends RippersTest { public class MastodonXyzRipperTest extends RippersTest {
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testRip() throws IOException { public void testRip() throws IOException, URISyntaxException {
MastodonXyzRipper ripper = new MastodonXyzRipper(new URL("https://mastodon.xyz/@artwo/media")); MastodonXyzRipper ripper = new MastodonXyzRipper(new URI("https://mastodon.xyz/@artwo/media").toURL());
testRipper(ripper); testRipper(ripper);
} }
} }

11
src/test/java/com/rarchives/ripme/tst/ripper/rippers/MeituriRipperTest.java
View File

@@ -1,26 +1,27 @@
package com.rarchives.ripme.tst.ripper.rippers; package com.rarchives.ripme.tst.ripper.rippers;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import com.rarchives.ripme.ripper.rippers.MeituriRipper; import com.rarchives.ripme.ripper.rippers.MeituriRipper;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
public class MeituriRipperTest extends RippersTest { public class MeituriRipperTest extends RippersTest {
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testMeituriRip() throws IOException { public void testMeituriRip() throws IOException, URISyntaxException {
MeituriRipper ripper = new MeituriRipper(new URL("https://www.tujigu.com/a/14449/")); MeituriRipper ripper = new MeituriRipper(new URI("https://www.tujigu.com/a/14449/").toURL());
testRipper(ripper); testRipper(ripper);
} }
@Test @Test
public void testGetGID() throws IOException { public void testGetGID() throws IOException, URISyntaxException {
URL url = new URL("https://www.tujigu.com/a/14449/"); URL url = new URI("https://www.tujigu.com/a/14449/").toURL();
MeituriRipper ripper = new MeituriRipper(url); MeituriRipper ripper = new MeituriRipper(url);
Assertions.assertEquals("14449", ripper.getGID(url)); Assertions.assertEquals("14449", ripper.getGID(url));
} }

13
src/test/java/com/rarchives/ripme/tst/ripper/rippers/ModelmayhemRipperTest.java
View File

@@ -1,7 +1,8 @@
package com.rarchives.ripme.tst.ripper.rippers; package com.rarchives.ripme.tst.ripper.rippers;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URI;
import java.net.URISyntaxException;
import com.rarchives.ripme.ripper.rippers.ModelmayhemRipper; import com.rarchives.ripme.ripper.rippers.ModelmayhemRipper;
@@ -13,16 +14,16 @@ public class ModelmayhemRipperTest extends RippersTest {
@Test @Test
@Disabled("Broken ripper") @Disabled("Broken ripper")
public void testModelmayhemRip() throws IOException { public void testModelmayhemRip() throws IOException, URISyntaxException {
ModelmayhemRipper ripper = new ModelmayhemRipper( 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); testRipper(ripper);
} }
@Test @Test
public void testGetGID() throws IOException { public void testGetGID() throws IOException, URISyntaxException {
ModelmayhemRipper ripper = new ModelmayhemRipper( ModelmayhemRipper ripper = new ModelmayhemRipper(
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 URL("https://www.modelmayhem.com/portfolio/520206/viewall"))); Assertions.assertEquals("520206", ripper.getGID(new URI("https://www.modelmayhem.com/portfolio/520206/viewall").toURL()));
} }
} }