Index: trac/wiki/tests/wiki-tests.txt =================================================================== --- trac/wiki/tests/wiki-tests.txt (revision 2391) +++ trac/wiki/tests/wiki-tests.txt (working copy) @@ -13,6 +13,12 @@

Another paragraph

+------------------------------ += Heading 1 = +Paragraph + * Item 1 + * Item 2 +Another paragraph ============================== Paragraph ---- @@ -35,30 +41,44 @@

http://www.edgewall.com/

+------------------------------ +Paragraph +---- + 1. Item 1 + 2. Item 2 +||Table||cell|| +||Foo||Bar||Baz|| +http://www.edgewall.com/ ============================== #1, [1], r1, {1} ------------------------------

#1, [1], r1, {1}

+------------------------------ ============================== !#1, ![1], !r1, !{1} ------------------------------

#1, [1], r1, {1}

+------------------------------ +#1, [1], r1, {1} ============================== [1:2], r1:2, [12:23], r12:23 ------------------------------

[1:2], r1:2, [12:23], r12:23

+------------------------------ ============================== ![1:2], !r1:2, ![12:23], !r12:23 ------------------------------

[1:2], r1:2, [12:23], r12:23

+------------------------------ +[1:2], r1:2, [12:23], r12:23 ============================== ticket:1, changeset:1, report:1, source:foo/bar @@ -70,7 +90,29 @@

Issue 1, CS1, Listing 1, File foo/bar

+------------------------------ ============================== +Add-on to changeset:123: +Some change. + +ticket:1 +This ticket is the first one +------------------------------ +

+Add-on to changeset:123: +Some change. +

+

+ticket:1 +This ticket is the first one +

+------------------------------ +Add-on to changeset:123: +Some change. + +ticket:1 +This ticket is the first one +============================== [ticket:1 ticket 1], [changeset:1 changeset 1], [report:1 report 1], [source:foo/bar source foo/bar], [http://www.edgewall.com/ edgewall] ------------------------------ @@ -78,42 +120,51 @@ ticket 1, changeset 1, report 1, source foo/bar, edgewall

+------------------------------ ============================== CamelCase AlabamA ABc AlaBamA FooBar ------------------------------

CamelCase? AlabamA ABc AlaBamA FooBar?

+------------------------------ ============================== CamelCase,CamelCase.CamelCase:CamelCase ------------------------------

CamelCase?,CamelCase?.CamelCase:CamelCase

+------------------------------ ============================== !CamelCase ------------------------------

CamelCase

+------------------------------ ============================== http://localhost/bugzilla/show_bug.cgi?id=1284 804 ------------------------------

<bug>http://localhost/bugzilla/show_bug.cgi?id=1284</bug> 804

+------------------------------ ============================== ||http://example.com/img.png||text|| ------------------------------
http://example.com/img.pngtext
+------------------------------ +||http://example.com/img.png||text|| ============================== http://example.com/img.png?foo=bar ------------------------------

http://example.com/img.png?foo=bar

+------------------------------ +http://example.com/img.png?foo=bar ============================== in: || RPC# || parameter len || ..... parameter ..... || @@ -134,12 +185,19 @@ RPC# parameter len ..... parameter .....
+------------------------------ +in: +|| RPC# || parameter len || ..... parameter ..... || +out: +|| RPC# || parameter len || ..... parameter ..... || +---- ============================== ''RFCs von ftp://ftp.rfc-editor.org/in-notes/rfcXXXX.txt'' ------------------------------

RFCs von ftp://ftp.rfc-editor.org/in-notes/rfcXXXX.txt

+------------------------------ ============================== [wiki:WikiStart Foo] [http://www.edgewall.com/ Edgewall] @@ -161,6 +219,7 @@

*argv[] versus **argv?

+------------------------------ ============================== foo (FooBar) @@ -172,24 +231,32 @@

foo (FooBar? )

+------------------------------ ============================== == Heading with trailing white-space == ------------------------------

Heading with trailing white-space

+------------------------------ +== Heading with trailing white-space == ============================== == ''Formatted'' ~~Heading~~ == ------------------------------

Formatted Heading

+------------------------------ +== ''Formatted'' ~~Heading~~ == ============================== == [wiki:SandBox Linked Heading] == ------------------------------

Linked Heading?

+------------------------------ +== [wiki:SandBox Linked Heading] == ============================== A0B1, ST62T53C6, IR32V1H000 ------------------------------

A0B1, ST62T53C6, IR32V1H000

+------------------------------ ============================== Paragraph * foo bar @@ -212,18 +279,29 @@

Paragraph

+------------------------------ +Paragraph + * foo bar + boo baz + * Subitem + Subitem line 2 + * item 2 + item 2 line 2 +Paragraph ============================== '''ticket:1''', ''ticket:1'', ~~ticket:1~~, __ticket:1__ ------------------------------

ticket:1, ticket:1, ticket:1, ticket:1

+------------------------------ ============================== SandBox SandBox, SandBox; SandBox: SandBox. SandBox? SandBox! (SandBox) {SandBox} [SandBox] ------------------------------

SandBox? SandBox?, SandBox?; SandBox?: SandBox?. SandBox?? SandBox?! (SandBox?) {SandBox?} [SandBox?]

+------------------------------ ============================== source:/foo/bar source:/foo/bar#42 @@ -250,6 +328,7 @@ source:/foo/bar@42#L20 source:/foo/bar@head#L20

+------------------------------ ============================== query:?order=priority @@ -276,6 +355,7 @@

query:milestone=1.0|2.0&owner=me

+------------------------------ ============================== {{{ Preformatted text. @@ -283,6 +363,10 @@ ------------------------------ 
Preformatted text.
+------------------------------ +{{{ +Preformatted text. +}}} ============================== {{{ #!default @@ -291,6 +375,11 @@ ------------------------------ 
Preformatted text.
+------------------------------ +{{{ +#!default +Preformatted text. +}}} ============================== {{{ #!/bin/sh @@ -300,6 +389,11 @@ 
#!/bin/sh
 echo "foo"
+------------------------------ +{{{ +#!/bin/sh +echo "foo" +}}} ============================== {{{ #!html @@ -307,6 +401,11 @@ }}} ------------------------------

Hello World

+------------------------------ +{{{ +#!html +<p>Hello World</p> +}}} ============================== {{{ #!html @@ -318,6 +417,11 @@ 
<script>alert("");</script>
+------------------------------ +{{{ +#!html +<script>alert("");</script> +}}} ============================== {{{ #!html @@ -329,42 +433,59 @@ 
<div onclick="alert('')">Click me</div>
+------------------------------ +{{{ +#!html +<div onclick="alert()">Click me</div> +}}} ============================== ^superscript^, ,,subscript,,, normal. ------------------------------

superscript, subscript, normal.

+------------------------------ +superscript, subscript, normal. ============================== [[HelloWorld(hej hopp)]] ------------------------------

Hello World, args = hej hopp

+------------------------------ +[[HelloWorld(hej hopp)]] ============================== [[HelloWorld(hej hopp) ]] # This shouldnt executed as macro since it contain whitespace between ) and ] ------------------------------

[[HelloWorld(hej hopp) ]] # This shouldnt executed as macro since it contain whitespace between ) and ]

+------------------------------ +[[HelloWorld(hej hopp) ]] # This shouldnt executed as macro since it contain whitespace between ) and ] ============================== [[HelloWorld(hej hopp))]] # Extra right brace and still executed ------------------------------

Hello World, args = hej hopp) # Extra right brace and still executed

+------------------------------ +[[HelloWorld(hej hopp))]] # Extra right brace and still executed ============================== [[HelloWorld(hej hopp)]] [[HelloWorld(hej hopp2)]] # Test non greedy match ------------------------------

Hello World, args = hej hopp Hello World, args = hej hopp2 # Test non greedy match

+------------------------------ +[[HelloWorld(hej hopp)]] [[HelloWorld(hej hopp2)]] # Test non greedy match ============================== Inline [[html( Test )]] text ------------------------------

Inline Test text

+------------------------------ +Inline [[html(<B> Test </B>)]] text ============================== Test comment blocks {{{ @@ -375,60 +496,76 @@

Test comment blocks

+------------------------------ +Test comment blocks +{{{ +#!comment +This is simply removed from the output +}}} ============================== Inline [[comment(This should not be seen)]] comment ------------------------------

Inline comment

+------------------------------ +Inline [[comment(This should not be seen)]] comment ============================== This should be '''''bold and italic''''' ------------------------------

This should be bold and italic

+------------------------------ ============================== '''''one''''', '''''two''''', '''''three''''', '''''four''''' ------------------------------

one, two, three, four

+------------------------------ ============================== __~~underlineoversrike~~__ ------------------------------

underlineoversrike

+------------------------------ ============================== __~~overlapping__tags~~ ------------------------------

overlappingtags

+------------------------------ ============================== __~~outoforderclosetags__~~ ------------------------------

outoforderclosetags

+------------------------------ ============================== '''''bolditalic''' # Open italic should be closed before paragraph end ------------------------------

bolditalic # Open italic should be closed before paragraph end

+------------------------------ ============================== ''italic'''''bold''' ------------------------------

italicbold

+------------------------------ ============================== '''bold'''''italic'' ------------------------------

bolditalic

+------------------------------ ============================== '''''bold italic @@ -439,6 +576,7 @@ italic multiline

+------------------------------ ============================== '''''bold italic @@ -451,11 +589,14 @@ multiline without endtags

+------------------------------ ============================== term:: definition ------------------------------
term
definition
+------------------------------ +term:: definition ============================== complex topic:: multiline ''formatted'' @@ -465,6 +606,10 @@ formatted definition +------------------------------ +complex topic:: multiline + formatted + definition ============================== milestone:foo [milestone:boo Milestone Boo] @@ -473,6 +618,7 @@ milestone:foo Milestone Boo

+------------------------------ ============================== search:foo search:"foo bar" @@ -487,6 +633,7 @@ bar search

+------------------------------ ============================== search:?q=foo&wiki=on search:"?q=foo bar&wiki=on" @@ -497,12 +644,15 @@ search:"?q=foo bar&wiki=on" Bar in Tickets

+------------------------------ ============================== '''Note:''' ------------------------------

Note:

+------------------------------ +Note: ============================== ticket:1 ticket:12 @@ -525,6 +675,7 @@ ticket:"12" ticket:"123"

+------------------------------ ============================== Relative links are supported: [../parent See above] @@ -539,6 +690,7 @@ Our logo /

+------------------------------ ============================== source:'even with whitespaces' source:"even with whitespaces" @@ -551,6 +703,7 @@ Path with spaces Path with spaces

+------------------------------ ============================== svn+ssh://secureserver.org [svn+ssh://secureserver.org SVN link] @@ -563,18 +716,25 @@ rfc-2396.compatible://link RFC 2396

+------------------------------ ============================== = ça marche! = ------------------------------

ça marche!

+------------------------------ += ça marche! = ============================== = "Test" = ------------------------------

"Test"

+------------------------------ += "Test" = ============================== = Foo Baz = ------------------------------

Foo <Bar> Baz

+------------------------------ += Foo <Bar> Baz = ============================== !__foo!__ !~~bar!~~ @@ -587,6 +747,7 @@ ,,boo,, ^baz^

+------------------------------ ============================== /absolute/path/is/NotWiki and relative/path/is/NotWiki /ThisIsNotWikiEither and /ThisIs/NotWikiEither but ThisIs/SubWiki @@ -595,6 +756,7 @@ /absolute/path/is/NotWiki and relative/path/is/NotWiki /ThisIsNotWikiEither and /ThisIs/NotWikiEither but ThisIs/SubWiki?

+------------------------------ ============================== 8FjBpOmy anotherWikiPageName @@ -603,6 +765,9 @@ 8FjBpOmy anotherWikiPageName

+------------------------------ +8FjBpOmy +anotherWikiPageName ============================== || a || || b || @@ -611,3 +776,6 @@ a b +------------------------------ +|| a || +|| b || Index: trac/wiki/tests/formatter.py =================================================================== --- trac/wiki/tests/formatter.py (revision 2391) +++ trac/wiki/tests/formatter.py (working copy) @@ -5,7 +5,7 @@ import unittest from trac.core import * -from trac.wiki.formatter import Formatter +from trac.wiki.formatter import Formatter, OneLinerFormatter from trac.wiki.api import IWikiMacroProvider @@ -73,19 +73,31 @@ import trac.Search env = DummyEnvironment() + out = StringIO.StringIO() - Formatter(env).format(self.input, out) + self.format(env, out) v = out.getvalue().replace('\r','') self.assertEquals(self.correct, v) + def format(self, env, out): + Formatter(env).format(self.input, out) + + +class OneLinerTestCase(WikiTestCase): + def format(self, env, out): + OneLinerFormatter(env).format(self.input, out) + + def suite(): suite = unittest.TestSuite() data = open(os.path.join(os.path.split(__file__)[0], 'wiki-tests.txt'), 'r').read() tests = data.split('=' * 30 + '\n') for test in tests: - input, correct = test.split('-' * 30 + '\n') - suite.addTest(WikiTestCase(input, correct)) + input, page, oneliner = test.split('-' * 30 + '\n') + suite.addTest(WikiTestCase(input, page)) + if oneliner: + suite.addTest(OneLinerTestCase(input, oneliner[:-1])) return suite if __name__ == '__main__': Index: trac/wiki/formatter.py =================================================================== --- trac/wiki/formatter.py (revision 2391) +++ trac/wiki/formatter.py (working copy) @@ -149,11 +149,12 @@ r"(?P!?&#\d+;)"] _post_rules = [(r"(?P!?((?P%s):" % LINK_SCHEME + r"(?P'[^']+'|\"[^\"]+\"|" - r"(?:\|(?=[^| ])|&(?!lt;)|[^|& ])*[^|'~_\.,& \)])))"), + r"(?:\|(?=[^|\s])|&(?!lt;)|" + r"[^|&\s])*[^|'~_\.,&\s\)\]:])))"), (r"(?P!?\[(?:(?P%s):" % LINK_SCHEME + - r"(?P'[^']+'|\"[^\"]+\"|[^\] ]*)" - r"|(?P[/.][^ [\]]*))" - r"(?: (?P