Index: openacs-4/packages/xowiki/www/admin/test.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/test.tcl,v diff -u -N -r1.17 -r1.18 --- openacs-4/packages/xowiki/www/admin/test.tcl 1 Feb 2009 16:25:16 -0000 1.17 +++ openacs-4/packages/xowiki/www/admin/test.tcl 10 Feb 2009 10:59:09 -0000 1.18 @@ -6,6 +6,7 @@ test proc case msg {ad_return_top_of_page "$msg

$msg

"} test proc section msg {my reset; ns_write "

$msg

"} test proc subsection msg {ns_write "

$msg

"} +test proc subsubsection msg {ns_write "
$msg
"} test proc errmsg msg {ns_write "ERROR: $msg
"; test incr failed} test proc okmsg msg {ns_write "OK: $msg
"; test incr passed} test proc code msg {ns_write "
$msg
"} @@ -517,7 +518,7 @@ set content [::$package_id invoke -method $m] set p [::xowiki::Page info instances] -? {llength $p} 1 "expect only one instance" +? {llength $p} 1 "expect only one page instance" if {[llength $p] == 1} { ? {$p set title} {Hello World- V.2 - saved} "saved title is ok" ? {lindex [$p set text] 0} {Hello [[Wiki]] World. ... just testing ..
} "saved text is ok" @@ -531,32 +532,53 @@ test subsection "Link resolver" set p [::xowiki::Page info instances] -? {llength $p} 1 "expect only one instance" +? {llength $p} 1 "expect only one page instance" -foreach {link result external} { - hello 1 0 - en:hello 1 0 - xxx 0 0 - //XOWIKI-TEST/hello 1 0 - //XOWIKI-TEST/en:hello 1 0 - //XOWIKI-TEST/en/hello 0 0 - //forums 1 1 - //XOWIKI-TEST/weblog?m=create-new&p.exercise_form=en:l1 1 0 -} { - set l [$p create_link $link] - switch [$l info class] { - ::xowiki::Link { - ? {expr {[$l resolve] > 0}} $result "Can resolve link $link" +proc xowiki-test-links {p tests} { + foreach {link result external} $tests { + set l [$p create_link $link] + switch [$l info class] { + ::xowiki::Link { ? {expr {[$l resolve] > 0}} $result "Can resolve link $link" } + ::xowiki::ExternalLink { ? {expr {$external == 1}} $result "found external link" } } - ::xowiki::ExternalLink { - ? {expr {$external == 1}} $result "found external link" - } + $l destroy } - $l destroy } +test subsubsection "Testing links on english page" +xowiki-test-links $p { + hello 1 0 + en:hello 1 0 + de:hello 0 0 + xxx 0 0 + //XOWIKI-TEST/hello 1 0 + //XOWIKI-TEST/en:hello 1 0 + //XOWIKI-TEST/de:hello 0 0 + //XOWIKI-TEST/en/hello 0 0 + //forums 1 1 + //XOWIKI-TEST/weblog?m=create-new&p.exercise_form=en:l1 1 0 + //XOWIKI-TEST/en:weblog?m=create-new&p.exercise_form=en:l1 1 0 +} +# make page a german page +$p nls_language de_DE +test subsubsection "Testing links on german page" +xowiki-test-links $p { + hello 0 0 + en:hello 1 0 + de:hello 0 0 + xxx 0 0 + //XOWIKI-TEST/hello 0 0 + //XOWIKI-TEST/en:hello 1 0 + //XOWIKI-TEST/de:hello 0 0 + //XOWIKI-TEST/en/hello 0 0 + //forums 1 1 + //XOWIKI-TEST/weblog?m=create-new&p.exercise_form=en:l1 0 0 + //XOWIKI-TEST/en:weblog?m=create-new&p.exercise_form=en:l1 1 0 +} + + test subsection "Filter expressions" ? {::xowiki::FormPage filter_expression \