change !~ to !(... =~ ...)

diff --git a/src/tests/keywords/if-multivalue b/src/tests/keywords/if-multivalue
index 33e3e20ea98136275268ce9e8e78da62150dc51f..73267ddb506a26a8bc6c12d22105cd02a3b05f3e 100644 (file)
--- a/src/tests/keywords/if-multivalue
+++ b/src/tests/keywords/if-multivalue
@@ -100,7 +100,7 @@ if (&Tmp-String-1 =~ /%{Tmp-String-2[1]}$/) {
        test_fail
 }
 
-if (&Tmp-String-1 !~ /%{Tmp-String-2[2]}$/) {
+if !(&Tmp-String-1 =~ /%{Tmp-String-2[2]}$/) {
        test_fail
 }
 

diff --git a/src/tests/keywords/if-regex-empty b/src/tests/keywords/if-regex-empty
index 102a09514bb44e5e4873951271607ecf6901b7a0..459288834d4bd44fe9f38b14ef4b67a9980dad63 100644 (file)
--- a/src/tests/keywords/if-regex-empty
+++ b/src/tests/keywords/if-regex-empty
@@ -2,7 +2,7 @@
 # PRE: if if-regex-match
 #
 
-if (&control.Password.Cleartext !~ /hell(o)(.*)/) {
+if !(&control.Password.Cleartext =~ /hell(o)(.*)/) {
        test_fail
 }
 
@@ -20,7 +20,7 @@ if ("%{2}") {
        test_fail
 }
 
-if (&control.Password.Cleartext !~ /hello(.*)/) {
+if !(&control.Password.Cleartext =~ /hello(.*)/) {
        test_fail
 }
 

diff --git a/src/tests/keywords/if-regex-match b/src/tests/keywords/if-regex-match
index fa205fa891438188727a7d0fd4bd10f3a18d49b4..b50b16da130d07b659e58e67029d8f324d0d5d1e 100644 (file)
--- a/src/tests/keywords/if-regex-match
+++ b/src/tests/keywords/if-regex-match
@@ -3,12 +3,12 @@
 &Tmp-Integer-0 := '123456789'
 
 # Non matching on attribute ref
-if (&User-Name !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
+if !(&User-Name =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
        test_fail
 }
 
 # Matching on xlat expanded value
-if ("%{User-Name}" !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
+if !("%{User-Name}" =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
        test_fail
 }
 
@@ -62,22 +62,22 @@ else {
 }
 
 # uncompiled - ref - insensitive
-if (&Calling-Station-Id !~ /:roamyroam%{Tmp-String-0}$/i) {
+if !(&Calling-Station-Id =~ /:roamyroam%{Tmp-String-0}$/i) {
        test_fail
 }
 
 # uncompiled - expansion - insensitive
-if (&Calling-Station-Id !~ /:roamyroam%{Tmp-String-0}$/i) {
+if !(&Calling-Station-Id =~ /:roamyroam%{Tmp-String-0}$/i) {
        test_fail
 }
 
 # uncompiled - enum - ref - insensitive
-if (&Service-Type !~ /^framed-user%{Tmp-String-0}$/i) {
+if !(&Service-Type =~ /^framed-user%{Tmp-String-0}$/i) {
        test_fail
 }
 
 # uncompiled - enum - expansion - insensitive
-if ("%{Service-Type}" !~ /^framed-user%{Tmp-String-0}$/i) {
+if !("%{Service-Type}" =~ /^framed-user%{Tmp-String-0}$/i) {
        test_fail
 }
 
@@ -87,14 +87,14 @@ if (&Service-Type =~ /^framed-user%{Tmp-String-0}$/) {
 }
 
 # uncompiled - integer - ref
-if (&Tmp-Integer-0 !~ /%{Tmp-Integer-0}/) {
+if !(&Tmp-Integer-0 =~ /%{Tmp-Integer-0}/) {
        test_fail
 }
 
 &Tmp-String-0 := "foo\nbar"
 
 # uncompiled - ref - multiline
-if (&Tmp-String-0 !~ /^foo$%{Tmp-String-8}/m) {
+if !(&Tmp-String-0 =~ /^foo$%{Tmp-String-8}/m) {
        test_fail
 }
 
@@ -104,12 +104,12 @@ if (&Tmp-String-0 =~ /^foo$%{Tmp-String-8}/) {
 }
 
 # uncompiled - ref - non-multiline
-if (&Tmp-String-0 !~ /^foo\nbar%{Tmp-String-8}$/) {
+if !(&Tmp-String-0 =~ /^foo\nbar%{Tmp-String-8}$/) {
        test_fail
 }
 
 # uncompiled - ref - multiline
-if (&Tmp-String-0 !~ /^bar%{Tmp-String-8}$/m) {
+if !(&Tmp-String-0 =~ /^bar%{Tmp-String-8}$/m) {
        test_fail
 }
 
@@ -119,11 +119,11 @@ if (&Tmp-String-0 =~ /^BAR%{Tmp-String-8}$/m) {
 }
 
 # uncompiled - ref - multiline - insensitive
-if (&Tmp-String-0 !~ /^BAR%{Tmp-String-8}$/mi) {
+if !(&Tmp-String-0 =~ /^BAR%{Tmp-String-8}$/mi) {
        test_fail
 }
 
 # uncompiled - ref - multiline - insensitive (flag order reversed)
-if (&Tmp-String-0 !~ /^BAR%{Tmp-String-8}$/im) {
+if !(&Tmp-String-0 =~ /^BAR%{Tmp-String-8}$/im) {
        test_fail
 }

diff --git a/src/tests/keywords/if-regex-match-comp b/src/tests/keywords/if-regex-match-comp
index 82b679444d51ca44b304ac9f229c4c99b7db6514..524a14d388d634547c7c2b6a8249ca544950d7c9 100644 (file)
--- a/src/tests/keywords/if-regex-match-comp
+++ b/src/tests/keywords/if-regex-match-comp
@@ -2,12 +2,12 @@
 #
 
 # Non matching on attribute ref
-if (&User-Name !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
+if !(&User-Name =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
        test_fail
 }
 
 # Matching on xlat expanded value
-if ("%{User-Name}" !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
+if !("%{User-Name}" =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
        test_fail
 }
 
@@ -41,22 +41,22 @@ else {
 }
 
 # compiled - ref - insensitive
-if (&Calling-Station-Id !~ /:roamyroam$/i) {
+if !(&Calling-Station-Id =~ /:roamyroam$/i) {
        test_fail
 }
 
 # compiled - expansion - insensitive
-if (&Calling-Station-Id !~ /:roamyroam$/i) {
+if !(&Calling-Station-Id =~ /:roamyroam$/i) {
        test_fail
 }
 
 # compiled - enum - ref - insensitive
-if (&Service-Type !~ /^framed-user$/i) {
+if !(&Service-Type =~ /^framed-user$/i) {
        test_fail
 }
 
 # compiled - enum - expansion - insensitive
-if ("%{Service-Type}" !~ /^framed-user$/i) {
+if !("%{Service-Type}" =~ /^framed-user$/i) {
        test_fail
 }
 
@@ -68,7 +68,7 @@ if (&Service-Type =~ /^framed-user$/) {
 &Tmp-String-0 := "foo\nbar"
 
 # compiled - ref - multiline
-if (&Tmp-String-0 !~ /^foo$/m) {
+if !(&Tmp-String-0 =~ /^foo$/m) {
        test_fail
 }
 
@@ -80,12 +80,12 @@ if (&Tmp-String-0 =~ /^foo$/) {
 # compiled - ref - non-multiline
 # Not all POSIX implementations support the \n character classes
 # so only run this test if the server was built with libpcre.
-if ((('${feature.regex-pcre}' == 'yes') || ('${feature.regex-pcre2}' == 'yes')) && (&Tmp-String-0 !~ /^foo\nbar$/)) {
+if ((('${feature.regex-pcre}' == 'yes') || ('${feature.regex-pcre2}' == 'yes')) && !(&Tmp-String-0 =~ /^foo\nbar$/)) {
        test_fail
 }
 
 # compiled - ref - multiline
-if (&Tmp-String-0 !~ /^bar$/m) {
+if !(&Tmp-String-0 =~ /^bar$/m) {
        test_fail
 }
 
@@ -95,12 +95,12 @@ if (&Tmp-String-0 =~ /^BAR$/m) {
 }
 
 # compiled - ref - multiline - insensitive
-if (&Tmp-String-0 !~ /^BAR$/mi) {
+if !(&Tmp-String-0 =~ /^BAR$/mi) {
        test_fail
 }
 
 # compiled - ref - multiline - insensitive (flag order reversed)
-if (&Tmp-String-0 !~ /^BAR$/im) {
+if !(&Tmp-String-0 =~ /^BAR$/im) {
        test_fail
 }
 

diff --git a/src/tests/keywords/if-regex-nil b/src/tests/keywords/if-regex-nil
index 5929174c4cc805c42c62d283a59087d4fb2c56b6..0bb6c6057a7469ecc1e5c4ab0ead2ca5babfcf9f 100644 (file)
--- a/src/tests/keywords/if-regex-nil
+++ b/src/tests/keywords/if-regex-nil
@@ -1,7 +1,7 @@
 #
 #  PRE: if
 #
-if (&User-Name !~ /^\0/) {
+if !(&User-Name =~ /^\0/) {
        success
 } else {
        test_fail

diff --git a/src/tests/keywords/regex-lhs b/src/tests/keywords/regex-lhs
index d5266a9079f357e4abc2e918f3107b70740a26c4..e763c92a43c6687aa050b71b82599baeccad995d 100644 (file)
--- a/src/tests/keywords/regex-lhs
+++ b/src/tests/keywords/regex-lhs
@@ -11,10 +11,10 @@
        &Tmp-String-1 = "^foo$bar"
 }
 
-if (&Tmp-String-0 !~ /example\.com$/) {
+if !(&Tmp-String-0 =~ /example\.com$/) {
        test_fail
 }
-elsif (&Tmp-String-1 !~ /\^foo\$bar/) {
+elsif !(&Tmp-String-1 =~ /\^foo\$bar/) {
        test_fail
 }
 

diff --git a/src/tests/keywords/truncation b/src/tests/keywords/truncation
index 429f32eedafcc48379fe29689687753061473ec9..43fa4f864c50b4db4b8b3c3fa310d80002d1f4f7 100644 (file)
--- a/src/tests/keywords/truncation
+++ b/src/tests/keywords/truncation
@@ -78,7 +78,7 @@ if (!(%(length:%{Tmp-Octets-0}) == 4083)) {
 }
 
 # Octets are expanded to 8168 hexits
-if ("%{Tmp-Octets-0}" !~ /^0x([0-9a-f]+)$/) {
+if !("%{Tmp-Octets-0}" =~ /^0x([0-9a-f]+)$/) {
        test_fail
 }