@@ -5,6 +5,8 @@ import ProjectM36.Server.WebSocket
55import ProjectM36.Server.Config
66import ProjectM36.Server
77import ProjectM36.Client
8+import ProjectM36.Base
9+
810import Network.Socket
911import Control.Exception
1012import Control.Concurrent
@@ -12,7 +14,6 @@ import System.Exit
1214import Data.Typeable
1315import Data.Text hiding (map)
1416import Data.Aeson
15−import ProjectM36.Base
1617import qualified Data.Map as M
1718import qualified Data.ByteString.Lazy as BS
1819import ProjectM36.Relation
@@ -90,14 +91,16 @@ testTutorialD port dbname = TestCase $ basicConnectionWithDatabase port dbname t
9091
9192 testtutd conn = do
9293 discardPromptInfo conn
93− WS.sendTextData conn ("executetutd:" `append` ":showexpr true")
94+ WS.sendTextData conn ("executetutd/json:" `append` ":showexpr true")
9495 discardPromptInfo conn
9596 discardPromptInfo conn
9697
9798 --receive relation response
9899 response <- WS.receiveData conn :: IO BS.ByteString
99− let decoded = decode response :: Maybe (M.Map Text Relation)
100−
101− case decoded of
102− Just val -> assertEqual "round-trip true relation" (M.lookup "displayrelation" val) (Just relationTrue) >> WS.sendClose conn ("test close"::Text)
103− Nothing -> assertFailure ("failed to decode relation from: " ++ show response)
100+ let decoded = decode response :: Maybe (M.Map Text (M.Map Text Relation))
101+ case decoded of
102+ Nothing -> assertFailure "failed to decode"
103+ Just decoded' -> do
104+ assertEqual "round-trip true relation" ((decoded' M.! "displayrelation") M.! "json") relationTrue
105+ WS.sendClose conn ("test close" :: Text)
106+