move keyword tests to new xlat argument parser

with a bit of good fortune, not all tests had to be updated.
However, there are still many tests which do unnecessary
expansions, ala

	%foo(%{User-Name}

which is no longer necessary.  It may be useful to forbid that,
or to at least print an error message complaining about it.

Author: alandekok

src/tests/keywords/all.mk

@@ -86,6 +86,11 @@ $(OUTPUT)/${1}: $(BUILD_DIR)/lib/local/libfreeradius-dhcpv4.la $(BUILD_DIR)/lib/
 endif
 endif
 
+#
+#  Always use the new xlat parser
+#
+$(OUTPUT)/${1}: NEW_COND += -S xlat_func_bare_words=no
+
 endef
 $(foreach x,$(FILES),$(eval $(call KEYWORD_TEST,$x)))
 
@@ -152,7 +157,7 @@ KEYWORD_LIBS	:= $(addsuffix .la,$(addprefix rlm_,$(KEYWORD_MODULES))) rlm_csv.la
 #	(make -k test.keywords 2>&1) | grep 'KEYWORD=' | sed 's/KEYWORD=//;s/ .*$//'
 #
 $(OUTPUT)/%: $(DIR)/% $(TEST_BIN_DIR)/unit_test_module | $(KEYWORD_RADDB) $(KEYWORD_LIBS) build.raddb rlm_test.la rlm_csv.la rlm_unpack.la
-	$(eval CMD:=KEYWORD=$(notdir $@) $(TEST_BIN)/unit_test_module $(NEW_COND) -S xlat_func_bare_words=yes $(UNIT_TEST_KEYWORD_ARGS.$(subst -,_,$(notdir $@))) -D share/dictionary -d src/tests/keywords/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xx )
+	$(eval CMD:=KEYWORD=$(notdir $@) $(TEST_BIN)/unit_test_module $(NEW_COND) $(UNIT_TEST_KEYWORD_ARGS.$(subst -,_,$(notdir $@))) -D share/dictionary -d src/tests/keywords/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xx )
 	@echo "KEYWORD-TEST $(notdir $@)"
 	${Q}if ! $(CMD) > "$@.log" 2>&1 || ! test -f "$@"; then \
 		if ! grep ERROR $< 2>&1 > /dev/null; then \

src/tests/keywords/attr-index-eval

@@ -8,20 +8,20 @@ index := 1
 #
 #  Dynamically create an attribute reference
 #
-ref = "&Filter-Id[" + (string) index + "]"
+ref = "Filter-Id[" + (string) index + "]"
 
 #
-# Evaluate the attribute as an unlang expression.
+# Evaluate the contents of the attribute as an unlang expression.
 #
-foo = %eval(%{ref})
+foo = %eval(ref)
 
 if (foo != "b") {
 	test_fail
 }
 
 ref = "1 + 2"
 
-foo = %eval(%{ref})
+foo = %eval(ref)
 
 if (foo != 3) {
 	test_fail

src/tests/keywords/base64

@@ -29,73 +29,73 @@ test_int64 = 1152921505566832445
 test_ipv4prefix = 57.56.55.62/32
 
 # String - bin 0x39383730
-test_output := %base64.encode(%{test_string})
+test_output := %base64.encode(test_string)
 if (!(test_output == 'OTg3MA==')) {
 	test_fail
 }
 
 # Octets - bin 0x39383731
-test_output := %base64.encode(%{test_octets})
+test_output := %base64.encode(test_octets)
 if (!(test_output == 'OTg3MQ==')) {
 	test_fail
 }
 
 # IP Address - bin 0x39383732
-test_output := %base64.encode(%{test_ipaddr})
+test_output := %base64.encode(test_ipaddr)
 if (!(test_output == 'OTg3Mg==')) {
 	test_fail
 }
 
 # Integer - bin 0x39383734
-test_output := %base64.encode(%{test_int})
+test_output := %base64.encode(test_int)
 if (!(test_output == 'OTg3NA==')) {
 	test_fail
 }
 
 # ifid - bin 0x0000000039383737
-test_output := %base64.encode(%{test_ifid})
+test_output := %base64.encode(test_ifid)
 if (!(test_output == 'AAAAADk4Nzc=')) {
 	test_fail
 }
 
 # ipv6addr - bin 0x00000000000000000000000039383738
-test_output := %base64.encode(%{test_ipv6addr})
+test_output := %base64.encode(test_ipv6addr)
 if (!(test_output == 'AAAAAAAAAAAAAAAAOTg3OA==')) {
 	test_fail
 }
 
 # ipv6addrprefix - bin 0x008000000000000000000000000039383739
-test_output := %base64.encode(%{test_ipv6prefix})
+test_output := %base64.encode(test_ipv6prefix)
 if (!(test_output == 'AIAAAAAAAAAAAAAAAAA5ODc5')) {
 	test_fail
 }
 
 # byte - bin 0x3a
-test_output := %base64.encode(%{test_byte})
+test_output := %base64.encode(test_byte)
 if (!(test_output == 'Og==')) {
 	test_fail
 }
 
 # short - bin 0x373b
-test_output := %base64.encode(%{test_short})
+test_output := %base64.encode(test_short)
 if (!(test_output == 'Nzs=')) {
 	test_fail
 }
 
 # ethernet - bin 0x00003938373c
-test_output := %base64.encode(%{test_ether})
+test_output := %base64.encode(test_ether)
 if (!(test_output == 'AAA5ODc8')) {
 	test_fail
 }
 
 # integer64 - bin 0x100000003938373d
-test_output := %base64.encode(%{test_int64})
+test_output := %base64.encode(test_int64)
 if (!(test_output == 'EAAAADk4Nz0=')) {
 	test_fail
 }
 
 # ipv4prefix - bin 0x203938373e
-test_output := %base64.encode(%{test_ipv4prefix})
+test_output := %base64.encode(test_ipv4prefix)
 if (!(test_output == 'IDk4Nz4=')) {
 	test_fail
 }
@@ -107,25 +107,25 @@ if (!(test_output == 'IDk4Nz4=')) {
 #}
 
 # Regression test, this used to crash...
-test_octets := %base64.decode(Zm9v)
+test_octets := %base64.decode('Zm9v')
 if (!(test_octets == "foo")) {
 	debug_request
 	test_fail
 }
 
-test_octets := %base64.decode(AIAAAAAAAAAAAAAAAAA5ODc5)
+test_octets := %base64.decode('AIAAAAAAAAAAAAAAAAA5ODc5')
 if (!(test_octets == 0x008000000000000000000000000039383739)) {
 	test_fail
 }
 
 # Regression tests
-test_octets := %base64.decode(5RNqNl8iYLbkCc7JhR8as4TtDDCX6otuuWtcja8rITUyx9zrnHSe9tTHGmKK)
+test_octets := %base64.decode('5RNqNl8iYLbkCc7JhR8as4TtDDCX6otuuWtcja8rITUyx9zrnHSe9tTHGmKK')
 
 if (!(test_octets == 0xe5136a365f2260b6e409cec9851f1ab384ed0c3097ea8b6eb96b5c8daf2b213532c7dceb9c749ef6d4c71a628a)) {
 	test_fail
 }
 
-test_octets := %base64.decode(eHfXPKZ+2iv9cnMV1MOmE/moYYA1Uk5xTmw4aVlMYmtDYzdKaFI4YXM0VHRERENYNm90dXVXdGNqYThySVRVeXg5enJuSFNlOXRUSEdtS0s=)
+test_octets := %base64.decode('eHfXPKZ+2iv9cnMV1MOmE/moYYA1Uk5xTmw4aVlMYmtDYzdKaFI4YXM0VHRERENYNm90dXVXdGNqYThySVRVeXg5enJuSFNlOXRUSEdtS0s=')
 
 if (!(test_octets == 0x7877d73ca67eda2bfd727315d4c3a613f9a8618035524e714e6c3869594c626b4363374a685238617334547444444358366f7475755774636a6138724954557978397a726e48536539745448476d4b4b)) {
 	test_fail

src/tests/keywords/bin

@@ -43,7 +43,7 @@ request += {
 	NAS-Identifier = '0x030405'
 }
 
-Class := %bin(%{NAS-Identifier[*]})
+Class := %bin(NAS-Identifier[*])
 
 if (Class[#] != 2) {
 	test_fail

src/tests/keywords/cast-time_delta

@@ -39,7 +39,7 @@ if (diff != 60s) {
 #
 #  Cast the time delta to milliseconds
 #
-num = %cast("ms", %{diff})
+num = %cast("ms", diff)
 
 #
 #  This results in 60, because the conversion to fr_value_box_cast() doesn't pass dst->enumv?

src/tests/keywords/cbor

@@ -1,7 +1,10 @@
 octets cbor
 string foo
 
-cbor = %cbor.encode(User-Name)
+#
+#  @todo - this should be a dcursor
+#
+cbor = %cbor.encode('User-Name')
 
 #
 #  9f		array of indefinite length
@@ -28,7 +31,7 @@ if (User-Name) {
 #
 #  @todo - change this to be configurable :(
 #
-%cbor.decode(%{cbor})
+%cbor.decode(cbor)
 
 if (User-Name != "bob") {
 	test_fail

src/tests/keywords/cmp-list-empty

@@ -3,7 +3,7 @@
 #
 #	{} == {} --> true
 #
-if !(%test.fail() == %test.fail()) {
+if (%test.fail() != %test.fail()) {
 	test_fail
 }
 

src/tests/keywords/date

@@ -11,23 +11,23 @@ date test_date
 test_integer := 1506101100
 
 # Convert to string representation
-result_string1 := %date(%{test_integer})
+result_string1 := %date(test_integer)
 
 # Some systems report GMT some UTC...
 if (!(result_string1 == "Fri 22 Sep 17:25:00 GMT 2017")) && (!(result_string1 == "Fri 22 Sep 17:25:00 UTC 2017")) {
 	test_fail
 }
 
 # Convert string to integer
-result_integer := %date(%{result_string1})
+result_integer := %date(result_string1)
 
 
 if (!(result_integer == test_integer)) {
 	test_fail
 }
 
 # Compare two methods of reading request timestamp in local timezone
-result_string1 := %localdate(request)
+result_string1 := %localdate('request')
 result_string2 := %S
 
 if (!(result_string1 == result_string2)) {
@@ -37,23 +37,23 @@ if (!(result_string1 == result_string2)) {
 # Convert different string format
 result_string1 := "2017-09-22 17:25:00"
 
-result_integer := %sqldate(%{result_string1})
+result_integer := %sqldate(result_string1)
 
 if (!(result_integer == test_integer)) {
 	test_fail
 }
 
 # Use a date attribute
 test_date := 1659985459
-result_string1 := %sqldate(%{test_date})
+result_string1 := %sqldate(test_date)
 
 if !(result_string1 == '2022-08-08 19:04:19') {
 	test_fail
 }
 
 # Invalid format
 result_string1 := '201-32-22 17:25:00'
-result_string2 := %sqldate(%{result_string1})
+result_string2 := %sqldate(result_string1)
 
 # This shouldn't exist, as the RHS above is NULL, and therefore the assignment will fail
 if (result_string2) {
@@ -66,7 +66,7 @@ if (!(Module-Failure-Message == "Failed to parse time string \"201-32-22 17:25:0
 
 # Invalid type
 NAS-IP-Address := "192.168.1.1"
-result_string2 := %date(%{NAS-IP-Address})
+result_string2 := %date(NAS-IP-Address)
 
 if (result_string2) {
 	test_fail

src/tests/keywords/debug

@@ -12,12 +12,12 @@ if (!(%debug(3) == 4)) {
 }
 
 # Call with NULL arg, should report current level
-if (!(%debug(%{dummy_string}) == 3)) {
+if (!(%debug(dummy_string) == 3)) {
 	test_fail
 }
 
 # ...and again
-if (!(%debug(%{dummy_string}) == 3)) {
+if (!(%debug(dummy_string) == 3)) {
 	test_fail
 }
 

src/tests/keywords/edit-eval-rhs

@@ -3,7 +3,7 @@ uint32 foo
 Tmp-Integer-0 := 1
 Tmp-Integer-1 := { 3, 6, 9 }
 
-foo = %eval(%{'%{Tmp-Integer-1[' + "%{Tmp-Integer-0}" + ']}'})
+foo = %eval('%{Tmp-Integer-1[' + "%{Tmp-Integer-0}" + ']}')
 
 if (foo != 6) {
 	test_fail