# HG changeset patch # User Paul Boddie # Date 1493821627 -7200 # Node ID 01f357cf9e9d884a6ff9a25908907dbc1e1b2fd0 # Parent 4d0950edf5f278b928de630a98e682d230d11762 Moved test data into separate files, making it possible to run individual tests. diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test1.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test1.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,9 @@ +Hello +{{{{#!wiki +A region + {{{ +Another +}}} +End +}}}} +XXX diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test10.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test10.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,9 @@ += Level 1 = +Text + == Level 2 Heading == +Text +Not == a heading == +== Not a heading == either += Mismatched heading == +== Another mismatched heading = +=== Heading __Underlined__ === diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test11.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test11.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,15 @@ +''Some'' emphasised text. ''Emphasised''''text''. + +'''Strong ''and italic'' text.''' + +''Italic and '''strong'''''. '''''Both'', strong'''. '''''Both''', italic''. + +'''Strong''''''text'''. + +Some `monospace` text. `Mono, '''strong'''`, __underlined__, __''under''lined__. + +H,,2,,O + CO,,2,, + +== e = mc^2^ == + +~+Larger...+~ and ~-smaller-~ diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test12.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test12.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,7 @@ +||<20%|2-2)^> Cell 1 || Cell 2 || +|| Cell 3 ||<#FF0000 width="15%"> Cell 4 || + +|| Not a table + || Also not a table +|| Almost a table || ... +|| A table, trailing space || diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test2.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test2.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,7 @@ +XXX + * Item 1 + * Item 1.1 + * Item 2 + . Item 3 + . Item 3.1 +XXX diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test3.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test3.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,5 @@ +XXX + a. Appendix + + i. Romanus eunt domus! + I. What did they do for us? diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test4.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test4.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,5 @@ + term:: item +not a term:: nor an item + term:: + :: item + ::non-item diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test5.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test5.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,9 @@ +Hello +{{{{#!xxx +A region +{{{ +Another +}}} +End +}}}} +XXX diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test6.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test6.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,7 @@ +Hello +{{{{ +Start +}}} +Still in region +}}}} +End diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test7.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test7.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,1 @@ +Hello {{{world}}} again diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test8.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test8.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,3 @@ +XXX + +YYY diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test9.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test9.txt Wed May 03 16:27:07 2017 +0200 @@ -0,0 +1,6 @@ +XXX +---- +YYY + ----still a rule +also still a rule---- +EOF diff -r 4d0950edf5f2 -r 01f357cf9e9d tests/test_parser.py --- a/tests/test_parser.py Wed May 03 00:32:46 2017 +0200 +++ b/tests/test_parser.py Wed May 03 16:27:07 2017 +0200 @@ -2,144 +2,38 @@ from moinformat import parse from moinformat.serialisers import serialise, HTMLSerialiser - -sl = [] - -sl.append("""\ -Hello -{{{{#!wiki -A region - {{{ -Another -}}} -End -}}}} -XXX -""") - -sl.append("""\ -XXX - * Item 1 - * Item 1.1 - * Item 2 - . Item 3 - . Item 3.1 -XXX -""") - -sl.append("""\ -XXX - a. Appendix - - i. Romanus eunt domus! - I. What did they do for us? -""") +from glob import glob +from os.path import join, split +import sys -sl.append("""\ - term:: item -not a term:: nor an item - term:: - :: item - ::non-item -""") +dirname = split(sys.argv[0])[0] -sl.append("""\ -Hello -{{{{#!xxx -A region -{{{ -Another -}}} -End -}}}} -XXX -""") - -sl.append("""\ -Hello -{{{{ -Start -}}} -Still in region -}}}} -End -""") - -sl.append("""\ -Hello {{{world}}} again""") - -sl.append("""\ -XXX +def test_input(s): + d = parse(s) + o = serialise(d) -YYY""") - -sl.append("""\ -XXX ----- -YYY - ----still a rule -also still a rule---- -EOF""") - -sl.append("""\ -= Level 1 = -Text - == Level 2 Heading == -Text -Not == a heading == -== Not a heading == either -= Mismatched heading == -== Another mismatched heading = -=== Heading __Underlined__ === -""") - -sl.append("""\ -''Some'' emphasised text. ''Emphasised''''text''. - -'''Strong ''and italic'' text.''' - -''Italic and '''strong'''''. '''''Both'', strong'''. '''''Both''', italic''. - -'''Strong''''''text'''. - -Some `monospace` text. `Mono, '''strong'''`, __underlined__, __''under''lined__. - -H,,2,,O + CO,,2,, + print o == s + print "-" * 60 + print o + if o != s: + print "-" * 60 + print s + print "-" * 60 + print serialise(d, HTMLSerialiser) + print "-" * 60 + print d.prettyprint() + print -== e = mc^2^ == - -~+Larger...+~ and ~-smaller-~ -""") - -sl.append("""\ -||<20%|2-2)^> Cell 1 || Cell 2 || -|| Cell 3 ||<#FF0000 width="15%"> Cell 4 || - -|| Not a table - || Also not a table -|| Almost a table || ... -|| A table, trailing space || -""") - -dl = map(parse, sl) -nl = map(serialise, dl) +if __name__ == "__main__": + filenames = sys.argv[1:] or glob(join(dirname, "test*.txt")) + filenames.sort() -for s, n in zip(sl, nl): - print n == s - print "----" - print n - print "----" - -for d in dl: - print - print "----" - print serialise(d, HTMLSerialiser) - print "----" - -for d in dl: - print - print "----" - print d.prettyprint() - print "----" + for filename in filenames: + f = open(filename) + try: + print filename + test_input(f.read()) + finally: + f.close() # vim: tabstop=4 expandtab shiftwidth=4