use tagged JSON on android, update tests (#321)

tests/MobileTests.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE NamedFieldPuns #-}
 
 module MobileTests where
@@ -16,13 +17,32 @@ mobileTests = do
     it "start new chat with existing user" testChatApi
 
 noActiveUser :: String
+#if defined(IOS)
 noActiveUser = "{\"resp\":{\"chatCmdError\":{\"chatError\":{\"error\":{\"errorType\":{\"noActiveUser\":{}}}}}}}"
+#else
+noActiveUser = "{\"resp\":{\"type\":\"chatCmdError\",\"chatError\":{\"type\":\"error\",\"errorType\":{\"type\":\"noActiveUser\"}}}}"
+#endif
 
 activeUserExists :: String
+#if defined(IOS)
 activeUserExists = "{\"resp\":{\"chatCmdError\":{\"chatError\":{\"error\":{\"errorType\":{\"activeUserExists\":{}}}}}}}"
+#else
+activeUserExists = "{\"resp\":{\"type\":\"chatCmdError\",\"chatError\":{\"type\":\"error\",\"errorType\":{\"type\":\"activeUserExists\"}}}}"
+#endif
 
 activeUser :: String
+#if defined(IOS)
 activeUser = "{\"resp\":{\"activeUser\":{\"user\":{\"userId\":1,\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"displayName\":\"alice\",\"fullName\":\"Alice\"},\"activeUser\":true}}}}"
+#else
+activeUser = "{\"resp\":{\"type\":\"activeUser\",\"user\":{\"userId\":1,\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"displayName\":\"alice\",\"fullName\":\"Alice\"},\"activeUser\":true}}}"
+#endif
+
+chatStarted :: String
+#if defined(IOS)
+chatStarted = "{\"resp\":{\"chatStarted\":{}}}"
+#else
+chatStarted = "{\"resp\":{\"type\":\"chatStarted\"}}"
+#endif
 
 testChatApiNoUser :: IO ()
 testChatApiNoUser = withTmpFiles $ do
@@ -30,7 +50,7 @@ testChatApiNoUser = withTmpFiles $ do
   chatSendCmd cc "/u" `shouldReturn` noActiveUser
   chatSendCmd cc "/_start" `shouldReturn` noActiveUser
   chatSendCmd cc "/u alice Alice" `shouldReturn` activeUser
-  chatSendCmd cc "/_start" `shouldReturn` "{\"resp\":{\"chatStarted\":{}}}"
+  chatSendCmd cc "/_start" `shouldReturn` chatStarted
 
 testChatApi :: IO ()
 testChatApi = withTmpFiles $ do
@@ -40,4 +60,4 @@ testChatApi = withTmpFiles $ do
   cc <- chatInit testDBPrefix
   chatSendCmd cc "/u" `shouldReturn` activeUser
   chatSendCmd cc "/u alice Alice" `shouldReturn` activeUserExists
-  chatSendCmd cc "/_start" `shouldReturn` "{\"resp\":{\"chatStarted\":{}}}"
+  chatSendCmd cc "/_start" `shouldReturn` chatStarted