Index: openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl 10 Jan 2007 21:22:12 -0000 1.4
+++ openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl 20 Jan 2008 10:57:03 -0000 1.5
@@ -58,7 +58,7 @@
set ref_list [list [list "/doc/doc0.html" "href0"] [list "/doc/doc1.html" "href1"] [list "/doc/doc2.html" "href2"]]
set c {}
set ref_list_print [foreach element $ref_list { append c [lindex $element 0] " " [lindex $element 1]\n}]
- set separator " - "
+ set separator "-"
aa_log "List with three references:\n\n$c\nseparator= \" - \" "
aa_equals "" [ad_context_bar_html -separator $separator $ref_list] "[lindex [lindex $ref_list 0] 1] - [lindex [lindex $ref_list 1] 1] - [lindex [lindex $ref_list 2] 0] [lindex [lindex $ref_list 2] 1]"
@@ -117,7 +117,7 @@
append context_barp "\">"
append context_barp [lindex $value 1]
append context_barp ""
- append context_barp $separator
+ append context_barp " $separator "
}
append context_barp "$leave_node"
set context_bar [ad_context_bar -node_id $idr_1 -separator $separator $leave_node]
@@ -137,7 +137,7 @@
append context_barp "\">"
append context_barp [lindex $value 1]
append context_barp ""
- append context_barp $separator
+ append context_barp " $separator "
}
append context_barp "$leave_node"
set context_bar [ad_context_bar -node_id $idr_2 -separator $separator $leave_node]
@@ -156,7 +156,7 @@
append context_barp "\">"
append context_barp [lindex $value 1]
append context_barp ""
- append context_barp $separator
+ append context_barp " $separator "
}
append context_barp "$leave_node"
set context_bar [ad_context_bar -from_node $idr_1 -node_id $idr_2 -separator $separator $leave_node]
Index: openacs-4/packages/acs-tcl/tcl/test/site-nodes-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/site-nodes-test-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/test/site-nodes-test-procs.tcl 15 Feb 2004 11:15:43 -0000 1.4
+++ openacs-4/packages/acs-tcl/tcl/test/site-nodes-test-procs.tcl 20 Jan 2008 10:57:03 -0000 1.5
@@ -44,25 +44,13 @@
aa_equals "Verify url /doc4 for node1" [site_node::get_url -node_id $node1_node_id] "/$doc4_name/"
aa_equals "Verify url /doc4/doc3 for node3" [site_node::get_url -node_id $node3_node_id] "/$doc4_name/$doc3_name/"
aa_equals "Verify url /doc2 for node2" [site_node::get_url -node_id $node2_node_id] "/$doc2_name/"
- # 3) rename /node4 => doc5 without updating children in the cache: Test /doc5 /doc4/doc3 /doc2
+ # 3) init_cache: Test /doc5 /doc5/doc3 /doc2
set doc5_name [ad_generate_random_string]
db_dml rename_node1 {
update site_nodes
set name = :doc5_name
where node_id = :node1_node_id
}
- site_node::update_cache -node_id $node1_node_id
- aa_equals "Check url /doc5" [site_node::get_node_id -url "/$doc5_name"] $node1_node_id
- aa_equals "Check url /doc4/doc3" [site_node::get_node_id -url "/$doc4_name/$doc3_name"] $node3_node_id
- aa_equals "Check url /doc2" [site_node::get_node_id -url "/$doc2_name"] $node2_node_id
- aa_equals "Make sure old url /doc1 now matches /" [site_node::get_node_id -url "/$doc1_name/"] $root_node_id
- aa_equals "Make sure old url /doc1/doc3 now matches /" [site_node::get_node_id -url "/$doc1_name/$doc3_name/"] $root_node_id
- aa_equals "Make sure old url /doc4 now matches /" [site_node::get_node_id -url "/$doc4_name/"] $root_node_id
- aa_equals "Make sure url /doc5/doc3 now matches /doc5" [site_node::get_node_id -url "/$doc5_name/$doc3_name/"] $node1_node_id
- aa_equals "Verify url /doc5 for node1" [site_node::get_url -node_id $node1_node_id] "/$doc5_name/"
- aa_equals "Verify url /doc4/doc3 for node3" [site_node::get_url -node_id $node3_node_id] "/$doc4_name/$doc3_name/"
- aa_equals "Verify url /doc2 for node2" [site_node::get_url -node_id $node2_node_id] "/$doc2_name/"
- # 4) init_cache: Test /doc5 /doc5/doc3 /doc2
site_node::init_cache
aa_equals "Check url /doc5" [site_node::get_node_id -url "/$doc5_name"] $node1_node_id
aa_equals "Check url /doc5/doc3" [site_node::get_node_id -url "/$doc5_name/$doc3_name"] $node3_node_id
@@ -74,7 +62,7 @@
aa_equals "Verify url /doc5 for node1" [site_node::get_url -node_id $node1_node_id] "/$doc5_name/"
aa_equals "Verify url /doc5/doc3 for node3" [site_node::get_url -node_id $node3_node_id] "/$doc5_name/$doc3_name/"
aa_equals "Verify url /doc2 for node2" [site_node::get_url -node_id $node2_node_id] "/$doc2_name/"
- # 5) delete doc3: Test /doc5 /doc2, nonexisting /doc5/doc3
+ # 4) delete doc3: Test /doc5 /doc2, nonexisting /doc5/doc3
site_node::unmount -node_id $node3_node_id
site_node::delete -node_id $node3_node_id
aa_equals "Check url /doc5" [site_node::get_node_id -url "/$doc5_name"] $node1_node_id