From 7746e63373c905faa6d7e45e45fffc48d3ffff85 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Thu, 3 Aug 2017 22:21:51 -0700
Subject: Add IM notifications, FAQ, video uploading, and geolocations (#107)

* Test canary

* Update activities to use kau base

* Update dependencies

* Cherry pick faq

* Update kau and add faq

* Add readme badges

* Add im notifications and video uploading

* Update theme

* Update and fix unit tests

* Add geolocation

* Prepare alpha test

* Remove explicit nonnull request
---
 .../kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'app/src/test/kotlin')

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 080132bd..950be495 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt
@@ -1,6 +1,5 @@
 package com.pitchedapps.frost.facebook
 
-import okhttp3.HttpUrl
 import org.junit.Test
 import kotlin.test.assertEquals
 
@@ -15,29 +14,30 @@ class FbUrlTest {
         assertEquals(expected, fbUrl.toString(), "FbUrl Mismatch:\n${fbUrl.toLogList().joinToString("\n\t")}")
     }
 
-    @Test
-    fun base() {
+    @Test fun base() {
         val url = "https://touch.facebook.com/relative/?asdf=1234&hjkl=7890"
         assertFbFormat(url, url)
     }
 
-    @Test
-    fun relative() {
+    @Test fun relative() {
         val url = "/relative/?asdf=1234&hjkl=7890"
         assertFbFormat("$FB_URL_BASE${url.substring(1)}", url)
     }
 
-    @Test
-    fun redirect() {
-        assertFbFormat("$FB_URL_BASE/relative/?asdf=1234&hjkl=7890", "https://touch.facebook.com/l.php?u=$FB_URL_BASE/relative/&asdf=1234&hjkl=7890")
+    @Test fun redirect() {
+        assertFbFormat("${FB_URL_BASE}relative/?asdf=1234&hjkl=7890", "https://touch.facebook.com/l.php?u=${FB_URL_BASE}relative/&asdf=1234&hjkl=7890")
     }
 
     @Test fun discard() {
-        val prefix = "$FB_URL_BASE/?test=1234"
+        val prefix = "$FB_URL_BASE?test=1234"
         val suffix = "&apple=notorange"
         assertFbFormat("$prefix$suffix", "$prefix&ref=hello$suffix")
     }
 
+    @Test fun doubleDash() {
+        assertFbFormat("${FB_URL_BASE}relative", "$FB_URL_BASE/relative")
+    }
+
     @Test fun css() {
         val expected = "https://test.com?efg=hi&oh=bye&oe=apple"
         val orig = "https\\3a //test.com?efg\\3d hi\\26 oh\\3d bye\\26 oe\\3d apple"
-- 
cgit v1.2.3