more cast fixes

diff --git a/src/tests/keywords/expr-acct b/src/tests/keywords/expr-acct
index 1f64df27e9629c963add6633517ee41a81000b61..b010495fc9cbf4c81965d7c624b0c023afc5ca13 100644 (file)
--- a/src/tests/keywords/expr-acct
+++ b/src/tests/keywords/expr-acct
@@ -2,7 +2,7 @@
 #  PRE: if edit
 #
 
-&Tmp-String-0 := "%{expr:(<uint64>&Acct-Input-Gigawords << 32) | <uint64>&Acct-Input-Octets}"
+&Tmp-String-0 := "%{expr:((uint64)&Acct-Input-Gigawords << 32) | (uint64)&Acct-Input-Octets}"
 
 if (!(&Tmp-String-0 == '')) {
        test_fail

diff --git a/src/tests/modules/cipher/rsa_encrypt_decrypt.unlang b/src/tests/modules/cipher/rsa_encrypt_decrypt.unlang
index e86dfac24a89249408526d1b182bb7a072111edc..8e448b11d21a087c385ade64ee8e4dffb09ba817 100644 (file)
--- a/src/tests/modules/cipher/rsa_encrypt_decrypt.unlang
+++ b/src/tests/modules/cipher/rsa_encrypt_decrypt.unlang
@@ -1,5 +1,5 @@
 &Tmp-String-0 := "Hello world!"
-&Tmp-Octets-0 := "%{cipher_rsa.encrypt:%{Tmp-String-0}}"
+&Tmp-Octets-0 := "%cipher_rsa.encrypt(%{Tmp-String-0})"
 
 if (!&Tmp-Octets-0) {
        test_fail
@@ -8,7 +8,7 @@ else {
        test_pass
 }
 
-if (<octets>&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
+if ((octets)&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
        test_fail
 }
 else {
@@ -49,7 +49,7 @@ else {
        test_pass
 }
 
-if (<octets>&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
+if ((octets)&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
        test_fail
 }
 else {

diff --git a/src/tests/modules/cipher/rsa_sign_verify.unlang b/src/tests/modules/cipher/rsa_sign_verify.unlang
index 5325fc66c03370d07467179d7af60d0f2962770a..d89e5269bf77d544d16a7990d53e5cce8ae01b10 100644 (file)
--- a/src/tests/modules/cipher/rsa_sign_verify.unlang
+++ b/src/tests/modules/cipher/rsa_sign_verify.unlang
@@ -5,7 +5,7 @@ if (!&Tmp-Octets-0) {
        test_fail
 }
 
-if (<octets>&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
+if ((octets)&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
        test_fail
 }
 
@@ -38,7 +38,7 @@ if (!&Tmp-Octets-0) {
        test_fail
 }
 
-if (<octets>&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
+if ((octets)&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
        test_fail
 }
 

diff --git a/src/tests/modules/cipher/valid.unlang b/src/tests/modules/cipher/valid.unlang
index aed4692c0b5667eb9820991a33b5eedd6732021d..c9b94520b1d816bbbe06c44a14e9221614ab1ee4 100644 (file)
--- a/src/tests/modules/cipher/valid.unlang
+++ b/src/tests/modules/cipher/valid.unlang
@@ -1,8 +1,8 @@
-&Tmp-Date-0 := "%(cipher_rsa.certificate:notBefore)"
-&Tmp-Date-1 := "%(cipher_rsa.certificate:notAfter)"
+&Tmp-Date-0 := "%cipher_rsa.certificate(notBefore)"
+&Tmp-Date-1 := "%cipher_rsa.certificate(notAfter)"
 
 # Check the cert validity period is 30 days
-if (<uint32>"%{expr:%(integer:%{Tmp-Date-1}) - %(integer:%{Tmp-Date-0})}" != <uint32>"%{expr:86400 * 60}") {
+if !((&Tmp-Date-1 - &Tmp-Date-0) == ((time_delta) (86400 * 60))) {
        test_fail
 } else {
        test_pass

diff --git a/src/tests/modules/json/eval.unlang b/src/tests/modules/json/eval.unlang
index 0d92f45dc4247ffe0b66348df92393a80bfa34d7..d0c06b8cf3413c42fdec8f121dd6a1e5df9c3fc3 100644 (file)
--- a/src/tests/modules/json/eval.unlang
+++ b/src/tests/modules/json/eval.unlang
@@ -370,7 +370,7 @@ if !(&Tmp-Integer-0 == 2147483647) {
 map json &Tmp-String-0 {
        &Tmp-int64-0 := '$[0]'
 }
-if !(&Tmp-int64-0 == <int64>9223372036854775807) {
+if !(&Tmp-int64-0 == (int64)9223372036854775807) {
        test_fail
 }