From fd5f2a82eb968b5d50f586925ebb705249062446 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Wed, 10 Jan 2018 22:13:28 -0500 Subject: Misc (#614) * Add locale log * Add flyweight design for authenticator * Add option to have instant messages only * Update interceptor * Add hd image model loader (#613) * Launch image view for view full image * Update changelog * Greatly improve ImageActivity loading * Update hashes * Add back keyword filter * Clean up --- .../com/pitchedapps/frost/facebook/FbRegexTest.kt | 8 +++++++ .../com/pitchedapps/frost/facebook/FbUrlTest.kt | 27 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) (limited to 'app/src/test/kotlin/com/pitchedapps/frost/facebook') diff --git a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbRegexTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbRegexTest.kt index a79ccf3f..08853466 100644 --- a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbRegexTest.kt +++ b/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbRegexTest.kt @@ -49,4 +49,12 @@ class FbRegexTest { val data = "\"uri\":\"$url\"}" assertEquals(url, FB_JSON_URL_MATCHER.find(data)[1]) } + + @Test + fun imageIdRegex() { + val id = 123456L + val img = "https://scontent-yyz1-1.xx.fbcdn.net/v/t31.0-8/fr/cp0/e15/q65/89056_${id}_98239_o.jpg" + assertEquals(id, FB_IMAGE_ID_MATCHER.find(img)[1]?.toLongOrNull()) + } + } \ No newline at end of file diff --git a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt index 62b7cac2..79d5ea64 100644 --- a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt +++ b/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt @@ -1,7 +1,10 @@ package com.pitchedapps.frost.facebook +import com.pitchedapps.frost.utils.isImageUrl import org.junit.Test import kotlin.test.assertEquals +import kotlin.test.assertFalse +import kotlin.test.assertTrue /** @@ -57,4 +60,28 @@ class FbUrlTest { assertFbFormat(expected, url) } + + @Test + fun imageRegex() { + arrayOf( + "https://scontent-yyz1-1.xx.fbcdn.net/v/t1.0-9/fr/cp0/e15/q65/229_546131_836546862_n.jpg?efg=e343J9&oh=d4245b1&oe=5453", + "/photo/view_full_size/?fbid=1523&ref_component=mbasic_photo_permalink&ref_page=%2Fwap%2Fphoto.php&refid=153&_ft_=...", + "#!/photo/view_full_size/?fbid=1523&ref_component=mbasic_photo_permalink&ref_page=%2Fwap%2Fphoto.php&refid=153&_ft_=..." + ).forEach { + assertTrue(it.isImageUrl, "Failed to match image for $it") + } + } + + @Test + fun antiImageRegex() { + arrayOf( + "http...fbcdn.net...mp4", + "/photo/...png", + "https://www.google.ca" + ).forEach { + assertFalse(it.isImageUrl, "Should not have matched image for $it") + } + + } + } \ No newline at end of file -- cgit v1.2.3