mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-04-21 12:12:38 +02:00
Code Issues Releases Wiki Activity

remove deprecated assertTrue

Browse Source
This commit is contained in:
soloturn 2020-07-29 09:21:51 +02:00
parent 6a47a393fc
commit 652383640a
4 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/com/rarchives/ripme/tst/ripper/rippers/HitomiRipperTest.java
View File

@ -5,6 +5,7 @@ import java.net.URL;
import com.rarchives.ripme.ripper.rippers.HitomiRipper;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@ -14,6 +15,6 @@ public class HitomiRipperTest extends RippersTest {
public void testRip() throws IOException {
HitomiRipper ripper = new HitomiRipper(new URL("https://hitomi.la/galleries/975973.html"));
testRipper(ripper);
assertTrue(ripper.getGID(new URL("https://hitomi.la/galleries/975973.html")).equals("975973"));
Assertions.assertTrue(ripper.getGID(new URL("https://hitomi.la/galleries/975973.html")).equals("975973"));
}
}

4
src/test/java/com/rarchives/ripme/tst/ripper/rippers/RedgifsRipperTest.java
View File

@ -49,8 +49,8 @@ public class RedgifsRipperTest extends RippersTest {
Document doc = ripper.getFirstPage();
doc = ripper.getNextPage(doc);
assertTrue("https://napi.redgifs.com/v1/gfycats/search?search_text=little%20caprice&count=150&start=150".equalsIgnoreCase(doc.location()));
Assertions.assertTrue("https://napi.redgifs.com/v1/gfycats/search?search_text=little%20caprice&count=150&start=150".equalsIgnoreCase(doc.location()));
doc = ripper.getNextPage(doc);
assertTrue("https://napi.redgifs.com/v1/gfycats/search?search_text=little%20caprice&count=150&start=300".equalsIgnoreCase(doc.location()));
Assertions.assertTrue("https://napi.redgifs.com/v1/gfycats/search?search_text=little%20caprice&count=150&start=300".equalsIgnoreCase(doc.location()));
}
}

31
src/test/java/com/rarchives/ripme/tst/ripper/rippers/RippersTest.java
View File

@ -22,7 +22,7 @@ public class RippersTest {
private final Logger logger = Logger.getLogger(RippersTest.class);
public void testStub() {
assertTrue("RippersTest must contain at lease one test.", true);
Assertions.assertTrue(true, "RippersTest must contain at lease one test.");
}
void testRipper(AbstractRipper ripper) {
@ -36,18 +36,18 @@ public class RippersTest {
ripper.setup();
ripper.markAsTest();
ripper.rip();
assertTrue("Failed to download a single file from " + ripper.getURL(),
ripper.getWorkingDir().listFiles().length >= 1);
Assertions.assertTrue(ripper.getWorkingDir().listFiles().length >= 1,
"Failed to download a single file from " + ripper.getURL());
} catch (IOException e) {
if (e.getMessage().contains("Ripping interrupted")) {
// We expect some rips to get interrupted
} else {
e.printStackTrace();
fail("Failed to rip " + ripper.getURL() + " : " + e.getMessage());
Assertions.fail("Failed to rip " + ripper.getURL() + " : " + e.getMessage());
}
} catch (Exception e) {
e.printStackTrace();
fail("Failed to rip " + ripper.getURL() + " : " + e.getMessage());
Assertions.fail("Failed to rip " + ripper.getURL() + " : " + e.getMessage());
} finally {
deleteDir(ripper.getWorkingDir());
}
@ -69,17 +69,17 @@ public class RippersTest {
ripper.setup();
ripper.markAsTest();
List<String> foundUrls = ripper.getURLsFromPage(ripper.getFirstPage());
assertTrue("Failed to find single url on page " + ripper.getURL(), foundUrls.size() >= 1);
Assertions.assertTrue(foundUrls.size() >= 1, "Failed to find single url on page " + ripper.getURL());
} catch (IOException e) {
if (e.getMessage().contains("Ripping interrupted")) {
// We expect some rips to get interrupted
} else {
e.printStackTrace();
fail("Failed to rip " + ripper.getURL() + " : " + e.getMessage());
Assertions.fail("Failed to rip " + ripper.getURL() + " : " + e.getMessage());
}
} catch (Exception e) {
e.printStackTrace();
fail("Failed to rip " + ripper.getURL() + " : " + e.getMessage());
Assertions.fail("Failed to rip " + ripper.getURL() + " : " + e.getMessage());
} finally {
deleteDir(ripper.getWorkingDir());
}
@ -126,21 +126,6 @@ public class RippersTest {
}
}
@Deprecated
void fail(String message) {
Assertions.fail(message);
}
@Deprecated
void assertTrue(boolean condition) {
Assertions.assertTrue(condition);
}
@Deprecated
void assertTrue(String failMessage, boolean condition) {
Assertions.assertTrue(condition, failMessage);
}
@Deprecated
void assertFalse(String message, boolean condition) {
Assertions.assertFalse(condition, message);

5
src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
View File

@ -9,6 +9,7 @@ import com.rarchives.ripme.ripper.VideoRipper;
import com.rarchives.ripme.ripper.rippers.video.PornhubRipper;
import com.rarchives.ripme.ripper.rippers.video.YuvutuRipper;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@ -28,9 +29,9 @@ public class VideoRippersTest extends RippersTest {
// Video ripper testing is... weird.
// If the ripper finds the URL to download the video, and it's a test,
// then the ripper sets the download URL as the ripper's URL.
assertFalse("Failed to find download url for " + oldURL, oldURL.equals(ripper.getURL()));
Assertions.assertFalse(oldURL.equals(ripper.getURL()), "Failed to find download url for " + oldURL);
} catch (Exception e) {
fail("Error while ripping " + ripper.getURL() + " : " + e);
Assertions.fail("Error while ripping " + ripper.getURL() + " : " + e);
e.printStackTrace();
} finally {
deleteDir(ripper.getWorkingDir());