test/parser_test.rb in trac-wiki-0.3.20 vs test/parser_test.rb in trac-wiki-0.3.21

@@ -68,10 +68,13 @@
       "0123456789{{wide}}" * 10
     when 'testoff'
       "off:{{$offset}}"
     when '/slash'
       "slash/slash"
+    when 'unkmacro'
+      #"UNKNOWN-MACRO:!{{!.{{$0}}}}."
+      "UNKNOWN-MACRO:!{{!.{{$1}}}}."
     else
       nil
       #"UNK_TEMPL(#{tname})"
     end
   end
@@ -963,25 +966,26 @@
     tc "<h1>h1</h1>" , "{{# comment }}\n\n\n= h1 =\n" 
     tc "<h1>h1</h1>" , "{{# comment }}\n\n\n= h1 =\n{{# Comment2}}\n" 
 
     tc "<h1>h1</h1>" , "{{# co{{HUU}}mment }}\n\n\n= h1 =\n{{# Comment2}}\n" 
 
-    tc "<p>UNKNOWN-MACRO(macr)</p>\n" , "{{macr\nahoj\n}}"
-    tc "<p>ahoj UNKNOWN-MACRO(macr)</p>\n" , "ahoj {{macr{{o}}}}"
-    tc "<p>ahoj UNKNOWN-MACRO(macro)</p>\n" , "ahoj {{macro}}"
-    tc "<p>ahoj {{%macrUNKNOWN-MACRO(o)}}</p>\n" , "ahoj {{%macr{{o}}}}"
-    tc "<p>ahoj UNKNOWN-MACRO(macr)</p>\n" , "ahoj {{macr{{mac **o**}}}}"
+    tc "<p>UNKNOWN-MACRO:{{macr}}.</p>\n" , "{{macr\nahoj\n}}"
+    tc "<p>ahoj UNKNOWN-MACRO:{{macr}}.</p>\n" , "ahoj {{macr{{o}}}}"
+    tc "<p>ahoj UNKNOWN-MACRO:{{macro}}.</p>\n" , "ahoj {{macro}}"
+    tc "<p>ahoj {{%macrUNKNOWN-MACRO:{{o}}.}}</p>\n" , "ahoj {{%macr{{o}}}}"
+    tc "<p>ahoj UNKNOWN-MACRO:{{macr}}.</p>\n" , "ahoj {{macr{{mac **o**}}}}"
     tc "<p>ahoj ahoj</p>\n" , "ahoj {{$mac|ahoj}}"
   end
 
   it 'should do temlate' do
     tc "<p>1WEST</p>\n", "1{{west}}"
     tc "<p>2WEST</p>\n", "2{{test}}"
 
     # macro errors:
     tc "<p>TOO_DEEP_RECURSION(<tt>{{deep}}</tt>)3</p>\n", "{{deep}}3"
     tc "<p>TOO_LONG_EXPANSION_OF_MACRO(wide)QUIT</p>\n", "{{wide}}3"
-    tc "<p>UNKNOWN-MACRO(unknown)3</p>\n", "{{unknown}}3"
+    tc "<p>UNKNOWN-MACRO:{{unknown}}.4</p>\n", "{{unknown u1|u2}}4"
+    tc "<p>UNKNOWN-MACRO:{{unknown}}.3</p>\n", "{{unknown}}3"
   end
   it 'should do temlate with args' do
     tc "<p>jedna::VARTESTPARAM,dve:,p:DVE,arg::VARTESTPARAM|p=DVE</p>\n", "{{vartest::VARTESTPARAM|p=DVE}}"
     tc "<p>jedna::VARTESTPARAM,dve:,p:DVE,arg::VARTESTPARAM|p=DVE</p>\n", "{{vartest|:VARTESTPARAM|p=DVE}}"
     tc "<p>jedna:VARTESTPARAM,dve:,p:DVE,arg:VARTESTPARAM|p=DVE</p>\n", "{{vartest VARTESTPARAM|p=DVE}}"