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 -N -r1.8 -r1.9
--- openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl	29 Dec 2017 10:04:13 -0000	1.8
+++ openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl	22 Jul 2018 09:53:51 -0000	1.9
@@ -17,35 +17,35 @@
         -test_code {
             set code "=@test_array.test_key@"
             aa_true "Regular array var name detected" [regexp [template::adp_array_variable_regexp] $code discard pre arr var]
-            aa_true "Preceding char is '${pre}'" [string equal "=" $pre]
-            aa_true "Array name is '${arr}'" \
-                [string equal "test_array" $arr]
-            aa_true "Variable name is '${var}'" \
-                [string equal "test_key" $var]
+            aa_equals "Preceding char is '${pre}'"  "=" $pre
+            aa_equals "Array name is '${arr}'"  \
+                "test_array" $arr
+            aa_equals "Variable name is '${var}'"  \
+                "test_key" $var
 
             set code "=@formerror.test_array.test_key@"
             aa_true "Formerror regular array var name detected" [regexp [template::adp_array_variable_regexp] $code discard pre arr var]
-            aa_true "Preceding char is '${pre}'" [string equal "=" $pre]
-            aa_true "Array name is '${arr}'" \
-                [string equal "formerror" $arr]
-            aa_true "Variable name is '${var}'" \
-                [string equal "test_array.test_key" $var]            
+            aa_equals "Preceding char is '${pre}'"  "=" $pre
+            aa_equals "Array name is '${arr}'"  \
+                "formerror" $arr
+            aa_equals "Variable name is '${var}'"  \
+                "test_array.test_key" $var            
 
             set code "=@test_array.test_key;noquote@"
             aa_true "Noquote array var name detected" [regexp [template::adp_array_variable_regexp_noquote] $code discard pre arr var]
-            aa_true "Preceding char is '${pre}'" [string equal "=" $pre]
-            aa_true "Array name is '${arr}'" \
-                [string equal "test_array" $arr]
-            aa_true "Variable name is '${var}'" \
-                [string equal "test_key" $var]
+            aa_equals "Preceding char is '${pre}'"  "=" $pre
+            aa_equals "Array name is '${arr}'"  \
+                "test_array" $arr
+            aa_equals "Variable name is '${var}'"  \
+                "test_key" $var
 
             set code "=@formerror.test_array.test_key;noquote@"
             aa_true "Noquote formerror array var name detected" [regexp [template::adp_array_variable_regexp_noquote] $code discard pre arr var]
-            aa_true "Preceding char is '${pre}'" [string equal "=" $pre]
-            aa_true "Array name is '${arr}'" \
-                [string equal "formerror" $arr]
-            aa_true "Variable name is '${var}'" \
-                [string equal "test_array.test_key" $var]
+            aa_equals "Preceding char is '${pre}'"  "=" $pre
+            aa_equals "Array name is '${arr}'"  \
+                "formerror" $arr
+            aa_equals "Variable name is '${var}'"  \
+                "test_array.test_key" $var
             
             
         }