Move parsers to facebook folder (#1109)

4 files changed, 5 insertions, 11 deletions

diff --git a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbParseTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/facebook/parsers/FbParseTest.kt
index 8c568279..3307c72e 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbParseTest.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/facebook/parsers/FbParseTest.kt
@@ -1,10 +1,9 @@
-package com.pitchedapps.frost.facebook
+package com.pitchedapps.frost.facebook.parsers
 
 import com.pitchedapps.frost.internal.COOKIE
 import com.pitchedapps.frost.internal.assertComponentsNotEmpty
 import com.pitchedapps.frost.internal.assertDescending
 import com.pitchedapps.frost.internal.authDependent
-import com.pitchedapps.frost.parsers.*
 import org.junit.BeforeClass
 import org.junit.Test
 import kotlin.test.assertNotNull
diff --git a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbFullImageTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/facebook/requests/FbFullImageTest.kt
index 98dc7dda..291637c6 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbFullImageTest.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/facebook/requests/FbFullImageTest.kt
@@ -1,4 +1,4 @@
-package com.pitchedapps.frost.facebook
+package com.pitchedapps.frost.facebook.requests
 
 import com.pitchedapps.frost.facebook.requests.getFullSizedImage
 import com.pitchedapps.frost.facebook.requests.getFullSizedImageUrl
diff --git a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbRequestTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/facebook/requests/FbRequestTest.kt
index 07e02249..9899a018 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbRequestTest.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/facebook/requests/FbRequestTest.kt
@@ -1,10 +1,6 @@
-package com.pitchedapps.frost.facebook
+package com.pitchedapps.frost.facebook.requests
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.pitchedapps.frost.facebook.requests.getAuth
-import com.pitchedapps.frost.facebook.requests.getFullSizedImage
-import com.pitchedapps.frost.facebook.requests.getMenuData
-import com.pitchedapps.frost.facebook.requests.markNotificationRead
 import com.pitchedapps.frost.internal.AUTH
 import com.pitchedapps.frost.internal.COOKIE
 import com.pitchedapps.frost.internal.USER_ID
@@ -58,7 +54,7 @@ class FbRequestTest {
         val fbid = 10155966932992838L // google's current cover photo
         val url = AUTH.getFullSizedImage(fbid).invoke()
         println(url)
-        assertTrue(url?.startsWith("https://scontent") == true)
+        assertEquals(url?.startsWith("https://scontent"), true)
     }
 
     @Test
diff --git a/app/src/test/kotlin/com/pitchedapps/frost/internal/Internal.kt b/app/src/test/kotlin/com/pitchedapps/frost/internal/Internal.kt
index e3beabd2..81175b19 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/internal/Internal.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/internal/Internal.kt
@@ -42,7 +42,7 @@ val COOKIE: String by lazy { PROPS.getProperty("COOKIE") ?: "" }
 val USER_ID: Long by lazy { FB_USER_MATCHER.find(COOKIE)[1]?.toLong() ?: -1 }
 val AUTH: RequestAuth by lazy {
     COOKIE.getAuth().apply {
-        println("Auth:\nuser:$userId\nfb_dtsg: $fb_dtsg\nrev: $rev\nvalid: $isValid")
+        println("Auth:\nuser:$userId\nfb_dtsg: $fb_dtsg\nrev: $rev\ncomplete: $isComplete")
     }
 }
 
@@ -56,7 +56,6 @@ fun testJsoup(url: String) = frostJsoup(COOKIE, url)
 fun authDependent() {
     println("Auth Dependent")
     Assume.assumeTrue(COOKIE.isNotEmpty() && VALID_COOKIE)
-    Assume.assumeTrue(AUTH.isValid)
 }
 
 /**