From: Alan T. DeKok Date: Sun, 15 Oct 2023 12:54:34 +0000 (-0400) Subject: remove %integer() from the tests X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6024690451663715d6bb2436dbd679b62c569249;p=thirdparty%2Ffreeradius-server.git remove %integer() from the tests --- diff --git a/src/tests/keywords/date b/src/tests/keywords/date index 3207c77548f..77636b59723 100644 --- a/src/tests/keywords/date +++ b/src/tests/keywords/date @@ -1,7 +1,6 @@ # # PRE: if # - # Use pre-defined date and time &Tmp-Integer-0 := 1506101100 @@ -14,7 +13,8 @@ if (!(&Tmp-String-0 == "Fri 22 Sep 17:25:00 GMT 2017")) && (!(&Tmp-String-0 == " } # Convert string to integer -&Tmp-Integer-1 := %integer(%date(%{Tmp-String-0})) +&Tmp-Integer-1 := %date(%{Tmp-String-0}) + if (!(&Tmp-Integer-1 == &Tmp-Integer-0)) { test_fail @@ -31,7 +31,7 @@ if (!(&Tmp-String-0 == &Tmp-String-1)) { # Convert different string format &Tmp-String-2 := "2017-09-22 17:25:00" -&Tmp-Integer-2 := %integer(%sqldate(%{Tmp-String-2})) +&Tmp-Integer-2 := %sqldate(%{Tmp-String-2}) if (!(&Tmp-Integer-2 == &Tmp-Integer-0)) { test_fail diff --git a/src/tests/keywords/edit-set-fail b/src/tests/keywords/edit-set-fail index 9f4ff6a8cb9..8ad79e32fc5 100644 --- a/src/tests/keywords/edit-set-fail +++ b/src/tests/keywords/edit-set-fail @@ -12,7 +12,7 @@ if !(&NAS-Port == 1812) { # # Service-Type doesn't exist, so the ":=" means "delete everything" # -&NAS-Port := %integer(%{Service-Type}) +&NAS-Port := (integer) &Service-Type # # This should no longer exist. diff --git a/src/tests/keywords/xlat-integer b/src/tests/keywords/xlat-integer deleted file mode 100644 index c19aeca2962..00000000000 --- a/src/tests/keywords/xlat-integer +++ /dev/null @@ -1,152 +0,0 @@ -&request += { - &Tmp-String-0 = '9870' - &Tmp-String-1 = '98709870' - &Tmp-String-2 = '184467440737095516157' - &Tmp-Octets-0 = 0x39383731 - &Tmp-Octets-1 = 0x3938373139383731 - &Tmp-Octets-2 = 0x393837313938373139383731 - &Tmp-IP-Address-0 = 57.56.55.50 - &Tmp-Date-0 = 959985459 - &Tmp-Integer-0 = 959985460 - &Tmp-Cast-IfId = '0000:0000:3938:3737' - &Tmp-Cast-IPv6Addr = '::3938:3738' - &Tmp-Cast-IPv6Prefix = '::3938:3739/128' - &Tmp-Cast-Byte = 58 - &Tmp-Cast-Short = 14139 - &Tmp-Cast-Ether = 00:00:39:38:37:3c - &Tmp-Cast-Integer64 = 1152921505566832445 - &Tmp-Cast-IPv4Prefix = 57.56.55.62/32 -} - -# String - network order representation of a 4 char string -&Tmp-Integer-1 := "%integer(%{Tmp-String-0})" -if (!(((integer)&Tmp-String-0 == &Tmp-Integer-1)) || (!(&Tmp-Integer-1 == 9870))) { - test_fail -} - -# 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))) { - test_fail -} - -# String - Can't convert 12 byte string to integer (our biggest native size is a 64bit unsigned int) -if ("%integer(%{Tmp-String-2})") { - test_fail -} - -# Octets - network order representation of a 4 byte octet string -&Tmp-Integer-1 := "%integer(%{Tmp-Octets-0})" - -if (!(%{Tmp-Octets-0} == (octets)%{Tmp-Integer-1})) { - test_fail -} - -if (!(&Tmp-Integer-1 == 959985457)) { - test_fail -} - -# Octets - network order representation of a 8 byte octet string -&Tmp-uint64-0 := "%integer(%{Tmp-Octets-1})" - -if (!(%{Tmp-Octets-1} == (octets)%{Tmp-uint64-0})) { - test_fail -} - -if (!(&Tmp-uint64-0 == 4123106143410599729)) { - test_fail -} - -# String - Can't convert 12 byte octet string to integer (our biggest native size is a 64bit unsigned int) -if ("%integer(%{Tmp-Octets-2})") { - test_fail -} - -&Tmp-String-2 := "%integer(%{Tmp-IP-Address-0})" -&Tmp-String-3 := "%integer(%{Tmp-Date-0})" -&Tmp-String-4 := "%integer(%{Tmp-Integer-0})" -&Tmp-String-6 := "%integer(%{Tmp-Cast-Ifid})" -&Tmp-String-7 := "%integer(%{Tmp-Cast-IPv6Addr})" -&Tmp-String-8 := "%integer(%{Tmp-Cast-IPv6Prefix})" - -# IP Address -if (!(&Tmp-String-2 == '959985458')) { - test_fail -} - -if (!((ipaddr)&Tmp-String-2 == &Tmp-IP-Address-0)) { - test_fail -} - -# Date -if (!(&Tmp-String-3 == '959985459')) { - test_fail -} - -# Integer -if (!(&Tmp-String-4 == '959985460')) { - test_fail -} - -# ifid - Can't convert interface ID to an integer -if (!(&Tmp-String-6 == '')) { - test_fail -} - -# ipv6addr - Can't convert IPv6 to integer -if (!(&Tmp-String-7 == '959985464')) { - test_fail -} - -# ipv6addrprefix -if (!(&Tmp-String-8 == '959985465')) { - test_fail -} - -&Tmp-String-0 := "%integer(%{Tmp-Cast-Byte})" -&Tmp-String-1 := "%integer(%{Tmp-Cast-Short})" -&Tmp-uint64-2 := "%integer(%{Tmp-Cast-Ether})" -&Tmp-String-3 := "%integer(%{Tmp-Cast-Integer64})" -&Tmp-String-4 := "%integer(%{Tmp-Cast-IPv4Prefix})" - -# byte -if (!(&Tmp-String-0 == '58')) { - test_fail -} - -# short -if (!(&Tmp-String-1 == '14139')) { - test_fail -} - -# ethernet -if (!(&Tmp-uint64-2 == 959985468)) { - test_fail -} - -# -# The integer is in host order, so it's cast to an ethernet address, -# with the lowest octet of the integer mapping to the right-most -# ethernet octet (in network order) -# -if (!((ether)&Tmp-uint64-2 == &Tmp-Cast-Ether)) { - test_fail -} - -# integer64 -if (!(&Tmp-String-3 == '1152921505566832445')) { - test_fail -} - -# ipv4prefix -if (!(&Tmp-String-4 == '959985470')) { - test_fail -} - -&Service-Type := Login-User -&Tmp-Integer-2 := "%integer(%{Service-Type})" -if (!(&Tmp-Integer-2 == 1)) { - test_fail -} - -success diff --git a/src/tests/unit/condition/xlat.txt b/src/tests/unit/condition/xlat.txt deleted file mode 100644 index deab84cf4c6..00000000000 --- a/src/tests/unit/condition/xlat.txt +++ /dev/null @@ -1,10 +0,0 @@ -proto-dictionary radius - -condition %(integer:0) -match %(integer:0) - -condition (%(integer:0)) -match %(integer:0) - -count -match 5