more "convert to use new edits"

including removing more %{expr:...}, and just using in-place
additions for load-balance.

diff --git a/src/tests/keywords/if b/src/tests/keywords/if
index 136ca4041a09180860f9e745452b8b76c8263fa6..967ea082c1e7538eb93b62a252db5dc182cd5c7a 100644 (file)
--- a/src/tests/keywords/if
+++ b/src/tests/keywords/if
@@ -1,6 +1,3 @@
-#
-#  PRE: update
-#
 #  Static if condition
 #
 if (1) {

diff --git a/src/tests/keywords/if-bob b/src/tests/keywords/if-bob
index 93f0ddd1723dfb198a25abb8923737012a9082dc..7bebd97e479519a5e31d8b9ca6e546615ba41cff 100644 (file)
--- a/src/tests/keywords/if-bob
+++ b/src/tests/keywords/if-bob
@@ -7,7 +7,5 @@ if (&User-Name == "bob") {
 }
 
 if (&User-Name != "bob") {
-       update reply {
-               &Filter-Id := "not bob"
-       }
+       test_fail
 }

diff --git a/src/tests/keywords/if-else b/src/tests/keywords/if-else
index 568298bd34386c1984deade4e0b4551216ece951..414ca6f46aba5d13a857eef78a4385415b2aff60 100644 (file)
--- a/src/tests/keywords/if-else
+++ b/src/tests/keywords/if-else
@@ -4,9 +4,7 @@
 #  Matching "if" conditions
 #
 if (&User-Name != "bob") {
-       update reply {
-               &Filter-Id := "not bob"
-       }
+       test_fail
 }
 else {
        success

diff --git a/src/tests/keywords/if-elsif b/src/tests/keywords/if-elsif
index 1d3b893e1c588dfbbb58904353498205b64c3a13..e082a52b966a9217bc6a95e23cfcd970c025257a 100644 (file)
--- a/src/tests/keywords/if-elsif
+++ b/src/tests/keywords/if-elsif
@@ -3,15 +3,11 @@
 #  Matching "if" conditions
 #
 if (&User-Name != "bob") {
-       update reply {
-               &Filter-Id := "not bob"
-       }
+       test_fail
 }
 elsif (&User-Name == "bob") {
        success
 }
 else {
-       update reply {
-               &Filter-Id := "last else"
-       }
+       test_fail
 }

diff --git a/src/tests/keywords/if-empty-allow b/src/tests/keywords/if-empty-allow
index 493c6a32abef4ed286687c9baeea61288442878c..24a39de791eacf91debb53a91318798c47c8a901 100644 (file)
--- a/src/tests/keywords/if-empty-allow
+++ b/src/tests/keywords/if-empty-allow
@@ -1,5 +1,5 @@
 #
-#  PRE: update if
+#  PRE: if
 #
 #  Static if condition
 #

diff --git a/src/tests/keywords/if-rcode-error b/src/tests/keywords/if-rcode-error
index a68ff124be03295680f2ea0106a366a0f636a64e..c1ea293cdee44b6d41a33ec7d3ba145db1f661a7 100644 (file)
--- a/src/tests/keywords/if-rcode-error
+++ b/src/tests/keywords/if-rcode-error
@@ -3,9 +3,5 @@
 #  return code in an "if" section.
 #
 if (&User-Name == "bob") {
-       update request {
-               &Proxy-State := 0x01020304
-       }
-
        ok = reject     # ERROR
 }

diff --git a/src/tests/keywords/if-regex-empty b/src/tests/keywords/if-regex-empty
index 5ea05b23ba8337687868488fe8bec5487d702215..80c58f3e0a437b10c8e338512186d576078bfaf5 100644 (file)
--- a/src/tests/keywords/if-regex-empty
+++ b/src/tests/keywords/if-regex-empty
@@ -1,5 +1,5 @@
 #
-# PRE: update if if-regex-match
+# PRE: if if-regex-match
 #
 
 if (&control.Password.Cleartext !~ /hell(o)(.*)/) {
@@ -35,9 +35,7 @@ if ("%{1}") {
 #  Check assignment of regex null-match
 #
 if (&control.Password.Cleartext =~ /hell(o)(.*)/) {
-       update {
-               &control.Tmp-String-1 := "%{2}"
-       }
+       &control.Tmp-String-1 := "%{2}"
 }
 
 if (!&control.Tmp-String-1) {

diff --git a/src/tests/keywords/if-regex-match b/src/tests/keywords/if-regex-match
index c5f2576cfe3d4bff569a1da282be8a89fb781f57..596c7a4a71d4e2b650e8f323d82d83ab32d347c8 100644 (file)
--- a/src/tests/keywords/if-regex-match
+++ b/src/tests/keywords/if-regex-match
@@ -1,8 +1,6 @@
 # PRE: if
 #
-update request {
-       &Tmp-Integer-0 := '123456789'
-}
+&request.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}/) {
@@ -17,9 +15,7 @@ if ("%{User-Name}" !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{T
 # Matching on attribute ref with capture groups
 if (&User-Name =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
        # Test all the capture groups
-       update {
-               &reply.User-Name := "%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}"
-       }
+       &reply.User-Name := "%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}"
 }
 else {
        test_fail
@@ -95,9 +91,7 @@ if (&Tmp-Integer-0 !~ /%{Tmp-Integer-0}/) {
        test_fail
 }
 
-update request {
-       &Tmp-String-0 := "foo\nbar"
-}
+&request.Tmp-String-0 := "foo\nbar"
 
 # uncompiled - ref - multiline
 if (&Tmp-String-0 !~ /^foo$%{Tmp-String-8}/m) {

diff --git a/src/tests/keywords/if-regex-match-comp b/src/tests/keywords/if-regex-match-comp
index 26131988ed10a36a8bbedee3b4dce69e629a63f5..8f1f64585a3eeede149ef5326e9d26f9a4e9fc22 100644 (file)
--- a/src/tests/keywords/if-regex-match-comp
+++ b/src/tests/keywords/if-regex-match-comp
@@ -14,9 +14,7 @@ if ("%{User-Name}" !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/)
 # Matching on attribute ref with capture groups
 if (&User-Name =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
        # Test all the capture groups
-       update {
-               &reply.User-Name := "%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}"
-       }
+       &reply.User-Name := "%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}"
 }
 else {
        test_fail
@@ -67,9 +65,7 @@ if (&Service-Type =~ /^framed-user$/) {
        test_fail
 }
 
-update request {
-       &Tmp-String-0 := "foo\nbar"
-}
+&Tmp-String-0 := "foo\nbar"
 
 # compiled - ref - multiline
 if (&Tmp-String-0 !~ /^foo$/m) {

diff --git a/src/tests/keywords/if-tlv b/src/tests/keywords/if-tlv
index b52c18ed272559bd98096ebbcd904d7bc5a4c16a..df1ecdfe80ab0b264168df9161e1a9ebe78999ea 100644 (file)
--- a/src/tests/keywords/if-tlv
+++ b/src/tests/keywords/if-tlv
@@ -1,5 +1,5 @@
 #
-# PRE: update if
+# PRE: if
 #
 
 "%{map:&TLS-Certificate.Issuer = 'foo'}"

diff --git a/src/tests/keywords/ipaddr b/src/tests/keywords/ipaddr
index a3eaab908274d4c9a47e2d3c025400feb773a27f..6a0d62bf8a54dffe9d245944fdf8052e07ffc4e8 100644 (file)
--- a/src/tests/keywords/ipaddr
+++ b/src/tests/keywords/ipaddr
@@ -2,18 +2,18 @@
 #  PRE: update if
 #
 
-update request {
+&request += {
        # Dotted Quad
-       &Tmp-IP-Address-0 := 127.0.0.1
+       &Tmp-IP-Address-0 = 127.0.0.1
 
        # Dotted Quad with prefix
-       &Tmp-IP-Address-1 := 127.0.0.2/32
+       &Tmp-IP-Address-1 = 127.0.0.2/32
 
        # Hex (0x)
-       &Tmp-IP-Address-2 := 0x7f000003
+       &Tmp-IP-Address-2 = 0x7f000003
 
        # Decimal
-       &Tmp-IP-Address-3 := 2130706436
+       &Tmp-IP-Address-3 = 2130706436
 }
 
 if (&NAS-IP-Address != 127.0.0.1) {

diff --git a/src/tests/keywords/ipaddr.raw b/src/tests/keywords/ipaddr.raw
index cee2384dd5c92b9f40d220024041f7334ed0bb10..0c339877b61479dc0794994f7e90918b8f88efc2 100644 (file)
--- a/src/tests/keywords/ipaddr.raw
+++ b/src/tests/keywords/ipaddr.raw
@@ -5,6 +5,8 @@
 #
 #  Malformed NAS-IP-Address
 #
+#  @todo - allow "raw" in the new edit sections!
+#
 update request {
        &raw.4 = 0x010203
 }
@@ -12,16 +14,10 @@ update request {
 debug_request
 
 if (!&raw.4) {
-       update reply {
-               &Filter-Id := "Cannot find newly added raw attribute"
-       }
+       test_fail
 }
-else {
-       if (&raw.4 != 0x010203) {
-               update reply {
-                       &Filter-Id := "raw.4 is not 0x0120203"
-               }
-       }
+elsif (&raw.4 != 0x010203) {
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/ipprefix b/src/tests/keywords/ipprefix
index 2ca3063f10d20c5c77553a32e6dd1b1f0c961ed7..df5c34e38fd5ff5d5fc1f16cade75c45682b6ade 100644 (file)
--- a/src/tests/keywords/ipprefix
+++ b/src/tests/keywords/ipprefix
@@ -1,11 +1,10 @@
 #
-#  PRE: update if
+#  PRE: if
 #
-
-update control {
-       &Tmp-Cast-IPv4Prefix := 198.51.100.255/16
-       &Tmp-Cast-IPv6Prefix := ::198.51.100.255/112
-       &Framed-IP-Address := 198.51.0.1
+&control += {
+       &Tmp-Cast-IPv4Prefix = 198.51.100.255/16
+       &Tmp-Cast-IPv6Prefix = ::198.51.100.255/112
+       &Framed-IP-Address = 198.51.0.1
 }
 
 if (&control.Tmp-Cast-IPv6Prefix != '::198.51.0.0/112') {

diff --git a/src/tests/keywords/list-existence b/src/tests/keywords/list-existence
index 163137cebc31490a85327e3b1e073f9202c4a9da..f4bf6d2a3eb5dd91f3d47914067b40d07a01a1f0 100644 (file)
--- a/src/tests/keywords/list-existence
+++ b/src/tests/keywords/list-existence
@@ -13,9 +13,7 @@ if (&session-state.) {
        test_fail
 }
 
-update session-state {
-       &User-Name := 'foo'
-}
+&session-state.User-Name := 'foo'
 
 if (!&session-state.) {
        test_fail

diff --git a/src/tests/keywords/load-balance b/src/tests/keywords/load-balance
index ecea871e9f8c366ccee2e74bde0b82df2c7fab2a..17f1b7c132303740d94a25b3e32da09709e041d3 100644 (file)
--- a/src/tests/keywords/load-balance
+++ b/src/tests/keywords/load-balance
@@ -1,63 +1,64 @@
-# PRE: update if foreach
+#
+# PRE: if foreach
 #
 #  Load-Balance blocks.
 #
 #  Should distribute load between the modules.
 #
-update request {
-    &Tmp-Integer-0 := 0
-    &Tmp-Integer-1 := 0
+&request += {
+    &Tmp-Integer-0 = 0
+    &Tmp-Integer-1 = 0
 
-    &Tmp-Integer-2 += 0                # 0
-    &Tmp-Integer-2 += 1
-    &Tmp-Integer-2 += 2
-    &Tmp-Integer-2 += 3
-    &Tmp-Integer-2 += 4
-    &Tmp-Integer-2 += 5
-    &Tmp-Integer-2 += 6
-    &Tmp-Integer-2 += 7
-    &Tmp-Integer-2 += 8
-    &Tmp-Integer-2 += 9                # 10
-    &Tmp-Integer-2 += 0
-    &Tmp-Integer-2 += 1
-    &Tmp-Integer-2 += 2
-    &Tmp-Integer-2 += 3
-    &Tmp-Integer-2 += 4
-    &Tmp-Integer-2 += 5
-    &Tmp-Integer-2 += 6
-    &Tmp-Integer-2 += 7
-    &Tmp-Integer-2 += 8
-    &Tmp-Integer-2 += 9                # 20
-    &Tmp-Integer-2 += 0
-    &Tmp-Integer-2 += 1
-    &Tmp-Integer-2 += 2
-    &Tmp-Integer-2 += 3
-    &Tmp-Integer-2 += 4
-    &Tmp-Integer-2 += 5
-    &Tmp-Integer-2 += 6
-    &Tmp-Integer-2 += 7
-    &Tmp-Integer-2 += 8
-    &Tmp-Integer-2 += 9                # 30
-    &Tmp-Integer-2 += 0
-    &Tmp-Integer-2 += 1
-    &Tmp-Integer-2 += 2
-    &Tmp-Integer-2 += 3
-    &Tmp-Integer-2 += 4
-    &Tmp-Integer-2 += 5
-    &Tmp-Integer-2 += 6
-    &Tmp-Integer-2 += 7
-    &Tmp-Integer-2 += 8
-    &Tmp-Integer-2 += 9                # 40
-    &Tmp-Integer-2 += 0
-    &Tmp-Integer-2 += 1
-    &Tmp-Integer-2 += 2
-    &Tmp-Integer-2 += 3
-    &Tmp-Integer-2 += 4
-    &Tmp-Integer-2 += 5
-    &Tmp-Integer-2 += 6
-    &Tmp-Integer-2 += 7
-    &Tmp-Integer-2 += 8
-    &Tmp-Integer-2 += 9                # 49
+    &Tmp-Integer-2 = 0         # 0
+    &Tmp-Integer-2 = 1
+    &Tmp-Integer-2 = 2
+    &Tmp-Integer-2 = 3
+    &Tmp-Integer-2 = 4
+    &Tmp-Integer-2 = 5
+    &Tmp-Integer-2 = 6
+    &Tmp-Integer-2 = 7
+    &Tmp-Integer-2 = 8
+    &Tmp-Integer-2 = 9         # 10
+    &Tmp-Integer-2 = 0
+    &Tmp-Integer-2 = 1
+    &Tmp-Integer-2 = 2
+    &Tmp-Integer-2 = 3
+    &Tmp-Integer-2 = 4
+    &Tmp-Integer-2 = 5
+    &Tmp-Integer-2 = 6
+    &Tmp-Integer-2 = 7
+    &Tmp-Integer-2 = 8
+    &Tmp-Integer-2 = 9         # 20
+    &Tmp-Integer-2 = 0
+    &Tmp-Integer-2 = 1
+    &Tmp-Integer-2 = 2
+    &Tmp-Integer-2 = 3
+    &Tmp-Integer-2 = 4
+    &Tmp-Integer-2 = 5
+    &Tmp-Integer-2 = 6
+    &Tmp-Integer-2 = 7
+    &Tmp-Integer-2 = 8
+    &Tmp-Integer-2 = 9         # 30
+    &Tmp-Integer-2 = 0
+    &Tmp-Integer-2 = 1
+    &Tmp-Integer-2 = 2
+    &Tmp-Integer-2 = 3
+    &Tmp-Integer-2 = 4
+    &Tmp-Integer-2 = 5
+    &Tmp-Integer-2 = 6
+    &Tmp-Integer-2 = 7
+    &Tmp-Integer-2 = 8
+    &Tmp-Integer-2 = 9         # 40
+    &Tmp-Integer-2 = 0
+    &Tmp-Integer-2 = 1
+    &Tmp-Integer-2 = 2
+    &Tmp-Integer-2 = 3
+    &Tmp-Integer-2 = 4
+    &Tmp-Integer-2 = 5
+    &Tmp-Integer-2 = 6
+    &Tmp-Integer-2 = 7
+    &Tmp-Integer-2 = 8
+    &Tmp-Integer-2 = 9         # 49
 }
 
 #
@@ -66,16 +67,16 @@ update request {
 foreach &Tmp-Integer-2 {
        load-balance {
                group {
-                       update request {
-                               &Tmp-Integer-0 := "%{expr:%{Tmp-Integer-0} + 1}"
-                               &Filter-Id += "PICKED GROUP 1 %{Tmp-Integer-0} TIME(S)"
+                       &Tmp-Integer-0 += 1
+                       &request += {
+                               &Tmp-String-0 = "Picked group 1 - %{Tmp-Integer-0} time(s)"
                        }
                        ok
                }
                group {
-                       update request {
-                               &Tmp-Integer-1 := "%{expr:%{Tmp-Integer-1} + 1}"
-                               &Filter-Id += "PICKED GROUP 2 %{Tmp-Integer-1} TIME(S)"
+                       &Tmp-Integer-1 += 1
+                       &request += {
+                               &Tmp-String-1 = "Picked group 2 %{Tmp-Integer-1} Time(s)"
                        }
                        ok
                }
@@ -88,6 +89,9 @@ foreach &Tmp-Integer-2 {
 if ((&Tmp-Integer-0 == 0) || (&Tmp-Integer-1 == 0)) {
        test_fail
 }
-else {
-       success
+
+if (%{expr:%{Tmp-Integer-0} + %{Tmp-Integer-1}} != 50) {
+       test_fail
 }
+
+success