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

diff --git a/src/tests/keywords/foreach-error b/src/tests/keywords/foreach-error
index 8fdc11e567e2a1c8e2fcd7022f8504b0aae7e2aa..8aecb0279262de5ebc5cd5b658020b5af9ca6709 100644 (file)
--- 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 2612b9f87319e7be50a847c9ba5ff43329e5c329..74a9d08b328f9ffced340f9f92a3271e32097f1f 100644 (file)
--- 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 719e5c2f87da5ca9744fbf7cc9c01d6997867beb..8af16d1ffb9fe3f9290b32ceb54eb0b06fe85485 100644 (file)
--- 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 =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[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 =~ /^(?<one>[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 =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[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' =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[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 74fb90a46c7b601cb30beb7133ac65ffd515a150..a39841a40e75ff5a5deb7291c4c5b700ddcb6654 100644 (file)
--- 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 bb6cca99db3b81eb403dc922362a36df6c917355..2dcb652ca06c90cf8e6313ee56191030db19862c 100644 (file)
--- 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 ce9f1b72a76e145a4853948b526b594c740536de..4d70b2a29efd77f101f68056c73da64c1e542341 100644 (file)
--- 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 53b086dc4163e15e7740c67088168ceff6d5c2c9..519a74fee075a332824e74e360444745e3c4eb01 100644 (file)
--- 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
        }