X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=tests%2FWikiParserTest.hs;h=a7c5c70087ecf9c41918ac06fdd847f94e4829d0;hb=7a4f13a3d483c950743e1ced001ade4406d239d3;hp=f6f642cd06651049f11bd175f6842e6ced75d370;hpb=ddf0b4d7ab2f1e141edbc7ef75d39853c0846f8c;p=Rakka.git

diff --git a/tests/WikiParserTest.hs b/tests/WikiParserTest.hs
index f6f642c..a7c5c70 100644
--- a/tests/WikiParserTest.hs
+++ b/tests/WikiParserTest.hs
@@ -206,44 +206,44 @@ testData = [ (parseWiki ""
 
            , (parseWiki "* a"
               ~?=
-              (Right [ List (ListElement Bullet [[Right (Text "a")]]) ]))
+              (Right [ List Bullet [[Inline (Text "a")]] ]))
 
            , (parseWiki "* a*"
               ~?=
-              (Right [ List (ListElement Bullet [[Right (Text "a*")]]) ]))
+              (Right [ List Bullet [[Inline (Text "a*")]] ]))
 
            , (parseWiki "* a\n* b\n"
               ~?=
-              (Right [ List (ListElement Bullet [ [Right (Text "a")]
-                                                , [Right (Text "b")]
-                                                ])
+              (Right [ List Bullet [ [Inline (Text "a")]
+                                   , [Inline (Text "b")]
+                                   ]
                      ]))
 
            , (parseWiki "*a\n*#b\n*#c\n"
               ~?=
-              (Right [ List (ListElement Bullet [ [ Right (Text "a")
-                                                  , Left (ListElement Numbered [ [Right (Text "b")]
-                                                                               , [Right (Text "c")]
-                                                                               ])
-                                                  ]
-                                                ])
+              (Right [ List Bullet [ [ Inline (Text "a")
+                                     , Block  (List Numbered [ [Inline (Text "b")]
+                                                             , [Inline (Text "c")]
+                                                             ])
+                                     ]
+                                   ]
                      ]))
 
            , (parseWiki "*a\n#b"
               ~?=
-              (Right [ List (ListElement Bullet   [ [Right (Text "a")] ])
-                     , List (ListElement Numbered [ [Right (Text "b")] ])
+              (Right [ List Bullet   [ [Inline (Text "a")] ]
+                     , List Numbered [ [Inline (Text "b")] ]
                      ]))
 
            , (parseWiki "*a<!-- comment -->"
               ~?=
-              (Right [ List (ListElement Bullet [ [Right (Text "a")] ]) ]))
+              (Right [ List Bullet [ [Inline (Text "a")] ] ]))
 
            , (parseWiki "*a<!-- comment -->\n*b"
               ~?=
-              (Right [ List (ListElement Bullet [ [Right (Text "a")]
-                                                , [Right (Text "b")]
-                                                ])
+              (Right [ List Bullet [ [Inline (Text "a")]
+                                   , [Inline (Text "b")]
+                                   ]
                      ]))
 
            , (parseWiki "foo:bar"
@@ -270,15 +270,15 @@ testData = [ (parseWiki ""
                                       ]
                      ]))
 
-           , (parseWiki "<![CDATA[foo [[bar]] baz]]>"
+           , (parseWiki "<!nowiki[foo [[bar]] baz]>"
               ~?=
               (Right [ Paragraph [ Text "foo [[bar]] baz" ] ]))
 
-           , (parseWiki "<![PDATA[foo [[bar]] baz]]>"
+           , (parseWiki "<!verbatim[foo [[bar]] baz]>"
               ~?=
               (Right [ Preformatted [ Text "foo [[bar]] baz" ] ]))
 
-           , (parseWiki "<![PDATA[\nfoo [[bar]] baz\n]]>"
+           , (parseWiki "<!verbatim[\nfoo [[bar]] baz\n]>"
               ~?=
               (Right [ Preformatted [ Text "foo [[bar]] baz" ] ]))