@@ -14,8 +14,14 @@ main = do
14testTutdImport :: Test
14testTutdImport :: Test
15testTutdImport = TestCase $
15testTutdImport = TestCase $
16 withSystemTempFile "m.tutd" $ \tempPath handle -> do
16 withSystemTempFile "m.tutd" $ \tempPath handle -> do
17− hPutStrLn handle "x:=relation{tuple{a 5,b \"spam\"}}"
17+ hPutStrLn handle "x:=relation{tuple{a 5,b \"spam\"}}; y:=relation{tuple{b \"漢字\"}}"
18 hClose handle
18 hClose handle
19+ let expectedExpr = MultipleExpr [
20+ Assign "x" (MakeRelationFromExprs Nothing
19− let expectedExpr = MultipleExpr [Assign "x" (MakeRelationFromExprs Nothing [TupleExpr (M.fromList [("a",NakedAtomExpr $ IntegerAtom 5),("b",NakedAtomExpr $ TextAtom "spam")])])]
21+ [TupleExpr (M.fromList [("a", NakedAtomExpr $ IntegerAtom 5),
22+ ("b", NakedAtomExpr $ TextAtom "spam")])]),
23+ Assign "y" (MakeRelationFromExprs Nothing
24+ [TupleExpr (M.fromList [("b", NakedAtomExpr (TextAtom "漢字"))])])]
20 imported <- importTutorialD tempPath
25 imported <- importTutorialD tempPath
21 assertEqual "import tutd" (Right expectedExpr) imported
26 assertEqual "import tutd" (Right expectedExpr) imported