From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 5 Dec 2022 15:32:41 +0000 (-0500)
Subject: more != to !(==)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d7b53051a910801f8d9e4fdececc00deb16696f;p=thirdparty%2Ffreeradius-server.git

more != to !(==)
---

diff --git a/src/tests/keywords/comments b/src/tests/keywords/comments
index d0237265b5a..bfb568b4019 100644
--- a/src/tests/keywords/comments
+++ b/src/tests/keywords/comments
@@ -29,7 +29,7 @@ if (!(&Tmp-String-0 == 'candy')) {
 	test_fail
 }
 
-if (&request.Reply-Message[0] != 'I am #literally a comment #') {
+if !(&request.Reply-Message[0] == 'I am #literally a comment #') {
 	test_fail
 }
 
diff --git a/src/tests/keywords/concat b/src/tests/keywords/concat
index 7851f6c36b7..5b38669cd25 100644
--- a/src/tests/keywords/concat
+++ b/src/tests/keywords/concat
@@ -52,7 +52,7 @@ if (!(&Tmp-String-4 == "ab c,de fg")) {
 	&Tmp-String-5 = "%(concat:%{Tmp-String-0[*]} |-)"
 }
 
-if (&Tmp-String-5 !="ab c|-de fg") {
+if !(&Tmp-String-5 == "ab c|-de fg") {
 	test_fail
 }
 
diff --git a/src/tests/keywords/date b/src/tests/keywords/date
index 228593764b1..5422a9b2d15 100644
--- a/src/tests/keywords/date
+++ b/src/tests/keywords/date
@@ -41,7 +41,7 @@ if (!(&Tmp-Integer-2 == &Tmp-Integer-0)) {
 &Tmp-Date-0 := 1659985459
 &Tmp-String-2 := "%(sqldate:%{Tmp-Date-0})"
 
-if (&Tmp-String-2 != '2022-08-08 19:04:19') {
+if !(&Tmp-String-2 == '2022-08-08 19:04:19') {
 	test_fail
 }
 
@@ -54,7 +54,7 @@ if (&Tmp-String-4) {
 	test_fail
 }
 
-if (&Module-Failure-Message != "Failed to parse time string \"201-32-22 17:25:00\" as format '\%Y-\%m-\%d \%H:\%M:\%S'") {
+if (!(&Module-Failure-Message == "Failed to parse time string \"201-32-22 17:25:00\" as format '\%Y-\%m-\%d \%H:\%M:\%S'")) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/edit-abort.ignore b/src/tests/keywords/edit-abort.ignore
index 8ef8a09b1c6..6b26b4452da 100644
--- a/src/tests/keywords/edit-abort.ignore
+++ b/src/tests/keywords/edit-abort.ignore
@@ -16,11 +16,11 @@ update request {
 #
 #  The various edits above should have been reverted.
 #
-if (&Tmp-Integer-0 != 4) {
+if !(&Tmp-Integer-0 == 4) {
 	test_fail
 }
 
-if (&Tmp-Integer-1 != 5) {
+if !(&Tmp-Integer-1 == 5) {
 	test_fail
 }
 success
diff --git a/src/tests/keywords/escape-sequences b/src/tests/keywords/escape-sequences
index 5a8003077b1..0ee571a01e6 100644
--- a/src/tests/keywords/escape-sequences
+++ b/src/tests/keywords/escape-sequences
@@ -50,7 +50,7 @@ if (!("%{Tmp-String-0[1]}" == "0x01\0010x07\0070x0A\n0x0D\r\"\"0xb0\260°")) {
 }
 
 # And another slightly different codepath...
-if ("%{Tmp-String-0[*]}" != "i have scary embedded things\000 inside me0x01\0010x07\0070x0A\n0x0D\r\"\"0xb0\260°") {
+if !("%{Tmp-String-0[*]}" == "i have scary embedded things\000 inside me0x01\0010x07\0070x0A\n0x0D\r\"\"0xb0\260°") {
 	test_fail
 }
 
diff --git a/src/tests/keywords/expr b/src/tests/keywords/expr
index b57810c4b57..4851a558140 100644
--- a/src/tests/keywords/expr
+++ b/src/tests/keywords/expr
@@ -8,7 +8,7 @@
 if (!(%{expr: 1 + 2 + 3 + 4} == 10)) {
 	test_fail
 }
-if (1 + 2 + 3 + 4 != 10) {
+if !(1 + 2 + 3 + 4 == 10) {
 	test_fail
 }
 
@@ -18,7 +18,7 @@ if (1 + 2 + 3 + 4 != 10) {
 if (!(%{expr: 1 + 2 * 3 + 4} == 11)) {
 	test_fail
 }
-if (1 + 2 * 3 + 4 != 11) {
+if !(1 + 2 * 3 + 4 == 11) {
 	test_fail
 }
 
@@ -33,7 +33,7 @@ if (1 + 2 * 3 + 4 != 11) {
 if (!(%{expr: 1 + 2 * &Tmp-Integer-1 + 4} == 11)) {
 	test_fail
 }
-if (1 + 2 * &Tmp-Integer-1 + 4 != 11) {
+if !(1 + 2 * &Tmp-Integer-1 + 4 == 11) {
 	test_fail
 }
 
@@ -41,56 +41,56 @@ if (1 + 2 * &Tmp-Integer-1 + 4 != 11) {
 if (!(%{expr: 1 + 2 * (&Tmp-Integer-1 + 4)} == 15)) {
 	test_fail
 }
-if (1 + 2 * (&Tmp-Integer-1 + 4) != 15) {
+if !(1 + 2 * (&Tmp-Integer-1 + 4) == 15) {
 	test_fail
 }
 
 if (!(%{expr: 1 + 2 * (&Tmp-Integer-1 + &Tmp-Integer-2)} == 15)) {
 	test_fail
 }
-if (1 + 2 * (&Tmp-Integer-1 + &Tmp-Integer-2) != 15) {
+if !(1 + 2 * (&Tmp-Integer-1 + &Tmp-Integer-2) == 15) {
 	test_fail
 }
 
 if (!(%{expr: 1 & ~1} == 0)) {
 	test_fail
 }
-if ((1 & ~1) != 0) {	# needs an extra () to resolve ambiguities and warnings
+if !((1 & ~1) == 0) {	# needs an extra () to resolve ambiguities and warnings
 	test_fail
 }
 
 if (!(%{expr: 1 & ~2} == 1)) {
 	test_fail
 }
-if ((1 & ~2) != 1) {	# needs an extra () to resolve ambiguities and warnings
+if !((1 & ~2) == 1) {	# needs an extra () to resolve ambiguities and warnings
 	test_fail
 }
 
 if (!(%{expr: -1 * 2} == -2)) {
 	test_fail
 }
-if (-1 * 2 != -2) {
+if !(-1 * 2 == -2) {
 	test_fail
 }
 
 if (!(%{expr: 11 % 2} == 1)) {
 	test_fail
 }
-if (11 % 2 != 1) {
+if !(11 % 2 == 1) {
 	test_fail
 }
 
 if (!(%{expr: 2 - -1} == 3)) {
 	test_fail
 }
-if (2 - -1 != 3) {
+if !(2 - -1 == 3) {
 	test_fail
 }
 
 if (!(%{expr: 1 << 2 | 1} == 5)) {
 	test_fail
 }
-if (((1 << 2) | 1) != 5) {	# needs extra () to resolve precedence
+if !(((1 << 2) | 1) == 5) {	# needs extra () to resolve precedence
 	test_fail
 }
 
@@ -107,14 +107,14 @@ if (&Tmp-Date-0 <= 0) {
 if (!(%{expr: 6 + -(1 + 3)} == 2)) {
 	test_fail
 }
-if (6 + -(1 + 3) != 2) {
+if !(6 + -(1 + 3) == 2) {
 	test_fail
 }
 
 if (!(%{expr: 6 * -&Tmp-Integer-2} == -24)) {
 	test_fail
 }
-if (6 * -&Tmp-Integer-2 != -24) {
+if !(6 * -&Tmp-Integer-2 == -24) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/if-multiline b/src/tests/keywords/if-multiline
index d2f5573fdb3..f57cacf0d52 100644
--- a/src/tests/keywords/if-multiline
+++ b/src/tests/keywords/if-multiline
@@ -4,8 +4,8 @@
 #  Now that we ignore whitespace (including \r\n) inside of a *bracketed* expression,
 #  we can magically have multiline "if" statements.
 #
-if (1 + 2
-	!= 3) {
+if !(1 + 2
+	== 3) {
 	test_fail
 }
 success
diff --git a/src/tests/keywords/load-balance b/src/tests/keywords/load-balance
index 863d06ebc0c..8925bfd2449 100644
--- a/src/tests/keywords/load-balance
+++ b/src/tests/keywords/load-balance
@@ -90,7 +90,7 @@ if ((&Tmp-Integer-0 == 0) || (&Tmp-Integer-1 == 0)) {
 	test_fail
 }
 
-if (&Tmp-Integer-0 + &Tmp-Integer-1 != 50) {
+if !(&Tmp-Integer-0 + &Tmp-Integer-1 == 50) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/module-failure-message b/src/tests/keywords/module-failure-message
index 597adbd9d36..22088ce3249 100644
--- a/src/tests/keywords/module-failure-message
+++ b/src/tests/keywords/module-failure-message
@@ -4,23 +4,23 @@
 
 test
 
-if (&Module-Failure-Message[4] != 'test: RERROR error message') {
+if !(&Module-Failure-Message[4] == 'test: RERROR error message') {
 	test_fail
 }
 
-if (&Module-Failure-Message[3] != 'test: RDEBUG error message') {
+if !(&Module-Failure-Message[3] == 'test: RDEBUG error message') {
 	test_fail
 }
 
-if (&Module-Failure-Message[2] != 'test: RDEBUG2 error message') {
+if !(&Module-Failure-Message[2] == 'test: RDEBUG2 error message') {
 	test_fail
 }
 
-if (&Module-Failure-Message[1] != 'test: RDEBUG3 error message') {
+if !(&Module-Failure-Message[1] == 'test: RDEBUG3 error message') {
 	test_fail
 }
 
-if (&Module-Failure-Message[0] != 'test: RDEBUG4 error message') {
+if !(&Module-Failure-Message[0] == 'test: RDEBUG4 error message') {
 	test_fail
 }
 
diff --git a/src/tests/keywords/pairs b/src/tests/keywords/pairs
index 479ab5ed4a5..35b89f91992 100644
--- a/src/tests/keywords/pairs
+++ b/src/tests/keywords/pairs
@@ -18,19 +18,19 @@
 	&Tmp-String-5 = "%(pairs:control.User-Name)"
 }
 
-if (&Tmp-String-1 != "User-Name = \"bob\", User-Password = \"hello\", Tmp-String-0 = \"This is a string\", Tmp-String-0 = \"This is another one\", Tmp-Octets-0 = 0x000504030201, Tmp-Integer-0 = 7331") {
+if !(&Tmp-String-1 == "User-Name = \"bob\", User-Password = \"hello\", Tmp-String-0 = \"This is a string\", Tmp-String-0 = \"This is another one\", Tmp-Octets-0 = 0x000504030201, Tmp-Integer-0 = 7331") {
 	test_fail
 }
 
-if (&Tmp-String-2 != "Tmp-String-0 = \"This is a string\"") {
+if !(&Tmp-String-2 == "Tmp-String-0 = \"This is a string\"") {
 	test_fail
 }
 
-if (&Tmp-String-3 != "Tmp-String-0 = \"This is a string\", Tmp-String-0 = \"This is another one\"") {
+if !(&Tmp-String-3 == "Tmp-String-0 = \"This is a string\", Tmp-String-0 = \"This is another one\"") {
 	test_fail
 }
 
-if (&Tmp-String-4 != "Password.Cleartext = \"hello\"") {
+if !(&Tmp-String-4 == "Password.Cleartext = \"hello\"") {
 	test_fail
 }
 
diff --git a/src/tests/keywords/subrequest-src-dst b/src/tests/keywords/subrequest-src-dst
index e7d97a60dba..33162169e9c 100644
--- a/src/tests/keywords/subrequest-src-dst
+++ b/src/tests/keywords/subrequest-src-dst
@@ -21,7 +21,7 @@ if (!&reply.Tmp-Group-0.Tmp-String-0) {
 	test_fail
 }
 
-if (&reply.Tmp-Group-0.Tmp-String-0 != 'hello from subrequest') {
+if !(&reply.Tmp-Group-0.Tmp-String-0 == 'hello from subrequest') {
 	test_fail
 }
 
diff --git a/src/tests/keywords/subrequest-src-dst-nested b/src/tests/keywords/subrequest-src-dst-nested
index b45a7cdfc49..29121b9b95c 100644
--- a/src/tests/keywords/subrequest-src-dst-nested
+++ b/src/tests/keywords/subrequest-src-dst-nested
@@ -23,7 +23,7 @@ if (!&reply.Tmp-Group-0.Tmp-Group-0.Tmp-String-0) {
 	test_fail
 }
 
-if (&reply.Tmp-Group-0.Tmp-Group-0.Tmp-String-0 != 'hello from subrequest') {
+if !(&reply.Tmp-Group-0.Tmp-Group-0.Tmp-String-0 == 'hello from subrequest') {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-unknown.ignore b/src/tests/keywords/update-unknown.ignore
index ad6cf329447..91f0589312f 100644
--- a/src/tests/keywords/update-unknown.ignore
+++ b/src/tests/keywords/update-unknown.ignore
@@ -15,15 +15,15 @@ update {
 	&255 = 0x00
 }
 
-if (&26.6139.1 != 0x00000013) {
+if !(&26.6139.1 == 0x00000013) {
 	test_fail
 }
 
-if (&26.9.42 != 0x0001020304) {
+if !(&26.9.42 == 0x0001020304) {
 	test_fail
 }
 
-if (&255 != 0x00) {
+if !(&255 == 0x00) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-xlat.ignore b/src/tests/keywords/update-xlat.ignore
index 01fcc231ad5..8b246a08f0c 100644
--- a/src/tests/keywords/update-xlat.ignore
+++ b/src/tests/keywords/update-xlat.ignore
@@ -17,7 +17,7 @@ update request {
 	"%{Tmp-String-0}" := 'hello'
 }
 
-if (&Tmp-String-1 != 'hello') {
+if !(&Tmp-String-1 == 'hello') {
 	test_fail
 }
 
@@ -36,7 +36,7 @@ update {
 	"Vendor-%{Tmp-Integer-0}-1" := 0x01020304
 }
 
-if (&Vendor-66-1 != 0x01020304) {
+if !(&Vendor-66-1 == 0x01020304) {
 	test_fail
 }
 
@@ -51,7 +51,7 @@ update {
 	"Vendor-%{Tmp-Integer-0}-1" := 127.0.0.1
 }
 
-if (&Vendor-Specific.FreeRADIUS.Proxied-To != 127.0.0.1) {
+if !(&Vendor-Specific.FreeRADIUS.Proxied-To == 127.0.0.1) {
 	test_fail
 }
 
@@ -59,7 +59,7 @@ update {
 	"%(attr_num:Tmp-String-1)" := 'hello2'
 }
 
-if (&Tmp-String-1 != 'hello2') {
+if !(&Tmp-String-1 == 'hello2') {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-escape b/src/tests/keywords/xlat-escape
index 01b10009d6f..8a511810416 100644
--- a/src/tests/keywords/xlat-escape
+++ b/src/tests/keywords/xlat-escape
@@ -4,11 +4,11 @@
 #
 #  Verify escaping of %
 #
-if ("\%{ FOO}" != '%{ FOO}') {
+if !("\%{ FOO}" == '%{ FOO}') {
 	test_fail
 }
 
-if ("%{tolower:\%{ FOO}" != '%{ foo') {
+if !("%{tolower:\%{ FOO}" == '%{ foo') {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-explode b/src/tests/keywords/xlat-explode
index 5c432150ec6..9def851422c 100644
--- a/src/tests/keywords/xlat-explode
+++ b/src/tests/keywords/xlat-explode
@@ -25,23 +25,23 @@
 
 debug_all
 
-if (!("%{Tmp-String-1}" == "1=1,my_attr=2,my_attr=hello")) {
+if (!(&Tmp-String-1 == "1=1,my_attr=2,my_attr=hello")) {
 	test_fail
 }
 
-if (!("%{Tmp-String-2}" == "")) {
+if (!(&Tmp-String-2 == "")) {
 	test_fail
 }
 
-if (!("%{Tmp-String-3}" == "hello,goodbye,morning,night,1")) {
+if (!(&Tmp-String-3 == "hello,goodbye,morning,night,1")) {
 	test_fail
 }
 
-if ("%{Tmp-String-4}" != 'Can\'t touch this') {
+if !(&Tmp-String-4 == 'Can\'t touch this') {
 	test_fail
 }
 
-if ("%{Tmp-String-5}" != 'here, are ,some, words') {
+if !(&Tmp-String-5 == 'here, are ,some, words') {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-integer b/src/tests/keywords/xlat-integer
index 137af359327..9d445a20789 100644
--- a/src/tests/keywords/xlat-integer
+++ b/src/tests/keywords/xlat-integer
@@ -26,7 +26,7 @@ if (!(((integer)&Tmp-String-0 == &Tmp-Integer-1)) || (!(&Tmp-Integer-1 == 9870))
 
 # String - network order representation of a 8 char string
 &Tmp-uint64-0 := "%(integer:%{Tmp-String-1})"
-if (((integer64) &Tmp-String-1 != &Tmp-uint64-0) || (!(&Tmp-uint64-0 == 98709870))) {
+if (!((integer64) &Tmp-String-1 == &Tmp-uint64-0) || (!(&Tmp-uint64-0 == 98709870))) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-soh b/src/tests/keywords/xlat-soh
index d8409350297..7e65fb5ddfe 100644
--- a/src/tests/keywords/xlat-soh
+++ b/src/tests/keywords/xlat-soh
@@ -39,7 +39,7 @@ if (!("%{Tmp-String-0}" == "Windows unknown")) {
 &Tmp-String-0 := %(soh:OS)
 
 # Complete set of data should match a real version of Windows
-if ("%{Tmp-String-0}" != "Windows Vista / Server 2008 6.0.6001 sp 1.0" ) {
+if !(&Tmp-String-0 == "Windows Vista / Server 2008 6.0.6001 sp 1.0" ) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-string b/src/tests/keywords/xlat-string
index 045d36145c3..b8116bc1a24 100644
--- a/src/tests/keywords/xlat-string
+++ b/src/tests/keywords/xlat-string
@@ -59,7 +59,7 @@ if (!("%{string:%{Tmp-Octets-4}}%{string:%{Tmp-Octets-5}}test3" == "test1test2te
 	test_fail
 }
 
-if (&Tmp-String-1 != 'I like chicken I like liver') {
+if !(&Tmp-String-1 == 'I like chicken I like liver') {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-subst b/src/tests/keywords/xlat-subst
index bb30c67d165..35a195caa93 100644
--- a/src/tests/keywords/xlat-subst
+++ b/src/tests/keywords/xlat-subst
@@ -105,7 +105,7 @@ if ("%(subst:%{Tmp-String-0} /***/g .)") {
 	test_fail
 }
 
-if (&Module-Failure-Message[0] != 'Failed compiling regex: quantifier does not follow a repeatable item') {
+if !(&Module-Failure-Message[0] == 'Failed compiling regex: quantifier does not follow a repeatable item') {
 	test_fail
 }
 
@@ -116,7 +116,7 @@ if ("%(subst:%{Tmp-String-0} //g .)") {
 	test_fail
 }
 
-if (&Module-Failure-Message[0] != 'Failed compiling regex: Empty expression') {
+if !(&Module-Failure-Message[0] == 'Failed compiling regex: Empty expression') {
 	test_fail
 }
 }