Index: openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl	22 Jul 2018 09:53:51 -0000	1.9
+++ openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl	22 Jul 2018 11:37:20 -0000	1.10
@@ -1,16 +1,18 @@
-# 
-
 ad_library {
     
     Tests for adp parsing
     
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2005-01-01
-    @arch-tag: bc76f9ce-ed1c-49dd-a3be-617d5a78c838
     @cvs-id $Id$
 }
 
-aa_register_case template_variable {
+aa_register_case \
+    -procs {
+        template::adp_array_variable_regexp
+        template::adp_array_variable_regexp_noquote
+    } \
+    template_variable {
     test adp variable parsing procedures
 } {
     aa_run_with_teardown \
@@ -57,11 +59,18 @@
     @author Torben Brosten
 } {
     aa_equals "parses list of 0 items" [template::util::tcl_to_sql_list [list]] ""
-    aa_equals "parses list of 2 or more" [template::util::tcl_to_sql_list [list isn't hess' 'bit 'trippy']] "'isn''t', 'hess''', '''bit', '''trippy'''"
+    aa_equals "parses list of 2 or more" \
+        [template::util::tcl_to_sql_list [list isn't hess' 'bit 'trippy']] \
+        "'isn''t', 'hess''', '''bit', '''trippy'''"
 
 }
 
-aa_register_case -cats {api smoke} expand_percentage_signs {
+aa_register_case \
+    -cats {api smoke} \
+    -procs {
+        template::expand_percentage_signs
+    } \
+    expand_percentage_signs {
     Test expand percentage signs to make sure it substitutes correctly
     
     @author Dave Bauer
@@ -88,43 +97,21 @@
    
 }
 
-aa_register_case -cats {api smoke} tcl_to_sql_list {
+aa_register_case \
+    -cats {api smoke} \
+    -procs {
+        template::util::tcl_to_sql_list
+    } \
+    tcl_to_sql_list {
     Tests the tcl_to_sql_list proc.
 
     @author Torben Brosten
 } {
     aa_equals "parses list of 0 items" [template::util::tcl_to_sql_list [list]] ""
     aa_equals "parses list of 2 or more" [template::util::tcl_to_sql_list [list isn't hess' 'bit 'trippy']] "'isn''t', 'hess''', '''bit', '''trippy'''"
-
 }
 
-aa_register_case -cats {api smoke} expand_percentage_signs {
-    Test expand percentage signs to make sure it substitutes correctly
-    
-    @author Dave Bauer
-    @creation-date 2005-11-20
-} {
-    set orig_message "Test message %one%"
-    set one "\[__does_not_exist__\]"
-    set message $orig_message
 
-    aa_false "Expanded square bracket text" [catch {set expanded_message [template::expand_percentage_signs $message]} errmsg]
-    aa_log $errmsg
-    aa_equals "square brackets safe" $expanded_message "Test message \[__does_not_exist__\]"
-    
-    set one "\$__does_not_exist"
-    aa_false "Expanded dollar test" [catch {set expanded_message [template::expand_percentage_signs $message]} errmsg]
-    aa_log $errmsg
-    aa_equals "dollar sign safe" $expanded_message "Test message \$__does_not_exist"
-
-    set one "\$two(\$three(\[__does_not_exist\]))"
-
-    aa_false "Square bracket in array key test" [catch {set expanded_message [template::expand_percentage_signs $message]} errmsg]
-    aa_log $errmsg
-    aa_equals "square brackets in array key safe" $expanded_message "Test message \$two(\$three(\[__does_not_exist\]))"
-   
-}
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4