Correct references to "all children of a list" in tests

diff --git a/src/tests/keywords/foreach-list b/src/tests/keywords/foreach-list
index b70775e4f52fe5af6d5c8fecf3a15bf28c794a26..5ef23d09fb294561b15678a77f3173af8cd5cd7e 100644 (file)
--- a/src/tests/keywords/foreach-list
+++ b/src/tests/keywords/foreach-list
@@ -1,6 +1,6 @@
 &request -= &Packet-Type[*]
 
-foreach &request {
+foreach &request.[*] {
        &reply += {
                &Called-Station-Id = "%{Foreach-Variable-0}"
        }

diff --git a/src/tests/keywords/pairs b/src/tests/keywords/pairs
index 35b89f91992d91e50c85475d66eb4c40e7e1aee2..16fb0bc87c02bcf0e4164532e9b869fe10259405 100644 (file)
--- a/src/tests/keywords/pairs
+++ b/src/tests/keywords/pairs
@@ -14,7 +14,7 @@
        &Tmp-String-1 = "%(concat:%(pairs:request.[*]) ', ')"
        &Tmp-String-2 = "%(pairs:Tmp-String-0)"
        &Tmp-String-3 = "%(concat:%(pairs:Tmp-String-0[*]) ', ')"
-       &Tmp-String-4 = "%(concat:%(pairs:control.) ', ')"
+       &Tmp-String-4 = "%(concat:%(pairs:control.[*]) ', ')"
        &Tmp-String-5 = "%(pairs:control.User-Name)"
 }
 

diff --git a/src/tests/keywords/xlat-dhcpv4 b/src/tests/keywords/xlat-dhcpv4
index 341d46fa5b8a96ca5430ed034f4a2ccaf44cbde7..8503d7207a821c91334a8a7a411a64a128589f48 100644 (file)
--- a/src/tests/keywords/xlat-dhcpv4
+++ b/src/tests/keywords/xlat-dhcpv4
@@ -15,7 +15,7 @@ if (!(&Relay-Agent-Information.Remote-Id == 0x010203040506)) {
        test_fail
 }
 
-&Tmp-Octets-1 := %(encode.dhcpv4:&request)
+&Tmp-Octets-1 := %(encode.dhcpv4:&request.[*])
 
 if !(&Tmp-Octets-1 == 0x520d0103abcdef0206010203040506) {
        test_fail

diff --git a/src/tests/modules/cache_rbtree/cache-method-update.unlang b/src/tests/modules/cache_rbtree/cache-method-update.unlang
index 0bdf36767f96c70ad4cc75bf1dbddb6c93e6f7f6..0b4c65e75143c058c363007583837af5843ac2d2 100644 (file)
--- a/src/tests/modules/cache_rbtree/cache-method-update.unlang
+++ b/src/tests/modules/cache_rbtree/cache-method-update.unlang
@@ -39,7 +39,7 @@ if (!updated) {
 }
 
 # session-state should now contain all the reply attributes
-if ("%{session-state[#]}" != 2) {
+if ("%{session-state.[#]}" != 2) {
        test_fail
 }
 

diff --git a/src/tests/modules/cache_rbtree/cache-update.unlang b/src/tests/modules/cache_rbtree/cache-update.unlang
index 204e9ad13838c6ebb51850b258dc602d41b2a492..5db150e07ffc2e52e1dc0a695ec78598cf78f621 100644 (file)
--- a/src/tests/modules/cache_rbtree/cache-update.unlang
+++ b/src/tests/modules/cache_rbtree/cache-update.unlang
@@ -33,7 +33,7 @@ if (!updated) {
 }
 
 # session-state should now contain all the reply attributes
-if ("%{session-state[#]}" != 2) {
+if ("%{session-state.[#]}" != 2) {
        test_fail
 }
 

diff --git a/src/tests/modules/json/encode.unlang b/src/tests/modules/json/encode.unlang
index 5c588ed9e0cdcbba9ea653fafed44f7fb86fd7b9..04b5c9d3dd752af7ec5d29b66a10f964b885b3c1 100644 (file)
--- a/src/tests/modules/json/encode.unlang
+++ b/src/tests/modules/json/encode.unlang
@@ -4,15 +4,15 @@
 &request -= &Packet-Type[*]
 
 # 0. Check basic xlat parsing
-&control.Tmp-String-1 := "%{json_encode:&request[*]}"
-&control.Tmp-String-2 := "%{json_encode:&request[*] }"
-&control.Tmp-String-3 := "%{json_encode: &request[*]}"
-&control.Tmp-String-4 := "%{json_encode:        &request[*]    }"
-&control.Tmp-String-5 := "%{json_encode: &request[*]    !&Filter-Id }"
-&control.Tmp-String-6 := "%{json_encode:&request[*] ! }"
+&control.Tmp-String-1 := "%{json_encode:&request.[*]}"
+&control.Tmp-String-2 := "%{json_encode:&request.[*] }"
+&control.Tmp-String-3 := "%{json_encode: &request.[*]}"
+&control.Tmp-String-4 := "%{json_encode:        &request.[*]   }"
+&control.Tmp-String-5 := "%{json_encode: &request.[*]    !&Filter-Id }"
+&control.Tmp-String-6 := "%{json_encode:&request.[*] ! }"
 #  Check defaults are the same as output_mode "object":
-&control.Tmp-String-7 := "%{json_object_encode:&request[*]}"
-&control.Tmp-String-8 := "%{json_object_no_encode:&request[*]}"
+&control.Tmp-String-7 := "%{json_object_encode:&request.[*]}"
+&control.Tmp-String-8 := "%{json_object_no_encode:&request.[*]}"
 
 if (&control.Tmp-String-1 != '{"User-Name":{"type":"string","value":"john"},"Filter-Id":{"type":"string","value":["f1","f2"]},"NAS-Port":{"type":"uint32","value":999},"Service-Type":{"type":"uint32","value":"Login-User"}}') {
        test_fail
@@ -43,8 +43,8 @@ if !(&control.Tmp-String-6 == "") {
 
 # These are unsorted dictionaries. Hopefully json-c doesn't suddenly
 # decide that it's going to use a different ordering of the keys...
-&control.Tmp-String-1 := "%{json_object_encode:&request[*]}"
-&control.Tmp-String-2 := "%{json_object_ex_encode:&request[*]}"
+&control.Tmp-String-1 := "%{json_object_encode:&request.[*]}"
+&control.Tmp-String-2 := "%{json_object_ex_encode:&request.[*]}"
 
 if (&control.Tmp-String-1 != '{"User-Name":{"type":"string","value":"john"},"Filter-Id":{"type":"string","value":["f1","f2"]},"NAS-Port":{"type":"uint32","value":999},"Service-Type":{"type":"uint32","value":"Login-User"}}') {
        test_fail
@@ -56,15 +56,15 @@ if (&control.Tmp-String-2 != '{"pf:User-Name":{"type":"string","value":["john"]}
 }
 
 # 1b. "object" empty inputs
-&control.Tmp-String-1 := "%{json_object_encode:!&request[*]}"
+&control.Tmp-String-1 := "%{json_object_encode:!&request.[*]}"
 
 if (&control.Tmp-String-1 != '{}') {
        test_fail
 }
 
 # 2a. Output mode "object_simple" tests
-&control.Tmp-String-1 := "%{json_object_simple_encode:&request[*]}"
-&control.Tmp-String-2 := "%{json_object_simple_ex_encode:&request[*]}"
+&control.Tmp-String-1 := "%{json_object_simple_encode:&request.[*]}"
+&control.Tmp-String-2 := "%{json_object_simple_ex_encode:&request.[*]}"
 
 if (&control.Tmp-String-1 != '{"User-Name":"john","Filter-Id":["f1","f2"],"NAS-Port":999,"Service-Type":"Login-User"}') {
        test_fail
@@ -75,15 +75,15 @@ if (&control.Tmp-String-2 != '{"pf:User-Name":["john"],"pf:Filter-Id":["f1","f2"
 }
 
 # 2b. "object_simple" empty inputs
-&control.Tmp-String-1 := "%{json_object_simple_encode:!&request[*]}"
+&control.Tmp-String-1 := "%{json_object_simple_encode:!&request.[*]}"
 
 if (&control.Tmp-String-1 != '{}') {
        test_fail
 }
 
 # 3a. Output mode "array" tests
-&control.Tmp-String-1 := "%{json_array_encode:&request[*]}"
-&control.Tmp-String-2 := "%{json_array_ex_encode:&request[*]}"
+&control.Tmp-String-1 := "%{json_array_encode:&request.[*]}"
+&control.Tmp-String-2 := "%{json_array_ex_encode:&request.[*]}"
 
 if (&control.Tmp-String-1 != '[{"name":"User-Name","type":"string","value":"john"},{"name":"Filter-Id","type":"string","value":"f1"},{"name":"Filter-Id","type":"string","value":"f2"},{"name":"NAS-Port","type":"uint32","value":999},{"name":"Service-Type","type":"uint32","value":"Login-User"}]') {
        test_fail
@@ -94,15 +94,15 @@ if (&control.Tmp-String-2 != '[{"name":"pf:User-Name","type":"string","value":["
 }
 
 # 3b. "array" empty inputs
-&control.Tmp-String-1 := "%{json_array_encode:!&request[*]}"
+&control.Tmp-String-1 := "%{json_array_encode:!&request.[*]}"
 
 if (&control.Tmp-String-1 != '[]') {
        test_fail
 }
 
 # 4a. Output mode "array_of_names" tests
-&control.Tmp-String-1 := "%{json_array_names_encode:&request[*]}"
-&control.Tmp-String-2 := "%{json_array_names_ex_encode:&request[*]}"
+&control.Tmp-String-1 := "%{json_array_names_encode:&request.[*]}"
+&control.Tmp-String-2 := "%{json_array_names_ex_encode:&request.[*]}"
 
 if (&control.Tmp-String-1 != '["User-Name","Filter-Id","Filter-Id","NAS-Port","Service-Type"]') {
        test_fail
@@ -113,15 +113,15 @@ if (&control.Tmp-String-2 != '["pf:User-Name","pf:Filter-Id","pf:Filter-Id","pf:
 }
 
 # 4b. "array_of_names" empty inputs
-&control.Tmp-String-1 := "%{json_array_names_encode:!&request[*]}"
+&control.Tmp-String-1 := "%{json_array_names_encode:!&request.[*]}"
 
 if (&control.Tmp-String-1 != '[]') {
        test_fail
 }
 
 # 5a. Output mode "array_of_values" tests
-&control.Tmp-String-1 := "%{json_array_values_encode:&request[*]}"
-&control.Tmp-String-2 := "%{json_array_values_ex_encode:&request[*]}"
+&control.Tmp-String-1 := "%{json_array_values_encode:&request.[*]}"
+&control.Tmp-String-2 := "%{json_array_values_ex_encode:&request.[*]}"
 
 if (&control.Tmp-String-1 != '["john","f1","f2",999,"Login-User"]') {
        test_fail
@@ -132,7 +132,7 @@ if (&control.Tmp-String-2 != '["john","f1","f2","999","1"]') {
 }
 
 # 5b. "array_of_values" empty inputs
-&control.Tmp-String-1 := "%{json_array_values_encode:!&request[*]}"
+&control.Tmp-String-1 := "%{json_array_values_encode:!&request.[*]}"
 
 if (&control.Tmp-String-1 != '[]') {
        test_fail