From 8f5f76297a54c23266865e2de6bfa3b5ff4237b5 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Tue, 3 Oct 2023 08:42:14 -0400 Subject: [PATCH] some auto-conversion perl -p -i -e 's/%{([a-zA-Z0-9._-]+):([^%{}]+)}/%$1($2)/g' $(git grep -l '%{[^:}]\+:' src/tests/keywords/) with manual cleanups of things which don't work --- src/tests/keywords/foreach-error | 2 +- src/tests/keywords/if-failed-xlat | 2 +- src/tests/keywords/if-regex-match-named | 12 ++++++------ src/tests/keywords/if-skip | 2 +- src/tests/keywords/randstr | 10 +++++----- src/tests/keywords/regex-escape | 4 ++-- src/tests/keywords/switch-xlat-error | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/tests/keywords/foreach-error b/src/tests/keywords/foreach-error index 8fdc11e567..8aecb02792 100644 --- a/src/tests/keywords/foreach-error +++ b/src/tests/keywords/foreach-error @@ -1,3 +1,3 @@ -foreach "%{expr:1 + 2}" { # ERROR +foreach "%expr(1 + 2)" { # ERROR &reply.Called-Station-Id += "%{Foreach-Variable-0}" } diff --git a/src/tests/keywords/if-failed-xlat b/src/tests/keywords/if-failed-xlat index 2612b9f873..74a9d08b32 100644 --- a/src/tests/keywords/if-failed-xlat +++ b/src/tests/keywords/if-failed-xlat @@ -6,7 +6,7 @@ if (('${feature.regex-pcre}' == 'yes') || ('${feature.regex-pcre2}' == 'yes')) { # Check failure when no previous capture - named group # but a failed regex is equivalent to an empty string -if (%{regex:foo}) { +if (%regex(foo)) { test_fail } diff --git a/src/tests/keywords/if-regex-match-named b/src/tests/keywords/if-regex-match-named index 719e5c2f87..8af16d1ffb 100644 --- a/src/tests/keywords/if-regex-match-named +++ b/src/tests/keywords/if-regex-match-named @@ -18,7 +18,7 @@ if (!(&Module-Failure-Message[*] == "No previous regex capture")) { &request -= &Module-Failure-Message[*] # Check failure when no previous capture - named group -if ("%{regex:foo}") { +if ("%regex(foo)") { test_fail } @@ -41,7 +41,7 @@ if (!(&Module-Failure-Message[*] == "No previous numbered regex capture group")) # uncompiled - ref - named capture groups if (&User-Name =~ /^(?[0-9])_(?[0-9])?_(?[0-9]*)_(?[0-9]+)_(?[^_])_(?6)_(?[7-8])%{Tmp-String-1}/) { - &Tmp-String-0 := "%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}" + &Tmp-String-0 := "%regex(seven)_%regex(six)_%regex(five)_%regex(four)_%regex(three)_%regex(two)_%regex(one)_%{0}" if (!(&Tmp-String-0 == '7_6_5_4_3_2_1_1_2_3_4_5_6_7')) { test_fail } @@ -52,7 +52,7 @@ else { # Checking capture groups are cleared out correctly if (&User-Name =~ /^(?[0-9])_%{Tmp-String-1}/) { - &Tmp-String-0 := "%{0}%{regex:one}%{regex:two}%{regex:three}%{regex:four}%{regex:five}%{regex:six}%{regex:seven}" + &Tmp-String-0 := "%{0}%regex(one)%regex(two)%regex(three)%regex(four)%regex(five)%regex(six)%regex(seven)" if (!(&Tmp-String-0 == '1_1')) { test_fail } @@ -63,7 +63,7 @@ else { # Checking capture groups are cleared out correctly when there are no matches if (&User-Name =~ /^.%{Tmp-String-1}/) { - &Tmp-String-0 := "%{0}%{regex:one}%{regex:two}%{regex:three}%{regex:four}%{regex:five}%{regex:six}%{regex:seven}" + &Tmp-String-0 := "%{0}%regex(one)%regex(two)%regex(three)%regex(four)%regex(five)%regex(six)%regex(seven)" if (!(&Tmp-String-0 == '1')) { test_fail } @@ -74,7 +74,7 @@ else { # compiled - ref - named capture groups if (&User-Name =~ /^(?[0-9])_(?[0-9])?_(?[0-9]*)_(?[0-9]+)_(?[^_])_(?6)_(?[7-8])/) { - &Tmp-String-0 := "%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}" + &Tmp-String-0 := "%regex(seven)_%regex(six)_%regex(five)_%regex(four)_%regex(three)_%regex(two)_%regex(one)_%{0}" if (!(&Tmp-String-0 == '7_6_5_4_3_2_1_1_2_3_4_5_6_7')) { test_fail } @@ -85,7 +85,7 @@ else { # compiled - xlat - named capture groups if ('1_2_3_4_5_6_7' =~ /^(?[0-9])_(?[0-9])?_(?[0-9]*)_(?[0-9]+)_(?[^_])_(?6)_(?[7-8])/) { - &Tmp-String-0 := "%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}" + &Tmp-String-0 := "%regex(seven)_%regex(six)_%regex(five)_%regex(four)_%regex(three)_%regex(two)_%regex(one)_%{0}" if (!(&Tmp-String-0 == '7_6_5_4_3_2_1_1_2_3_4_5_6_7')) { test_fail } diff --git a/src/tests/keywords/if-skip b/src/tests/keywords/if-skip index 74fb90a46c..a39841a40e 100644 --- a/src/tests/keywords/if-skip +++ b/src/tests/keywords/if-skip @@ -30,7 +30,7 @@ else { if (1) { ok } -elsif ("%{foo:bar}") { # no pass2 +elsif ("%foo(bar)") { # no pass2 no-such-module } else { diff --git a/src/tests/keywords/randstr b/src/tests/keywords/randstr index bb6cca99db..2dcb652ca0 100644 --- a/src/tests/keywords/randstr +++ b/src/tests/keywords/randstr @@ -1,8 +1,8 @@ &request += { - &Tmp-String-1 = "%{randstr:nnn}" - &Tmp-String-2 = "%{randstr:24a}" - &Tmp-String-3 = "%{randstr:1030aa}" - &Tmp-String-5 = "%{randstr:10b}" + &Tmp-String-1 = "%randstr(nnn)" + &Tmp-String-2 = "%randstr(24a)" + &Tmp-String-3 = "%randstr(1030aa)" + &Tmp-String-5 = "%randstr(10b)" } # @@ -38,7 +38,7 @@ if (!(%{strlen:%{Tmp-String-3}} == 1025)) { # # Check invalid character class # -&Tmp-String-4 := "%{randstr:G}" +&Tmp-String-4 := "%randstr(G)" if !(&Tmp-String-4 == "") { test_fail diff --git a/src/tests/keywords/regex-escape b/src/tests/keywords/regex-escape index ce9f1b72a7..4d70b2a29e 100644 --- a/src/tests/keywords/regex-escape +++ b/src/tests/keywords/regex-escape @@ -7,8 +7,8 @@ # characters escaped. Because the input strings are unsafe. # &request += { - &Tmp-String-0 = "%{taint:example.com}" - &Tmp-String-1 = "%{taint:exampleXcom}" + &Tmp-String-0 = "%taint(example.com)" + &Tmp-String-1 = "%taint(exampleXcom)" } if ("exampleXcom" =~ /%{Tmp-String-0}/) { diff --git a/src/tests/keywords/switch-xlat-error b/src/tests/keywords/switch-xlat-error index 53b086dc41..519a74fee0 100644 --- a/src/tests/keywords/switch-xlat-error +++ b/src/tests/keywords/switch-xlat-error @@ -2,7 +2,7 @@ # PRE: switch # switch &User-Name { - case "%{no-such-module:bob}" { # ERROR + case "%no-such-module(bob)" { # ERROR test_fail } -- 2.47.2