mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-21 05:01:30 +02:00
Code Issues Releases Wiki Activity

new URI instead of new URL in tests, 11.

Browse Source
This commit is contained in:
soloturn
2023-06-13 07:50:47 +02:00
parent 589d7eb5a5
commit d501578a8e
10 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/test/java/com/rarchives/ripme/tst/ripper/rippers/PhotobucketRipperTest.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.PhotobucketRipper; import com.rarchives.ripme.ripper.rippers.PhotobucketRipper;
@@ -13,9 +15,9 @@ public class PhotobucketRipperTest extends RippersTest {
@Test @Test
@Disabled("https://github.com/RipMeApp/ripme/issues/229 : Disabled test (temporary) : BasicRippersTest#testPhotobucketRip (timing out)") @Disabled("https://github.com/RipMeApp/ripme/issues/229 : Disabled test (temporary) : BasicRippersTest#testPhotobucketRip (timing out)")
public void testPhotobucketRip() throws IOException { public void testPhotobucketRip() throws IOException, URISyntaxException {
PhotobucketRipper ripper = new PhotobucketRipper( PhotobucketRipper ripper = new PhotobucketRipper(
new URL("http://s844.photobucket.com/user/SpazzySpizzy/library/Album%20Covers?sort=3&page=1")); new URI("http://s844.photobucket.com/user/SpazzySpizzy/library/Album%20Covers?sort=3&page=1").toURL());
testRipper(ripper); testRipper(ripper);
deleteSubdirs(ripper.getWorkingDir()); deleteSubdirs(ripper.getWorkingDir());
deleteDir(ripper.getWorkingDir()); deleteDir(ripper.getWorkingDir());
@@ -23,12 +25,12 @@ public class PhotobucketRipperTest extends RippersTest {
@Test @Test
@Disabled("new test, still disabled out because of the issue above, since this test also involves network IO.") @Disabled("new test, still disabled out because of the issue above, since this test also involves network IO.")
public void testGetNextPage() throws IOException { public void testGetNextPage() throws IOException, URISyntaxException {
// this album should have more than enough sub-albums and pages // this album should have more than enough sub-albums and pages
// to serve as a pretty good iteration test (barring server or // to serve as a pretty good iteration test (barring server or
// network errors) // network errors)
String baseURL = "http://s1255.photobucket.com/user/mimajki/library/Movie%20gifs?sort=6&page=1"; String baseURL = "http://s1255.photobucket.com/user/mimajki/library/Movie%20gifs?sort=6&page=1";
URL url = new URL(baseURL); URL url = new URI(baseURL).toURL();
PhotobucketRipper ripper = new PhotobucketRipper(url); PhotobucketRipper ripper = new PhotobucketRipper(url);
org.jsoup.nodes.Document page = ripper.getFirstPage(); org.jsoup.nodes.Document page = ripper.getFirstPage();
// NOTE: number of pages remaining includes the subalbums // NOTE: number of pages remaining includes the subalbums
@@ -47,17 +49,17 @@ public class PhotobucketRipperTest extends RippersTest {
} }
@Test @Test
public void testGetGID() throws IOException { public void testGetGID() throws IOException, URISyntaxException {
URL url = new URL( URL url = new URI(
"http://s732.photobucket.com/user/doublesix66/library/Army%20Painter%20examples?sort=3&page=1"); "http://s732.photobucket.com/user/doublesix66/library/Army%20Painter%20examples?sort=3&page=1").toURL();
PhotobucketRipper ripper = new PhotobucketRipper(url); PhotobucketRipper ripper = new PhotobucketRipper(url);
Assertions.assertEquals("doublesix66", ripper.getGID(url)); Assertions.assertEquals("doublesix66", ripper.getGID(url));
url = new URL( url = new URI(
"http://s732.photobucket.com/user/doublesix66/library/Army%20Painter%20examples/Painting%20examples?page=1&sort=3"); "http://s732.photobucket.com/user/doublesix66/library/Army%20Painter%20examples/Painting%20examples?page=1&sort=3").toURL();
Assertions.assertEquals("doublesix66", ripper.getGID(url)); Assertions.assertEquals("doublesix66", ripper.getGID(url));
url = new URL("http://s844.photobucket.com/user/SpazzySpizzy/library/Album%20Covers"); url = new URI("http://s844.photobucket.com/user/SpazzySpizzy/library/Album%20Covers").toURL();
Assertions.assertEquals("SpazzySpizzy", ripper.getGID(url)); Assertions.assertEquals("SpazzySpizzy", ripper.getGID(url));
url = new URL("http://s844.photobucket.com/user/SpazzySpizzy/library"); url = new URI("http://s844.photobucket.com/user/SpazzySpizzy/library").toURL();
Assertions.assertEquals("SpazzySpizzy", ripper.getGID(url)); Assertions.assertEquals("SpazzySpizzy", ripper.getGID(url));
} }
} }

11
src/test/java/com/rarchives/ripme/tst/ripper/rippers/PichunterRipperTest.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.PichunterRipper; import com.rarchives.ripme.ripper.rippers.PichunterRipper;
@@ -11,18 +12,18 @@ import org.junit.jupiter.api.Test;
public class PichunterRipperTest extends RippersTest { public class PichunterRipperTest extends RippersTest {
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testPichunterModelPageRip() throws IOException { public void testPichunterModelPageRip() throws IOException, URISyntaxException {
// A non-photoset // A non-photoset
PichunterRipper ripper = new PichunterRipper(new URL("https://www.pichunter.com/models/Madison_Ivy")); PichunterRipper ripper = new PichunterRipper(new URI("https://www.pichunter.com/models/Madison_Ivy").toURL());
testRipper(ripper); testRipper(ripper);
} }
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testPichunterGalleryRip() throws IOException { public void testPichunterGalleryRip() throws IOException, URISyntaxException {
// a photo set // a photo set
PichunterRipper ripper = new PichunterRipper( PichunterRipper ripper = new PichunterRipper(
new URL("http://www.pichunter.com/gallery/3270642/Its_not_only_those_who")); new URI("http://www.pichunter.com/gallery/3270642/Its_not_only_those_who").toURL());
testRipper(ripper); testRipper(ripper);
} }
} }

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

@@ -1,13 +1,14 @@
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.PorncomixRipper; import com.rarchives.ripme.ripper.rippers.PorncomixRipper;
public class PorncomixRipperTest extends RippersTest { public class PorncomixRipperTest extends RippersTest {
public void testPorncomixAlbum() throws IOException { public void testPorncomixAlbum() throws IOException, URISyntaxException {
PorncomixRipper ripper = new PorncomixRipper(new URL("http://www.porncomix.info/lust-unleashed-desire-to-submit/")); PorncomixRipper ripper = new PorncomixRipper(new URI("http://www.porncomix.info/lust-unleashed-desire-to-submit/").toURL());
testRipper(ripper); testRipper(ripper);
} }
} }

7
src/test/java/com/rarchives/ripme/tst/ripper/rippers/PorncomixinfoRipperTest.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.PorncomixinfoRipper; import com.rarchives.ripme.ripper.rippers.PorncomixinfoRipper;
import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tag;
@@ -10,8 +11,8 @@ import org.junit.jupiter.api.Test;
public class PorncomixinfoRipperTest extends RippersTest { public class PorncomixinfoRipperTest extends RippersTest {
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testRip() throws IOException { public void testRip() throws IOException, URISyntaxException {
PorncomixinfoRipper ripper = new PorncomixinfoRipper(new URL("https://porncomixinfo.net/chapter/alx-come-to-naught-down-in-flames-up-in-smoke-tracy-scops/alx-come-to-naught-down-in-flames-up-in-smoke-tracy-scops/")); PorncomixinfoRipper ripper = new PorncomixinfoRipper(new URI("https://porncomixinfo.net/chapter/alx-come-to-naught-down-in-flames-up-in-smoke-tracy-scops/alx-come-to-naught-down-in-flames-up-in-smoke-tracy-scops/").toURL());
testRipper(ripper); testRipper(ripper);
} }
} }

10
src/test/java/com/rarchives/ripme/tst/ripper/rippers/SinfestRipperTest.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.SinfestRipper; import com.rarchives.ripme.ripper.rippers.SinfestRipper;
@@ -11,14 +13,14 @@ import org.junit.jupiter.api.Test;
public class SinfestRipperTest extends RippersTest { public class SinfestRipperTest extends RippersTest {
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testRip() throws IOException { public void testRip() throws IOException, URISyntaxException {
SinfestRipper ripper = new SinfestRipper(new URL("http://sinfest.net/view.php?date=2000-01-17")); SinfestRipper ripper = new SinfestRipper(new URI("http://sinfest.net/view.php?date=2000-01-17").toURL());
testRipper(ripper); testRipper(ripper);
} }
@Test @Test
public void testGetGID() throws IOException { public void testGetGID() throws IOException, URISyntaxException {
URL url = new URL("http://sinfest.net/view.php?date=2000-01-17"); URL url = new URI("http://sinfest.net/view.php?date=2000-01-17").toURL();
SinfestRipper ripper = new SinfestRipper(url); SinfestRipper ripper = new SinfestRipper(url);
Assertions.assertEquals("2000-01-17", ripper.getGID(url)); Assertions.assertEquals("2000-01-17", ripper.getGID(url));
} }

10
src/test/java/com/rarchives/ripme/tst/ripper/rippers/SmuttyRipperTest.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.SmuttyRipper; import com.rarchives.ripme.ripper.rippers.SmuttyRipper;
@@ -11,14 +13,14 @@ import org.junit.jupiter.api.Test;
public class SmuttyRipperTest extends RippersTest { public class SmuttyRipperTest extends RippersTest {
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testRip() throws IOException { public void testRip() throws IOException, URISyntaxException {
SmuttyRipper ripper = new SmuttyRipper(new URL("https://smutty.com/user/QUIGON/")); SmuttyRipper ripper = new SmuttyRipper(new URI("https://smutty.com/user/QUIGON/").toURL());
testRipper(ripper); testRipper(ripper);
} }
@Test @Test
public void testGetGID() throws IOException { public void testGetGID() throws IOException, URISyntaxException {
URL url = new URL("https://smutty.com/user/QUIGON/"); URL url = new URI("https://smutty.com/user/QUIGON/").toURL();
SmuttyRipper ripper = new SmuttyRipper(url); SmuttyRipper ripper = new SmuttyRipper(url);
Assertions.assertEquals("QUIGON", ripper.getGID(url)); Assertions.assertEquals("QUIGON", ripper.getGID(url));
} }

7
src/test/java/com/rarchives/ripme/tst/ripper/rippers/SpankBangRipperTest.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.SpankbangRipper; import com.rarchives.ripme.ripper.rippers.SpankbangRipper;
import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tag;
@@ -10,8 +11,8 @@ import org.junit.jupiter.api.Test;
public class SpankBangRipperTest extends RippersTest { public class SpankBangRipperTest extends RippersTest {
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testSpankBangVideo() throws IOException { public void testSpankBangVideo() throws IOException, URISyntaxException {
SpankbangRipper ripper = new SpankbangRipper(new URL("https://spankbang.com/2a7fh/video/mdb901")); //most popular video of all time on site; should stay up SpankbangRipper ripper = new SpankbangRipper(new URI("https://spankbang.com/2a7fh/video/mdb901").toURL()); //most popular video of all time on site; should stay up
testRipper(ripper); testRipper(ripper);
} }

10
src/test/java/com/rarchives/ripme/tst/ripper/rippers/StaRipperTest.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.StaRipper; import com.rarchives.ripme.ripper.rippers.StaRipper;
@@ -12,15 +14,15 @@ import org.junit.jupiter.api.Test;
public class StaRipperTest extends RippersTest { public class StaRipperTest extends RippersTest {
@Test @Test
@Disabled("Ripper broken, Nullpointer exception") @Disabled("Ripper broken, Nullpointer exception")
public void testRip() throws IOException { public void testRip() throws IOException, URISyntaxException {
StaRipper ripper = new StaRipper(new URL("https://sta.sh/01umpyuxi4js")); StaRipper ripper = new StaRipper(new URI("https://sta.sh/01umpyuxi4js").toURL());
testRipper(ripper); testRipper(ripper);
} }
@Test @Test
@Disabled @Disabled
public void testGetGID() throws IOException { public void testGetGID() throws IOException, URISyntaxException {
URL url = new URL("https://sta.sh/01umpyuxi4js"); URL url = new URI("https://sta.sh/01umpyuxi4js").toURL();
StaRipper ripper = new StaRipper(url); StaRipper ripper = new StaRipper(url);
Assertions.assertEquals("01umpyuxi4js", ripper.getGID(url)); Assertions.assertEquals("01umpyuxi4js", ripper.getGID(url));
} }

7
src/test/java/com/rarchives/ripme/tst/ripper/rippers/StickyXXXRipperTest.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.video.StickyXXXRipper; import com.rarchives.ripme.ripper.rippers.video.StickyXXXRipper;
// import com.rarchives.ripme.tst.ripper.rippers.RippersTest; // import com.rarchives.ripme.tst.ripper.rippers.RippersTest;
@@ -9,10 +10,10 @@ import com.rarchives.ripme.utils.Utils;
public class StickyXXXRipperTest extends RippersTest { public class StickyXXXRipperTest extends RippersTest {
public void testStickyXXXVideo() throws IOException { public void testStickyXXXVideo() throws IOException, URISyntaxException {
// This test fails on the CI - possibly due to checking for a file before it's written - so we're skipping it // This test fails on the CI - possibly due to checking for a file before it's written - so we're skipping it
if (Utils.getConfigBoolean("test.run_flaky_tests", false)) { if (Utils.getConfigBoolean("test.run_flaky_tests", false)) {
StickyXXXRipper ripper = new StickyXXXRipper(new URL("http://www.stickyxxx.com/a-very-intense-farewell/")); StickyXXXRipper ripper = new StickyXXXRipper(new URI("http://www.stickyxxx.com/a-very-intense-farewell/").toURL());
testRipper(ripper); testRipper(ripper);
} }
} }

10
src/test/java/com/rarchives/ripme/tst/ripper/rippers/TeenplanetRipperTest.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.TeenplanetRipper; import com.rarchives.ripme.ripper.rippers.TeenplanetRipper;
@@ -11,14 +13,14 @@ import org.junit.jupiter.api.Test;
public class TeenplanetRipperTest extends RippersTest { public class TeenplanetRipperTest extends RippersTest {
@Test @Test
@Tag("flaky") @Tag("flaky")
public void testTeenplanetRip() throws IOException { public void testTeenplanetRip() throws IOException, URISyntaxException {
TeenplanetRipper ripper = new TeenplanetRipper(new URL("http://teenplanet.org/galleries/the-perfect-side-of-me-6588.html")); TeenplanetRipper ripper = new TeenplanetRipper(new URI("http://teenplanet.org/galleries/the-perfect-side-of-me-6588.html").toURL());
testRipper(ripper); testRipper(ripper);
} }
@Test @Test
public void testGetGID() throws IOException { public void testGetGID() throws IOException, URISyntaxException {
URL url = new URL("http://teenplanet.org/galleries/the-perfect-side-of-me-6588.html"); URL url = new URI("http://teenplanet.org/galleries/the-perfect-side-of-me-6588.html").toURL();
TeenplanetRipper ripper = new TeenplanetRipper(url); TeenplanetRipper ripper = new TeenplanetRipper(url);
Assertions.assertEquals("the-perfect-side-of-me-6588", ripper.getGID(url)); Assertions.assertEquals("the-perfect-side-of-me-6588", ripper.getGID(url));
} }