diff --git a/integration/tests/assert_json.html b/integration/tests/assert_json.html index 2b49e6fa8..fca46cadf 100644 --- a/integration/tests/assert_json.html +++ b/integration/tests/assert_json.html @@ -1 +1 @@ -
GET http://localhost:8000/assert-json
HTTP/1.0 200[Asserts]jsonpath "$.count" equals 5jsonpath "$.count" equals 5.0jsonpath "$.count" greater-than 1jsonpath "$.count" greater-than 1.0jsonpath "$.success" equals falsejsonpath "$.success" not equals nulljsonpath "$.success" existsjsonpath "$.success" isBooleanjsonpath "$.errors" equals 2jsonpath "$.errors" isCollectionjsonpath "$.warnings" equals 0jsonpath "$.toto" not existsjsonpath "$.warnings" existsjsonpath "$.warnings" existsjsonpath "$.errors[0]" existsjsonpath "$.errors[0]" isCollectionjsonpath "$.errors[0].id" equals "error1"jsonpath "$.errors[0]['id']" equals "error1"jsonpath "$.duration" equals 1.5jsonpath "$.duration" less-than-or-equal 2.0jsonpath "$.duration" less-than 2jsonpath "$.duration" isFloatjsonpath "$.duration" not isIntegerjsonpath "$.nullable" equals null{ "count": 5, "success": false, "errors": [{"id":"error1"},{"id":"error2"}], "warnings": [], "duration": 1.5, "tags": ["test"], "nullable": null}
GET http://localhost:8000/assert-json/index
HTTP/1.0 200[Captures]index: status
GET http://localhost:8000/assert-json
HTTP/1.0 200[Asserts]jsonpath "$.errors[{{index}}].id" equals "error2"jsonpath "$.tags" includes "test"jsonpath "$.tags" not includes "prod"jsonpath "$.tags" not includes null
GET http://localhost:8000/assert-json/list
HTTP/1.0 200[Asserts]jsonpath "$" equals 2jsonpath "$.[0].name" equals "Bob"jsonpath "$[0].name" equals "Bob"
\ No newline at end of file +
GET http://localhost:8000/assert-json
HTTP/1.0 200[Asserts]jsonpath "$.count" equals 5jsonpath "$.count" equals 5.0jsonpath "$.count" greaterThan 1jsonpath "$.count" greaterThan 1.0jsonpath "$.success" equals falsejsonpath "$.success" not equals nulljsonpath "$.success" existsjsonpath "$.success" isBooleanjsonpath "$.errors" equals 2jsonpath "$.errors" isCollectionjsonpath "$.warnings" equals 0jsonpath "$.toto" not existsjsonpath "$.warnings" existsjsonpath "$.warnings" existsjsonpath "$.errors[0]" existsjsonpath "$.errors[0]" isCollectionjsonpath "$.errors[0].id" equals "error1"jsonpath "$.errors[0]['id']" equals "error1"jsonpath "$.duration" equals 1.5jsonpath "$.duration" lessThanOrEquals 2.0jsonpath "$.duration" lessThan 2jsonpath "$.duration" isFloatjsonpath "$.duration" not isIntegerjsonpath "$.nullable" equals null{ "count": 5, "success": false, "errors": [{"id":"error1"},{"id":"error2"}], "warnings": [], "duration": 1.5, "tags": ["test"], "nullable": null}
GET http://localhost:8000/assert-json/index
HTTP/1.0 200[Captures]index: status
GET http://localhost:8000/assert-json
HTTP/1.0 200[Asserts]jsonpath "$.errors[{{index}}].id" equals "error2"jsonpath "$.tags" includes "test"jsonpath "$.tags" not includes "prod"jsonpath "$.tags" not includes null
GET http://localhost:8000/assert-json/list
HTTP/1.0 200[Asserts]jsonpath "$" equals 2jsonpath "$.[0].name" equals "Bob"jsonpath "$[0].name" equals "Bob"
\ No newline at end of file diff --git a/integration/tests/assert_json.json b/integration/tests/assert_json.json index 5ed0dd4ec..ee087a1a6 100644 --- a/integration/tests/assert_json.json +++ b/integration/tests/assert_json.json @@ -1 +1 @@ -{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-json"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"equal","value":5}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"equal","value":5.0}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"greater-than","value":"1"}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"greater-than","value":"1.0"}},{"query":{"type":"jsonpath","expr":"$.success"},"predicate":{"type":"equal","value":false}},{"query":{"type":"jsonpath","expr":"$.success"},"predicate":{"not":true,"type":"equal","value":null}},{"query":{"type":"jsonpath","expr":"$.success"},"predicate":{"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.success"},"predicate":{"type":"isBoolean"}},{"query":{"type":"jsonpath","expr":"$.errors"},"predicate":{"type":"count","value":2}},{"query":{"type":"jsonpath","expr":"$.errors"},"predicate":{"type":"isCollection"}},{"query":{"type":"jsonpath","expr":"$.warnings"},"predicate":{"type":"count","value":0}},{"query":{"type":"jsonpath","expr":"$.toto"},"predicate":{"not":true,"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.warnings"},"predicate":{"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.warnings"},"predicate":{"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.errors[0]"},"predicate":{"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.errors[0]"},"predicate":{"type":"isCollection"}},{"query":{"type":"jsonpath","expr":"$.errors[0].id"},"predicate":{"type":"equal","value":"error1"}},{"query":{"type":"jsonpath","expr":"$.errors[0]['id']"},"predicate":{"type":"equal","value":"error1"}},{"query":{"type":"jsonpath","expr":"$.duration"},"predicate":{"type":"equal","value":1.5}},{"query":{"type":"jsonpath","expr":"$.duration"},"predicate":{"type":"less-than-or-equal","value":"2.0"}},{"query":{"type":"jsonpath","expr":"$.duration"},"predicate":{"type":"greater-than","value":"2"}},{"query":{"type":"jsonpath","expr":"$.duration"},"predicate":{"type":"isFloat"}},{"query":{"type":"jsonpath","expr":"$.duration"},"predicate":{"not":true,"type":"isInteger"}},{"query":{"type":"jsonpath","expr":"$.nullable"},"predicate":{"type":"equal","value":null}}],"body":{"type":"json","value":{"count":5,"success":false,"errors":[{"id":"error1"},{"id":"error2"}],"warnings":[],"duration":1.5,"tags":["test"],"nullable":null}}}},{"request":{"method":"GET","url":"http://localhost:8000/assert-json/index"},"response":{"version":"HTTP/1.0","status":200,"captures":[{"name":"index","query":{"type":"body"}}]}},{"request":{"method":"GET","url":"http://localhost:8000/assert-json"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$.errors[{{index}}].id"},"predicate":{"type":"equal","value":"error2"}},{"query":{"type":"jsonpath","expr":"$.tags"},"predicate":{"type":"include","value":"test"}},{"query":{"type":"jsonpath","expr":"$.tags"},"predicate":{"not":true,"type":"include","value":"prod"}},{"query":{"type":"jsonpath","expr":"$.tags"},"predicate":{"not":true,"type":"include","value":null}}]}},{"request":{"method":"GET","url":"http://localhost:8000/assert-json/list"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$"},"predicate":{"type":"count","value":2}},{"query":{"type":"jsonpath","expr":"$.[0].name"},"predicate":{"type":"equal","value":"Bob"}},{"query":{"type":"jsonpath","expr":"$[0].name"},"predicate":{"type":"equal","value":"Bob"}}]}}]} \ No newline at end of file +{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-json"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"equal","value":5}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"equal","value":5.0}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"greater","value":1}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"greater","value":1.0}},{"query":{"type":"jsonpath","expr":"$.success"},"predicate":{"type":"equal","value":false}},{"query":{"type":"jsonpath","expr":"$.success"},"predicate":{"not":true,"type":"equal","value":null}},{"query":{"type":"jsonpath","expr":"$.success"},"predicate":{"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.success"},"predicate":{"type":"isBoolean"}},{"query":{"type":"jsonpath","expr":"$.errors"},"predicate":{"type":"count","value":2}},{"query":{"type":"jsonpath","expr":"$.errors"},"predicate":{"type":"isCollection"}},{"query":{"type":"jsonpath","expr":"$.warnings"},"predicate":{"type":"count","value":0}},{"query":{"type":"jsonpath","expr":"$.toto"},"predicate":{"not":true,"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.warnings"},"predicate":{"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.warnings"},"predicate":{"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.errors[0]"},"predicate":{"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.errors[0]"},"predicate":{"type":"isCollection"}},{"query":{"type":"jsonpath","expr":"$.errors[0].id"},"predicate":{"type":"equal","value":"error1"}},{"query":{"type":"jsonpath","expr":"$.errors[0]['id']"},"predicate":{"type":"equal","value":"error1"}},{"query":{"type":"jsonpath","expr":"$.duration"},"predicate":{"type":"equal","value":1.5}},{"query":{"type":"jsonpath","expr":"$.duration"},"predicate":{"type":"less-or-equal","value":2.0}},{"query":{"type":"jsonpath","expr":"$.duration"},"predicate":{"type":"greater","value":2}},{"query":{"type":"jsonpath","expr":"$.duration"},"predicate":{"type":"isFloat"}},{"query":{"type":"jsonpath","expr":"$.duration"},"predicate":{"not":true,"type":"isInteger"}},{"query":{"type":"jsonpath","expr":"$.nullable"},"predicate":{"type":"equal","value":null}}],"body":{"type":"json","value":{"count":5,"success":false,"errors":[{"id":"error1"},{"id":"error2"}],"warnings":[],"duration":1.5,"tags":["test"],"nullable":null}}}},{"request":{"method":"GET","url":"http://localhost:8000/assert-json/index"},"response":{"version":"HTTP/1.0","status":200,"captures":[{"name":"index","query":{"type":"body"}}]}},{"request":{"method":"GET","url":"http://localhost:8000/assert-json"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$.errors[{{index}}].id"},"predicate":{"type":"equal","value":"error2"}},{"query":{"type":"jsonpath","expr":"$.tags"},"predicate":{"type":"include","value":"test"}},{"query":{"type":"jsonpath","expr":"$.tags"},"predicate":{"not":true,"type":"include","value":"prod"}},{"query":{"type":"jsonpath","expr":"$.tags"},"predicate":{"not":true,"type":"include","value":null}}]}},{"request":{"method":"GET","url":"http://localhost:8000/assert-json/list"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$"},"predicate":{"type":"count","value":2}},{"query":{"type":"jsonpath","expr":"$.[0].name"},"predicate":{"type":"equal","value":"Bob"}},{"query":{"type":"jsonpath","expr":"$[0].name"},"predicate":{"type":"equal","value":"Bob"}}]}}]} \ No newline at end of file diff --git a/integration/tests/assert_status_code.html b/integration/tests/assert_status_code.html index c4f1eeb85..46f156df2 100644 --- a/integration/tests/assert_status_code.html +++ b/integration/tests/assert_status_code.html @@ -1 +1 @@ -
GET http://localhost:8000/assert-status-code
HTTP/1.0 201
# simply check that the status code is not 200# do not run implicit assert of http response version and codeGET http://localhost:8000/assert-status-code
HTTP/* *[Asserts]status not equals 200
# simply check that the status code is OKGET http://localhost:8000/assert-status-code
HTTP/* *[Asserts]status greater-than-or-equal 200status less-than 300
\ No newline at end of file +
GET http://localhost:8000/assert-status-code
HTTP/1.0 201
# simply check that the status code is not 200# do not run implicit assert of http response version and codeGET http://localhost:8000/assert-status-code
HTTP/* *[Asserts]status not equals 200
# simply check that the status code is OKGET http://localhost:8000/assert-status-code
HTTP/* *[Asserts]status greaterThanOrEquals 200status lessThan 300
\ No newline at end of file diff --git a/integration/tests/assert_status_code.json b/integration/tests/assert_status_code.json index b9c3529d4..9fb68e236 100644 --- a/integration/tests/assert_status_code.json +++ b/integration/tests/assert_status_code.json @@ -1 +1 @@ -{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-status-code"},"response":{"version":"HTTP/1.0","status":201}},{"request":{"method":"GET","url":"http://localhost:8000/assert-status-code"},"response":{"asserts":[{"query":{"type":"status"},"predicate":{"not":true,"type":"equal","value":200}}]}},{"request":{"method":"GET","url":"http://localhost:8000/assert-status-code"},"response":{"asserts":[{"query":{"type":"status"},"predicate":{"type":"greater-than-or-equal","value":"200"}},{"query":{"type":"status"},"predicate":{"type":"greater-than","value":"300"}}]}}]} \ No newline at end of file +{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-status-code"},"response":{"version":"HTTP/1.0","status":201}},{"request":{"method":"GET","url":"http://localhost:8000/assert-status-code"},"response":{"asserts":[{"query":{"type":"status"},"predicate":{"not":true,"type":"equal","value":200}}]}},{"request":{"method":"GET","url":"http://localhost:8000/assert-status-code"},"response":{"asserts":[{"query":{"type":"status"},"predicate":{"type":"greater-or-equal","value":200}},{"query":{"type":"status"},"predicate":{"type":"greater","value":300}}]}}]} \ No newline at end of file diff --git a/integration/tests/error_assert_value_error.html b/integration/tests/error_assert_value_error.html index 1ee556e7c..f09669dcd 100644 --- a/integration/tests/error_assert_value_error.html +++ b/integration/tests/error_assert_value_error.html @@ -1 +1 @@ -
GET http://localhost:8000/error-assert-value
HTTP/1.0 200[Asserts]header "content-type" equals "XXX"jsonpath "$.id" equals "000001"jsonpath "$.values" includes 100jsonpath "$.values" not contains "Hello"jsonpath "$.count" greater-than 5jsonpath "$.count" isFloat
\ No newline at end of file +
GET http://localhost:8000/error-assert-value
HTTP/1.0 200[Asserts]header "content-type" equals "XXX"jsonpath "$.id" equals "000001"jsonpath "$.values" includes 100jsonpath "$.values" not contains "Hello"jsonpath "$.count" greaterThan 5jsonpath "$.count" isFloat
\ No newline at end of file diff --git a/integration/tests/error_assert_value_error.json b/integration/tests/error_assert_value_error.json index 312d6172a..790284beb 100644 --- a/integration/tests/error_assert_value_error.json +++ b/integration/tests/error_assert_value_error.json @@ -1 +1 @@ -{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-value"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"header","name":"content-type"},"predicate":{"type":"equal","value":"XXX"}},{"query":{"type":"jsonpath","expr":"$.id"},"predicate":{"type":"equal","value":"000001"}},{"query":{"type":"jsonpath","expr":"$.values"},"predicate":{"type":"include","value":100}},{"query":{"type":"jsonpath","expr":"$.values"},"predicate":{"not":true,"type":"contain","value":"Hello"}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"greater-than","value":"5"}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"isFloat"}}]}}]} \ No newline at end of file +{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-value"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"header","name":"content-type"},"predicate":{"type":"equal","value":"XXX"}},{"query":{"type":"jsonpath","expr":"$.id"},"predicate":{"type":"equal","value":"000001"}},{"query":{"type":"jsonpath","expr":"$.values"},"predicate":{"type":"include","value":100}},{"query":{"type":"jsonpath","expr":"$.values"},"predicate":{"not":true,"type":"contain","value":"Hello"}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"greater","value":5}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"isFloat"}}]}}]} \ No newline at end of file diff --git a/integration/tests/large.html b/integration/tests/large.html index 0710de517..3cb1c3646 100644 --- a/integration/tests/large.html +++ b/integration/tests/large.html @@ -1 +1 @@ -
GET http://localhost:8000/large
HTTP/1.0 200Content-Type: application/octet-streamContent-Length: 536870912[Asserts]duration less-than-or-equal 10000
\ No newline at end of file +
GET http://localhost:8000/large
HTTP/1.0 200Content-Type: application/octet-streamContent-Length: 536870912[Asserts]duration lessThanOrEquals 10000
\ No newline at end of file diff --git a/integration/tests/large.json b/integration/tests/large.json index 10fef2a03..a02a3c2b8 100644 --- a/integration/tests/large.json +++ b/integration/tests/large.json @@ -1 +1 @@ -{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/large"},"response":{"version":"HTTP/1.0","status":200,"headers":[{"name":"Content-Type","value":"application/octet-stream"},{"name":"Content-Length","value":"536870912"}],"asserts":[{"query":{"type":"duration"},"predicate":{"type":"less-than-or-equal","value":"10000"}}]}}]} \ No newline at end of file +{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/large"},"response":{"version":"HTTP/1.0","status":200,"headers":[{"name":"Content-Type","value":"application/octet-stream"},{"name":"Content-Length","value":"536870912"}],"asserts":[{"query":{"type":"duration"},"predicate":{"type":"less-or-equal","value":10000}}]}}]} \ No newline at end of file diff --git a/packages/hurlfmt/src/format/html.rs b/packages/hurlfmt/src/format/html.rs index 8989402f5..28ee2fe41 100644 --- a/packages/hurlfmt/src/format/html.rs +++ b/packages/hurlfmt/src/format/html.rs @@ -464,56 +464,56 @@ impl Htmlable for PredicateFuncValue { ); } PredicateFuncValue::GreaterThanInt { space0, value } => { - buffer.push_str("greater-than"); + buffer.push_str("greaterThan"); buffer.push_str(space0.to_html().as_str()); buffer.push_str( format!("{}", value.to_string()).as_str(), ); } PredicateFuncValue::GreaterThanFloat { space0, value } => { - buffer.push_str("greater-than"); + buffer.push_str("greaterThan"); buffer.push_str(space0.to_html().as_str()); buffer.push_str( format!("{}", value.to_string()).as_str(), ); } PredicateFuncValue::GreaterThanOrEqualInt { space0, value } => { - buffer.push_str("greater-than-or-equal"); + buffer.push_str("greaterThanOrEquals"); buffer.push_str(space0.to_html().as_str()); buffer.push_str( format!("{}", value.to_string()).as_str(), ); } PredicateFuncValue::GreaterThanOrEqualFloat { space0, value } => { - buffer.push_str("greater-than-or-equal"); + buffer.push_str("greaterThanOrEquals"); buffer.push_str(space0.to_html().as_str()); buffer.push_str( format!("{}", value.to_string()).as_str(), ); } PredicateFuncValue::LessThanInt { space0, value } => { - buffer.push_str("less-than"); + buffer.push_str("lessThan"); buffer.push_str(space0.to_html().as_str()); buffer.push_str( format!("{}", value.to_string()).as_str(), ); } PredicateFuncValue::LessThanFloat { space0, value } => { - buffer.push_str("less-than"); + buffer.push_str("lessThan"); buffer.push_str(space0.to_html().as_str()); buffer.push_str( format!("{}", value.to_string()).as_str(), ); } PredicateFuncValue::LessThanOrEqualInt { space0, value } => { - buffer.push_str("less-than-or-equal"); + buffer.push_str("lessThanOrEquals"); buffer.push_str(space0.to_html().as_str()); buffer.push_str( format!("{}", value.to_string()).as_str(), ); } PredicateFuncValue::LessThanOrEqualFloat { space0, value } => { - buffer.push_str("less-than-or-equal"); + buffer.push_str("lessThanOrEquals"); buffer.push_str(space0.to_html().as_str()); buffer.push_str( format!("{}", value.to_string()).as_str(), diff --git a/packages/hurlfmt/src/format/json.rs b/packages/hurlfmt/src/format/json.rs index 63fcbbf3c..681140d52 100644 --- a/packages/hurlfmt/src/format/json.rs +++ b/packages/hurlfmt/src/format/json.rs @@ -346,57 +346,48 @@ impl ToJson for Predicate { attributes.push(("value".to_string(), JValue::String(value.to_string()))); } PredicateFuncValue::GreaterThanInt { value, .. } => { - attributes.push(( - "type".to_string(), - JValue::String("greater-than".to_string()), - )); - attributes.push(("value".to_string(), JValue::String(value.to_string()))); + attributes.push(("type".to_string(), JValue::String("greater".to_string()))); + attributes.push(("value".to_string(), JValue::Number(value.to_string()))); } PredicateFuncValue::GreaterThanFloat { value, .. } => { - attributes.push(( - "type".to_string(), - JValue::String("greater-than".to_string()), - )); - attributes.push(("value".to_string(), JValue::String(value.to_string()))); + attributes.push(("type".to_string(), JValue::String("greater".to_string()))); + attributes.push(("value".to_string(), JValue::Number(value.to_string()))); } PredicateFuncValue::GreaterThanOrEqualInt { value, .. } => { attributes.push(( "type".to_string(), - JValue::String("greater-than-or-equal".to_string()), + JValue::String("greater-or-equal".to_string()), )); - attributes.push(("value".to_string(), JValue::String(value.to_string()))); + attributes.push(("value".to_string(), JValue::Number(value.to_string()))); } PredicateFuncValue::GreaterThanOrEqualFloat { value, .. } => { attributes.push(( "type".to_string(), - JValue::String("greater-than-or-equal".to_string()), + JValue::String("greater-or-equal".to_string()), )); - attributes.push(("value".to_string(), JValue::String(value.to_string()))); + attributes.push(("value".to_string(), JValue::Number(value.to_string()))); } PredicateFuncValue::LessThanInt { value, .. } => { - attributes.push(( - "type".to_string(), - JValue::String("greater-than".to_string()), - )); - attributes.push(("value".to_string(), JValue::String(value.to_string()))); + attributes.push(("type".to_string(), JValue::String("greater".to_string()))); + attributes.push(("value".to_string(), JValue::Number(value.to_string()))); } PredicateFuncValue::LessThanFloat { value, .. } => { - attributes.push(("type".to_string(), JValue::String("less-than".to_string()))); - attributes.push(("value".to_string(), JValue::String(value.to_string()))); + attributes.push(("type".to_string(), JValue::String("less".to_string()))); + attributes.push(("value".to_string(), JValue::Number(value.to_string()))); } PredicateFuncValue::LessThanOrEqualInt { value, .. } => { attributes.push(( "type".to_string(), - JValue::String("less-than-or-equal".to_string()), + JValue::String("less-or-equal".to_string()), )); - attributes.push(("value".to_string(), JValue::String(value.to_string()))); + attributes.push(("value".to_string(), JValue::Number(value.to_string()))); } PredicateFuncValue::LessThanOrEqualFloat { value, .. } => { attributes.push(( "type".to_string(), - JValue::String("less-than-or-equal".to_string()), + JValue::String("less-or-equal".to_string()), )); - attributes.push(("value".to_string(), JValue::String(value.to_string()))); + attributes.push(("value".to_string(), JValue::Number(value.to_string()))); } PredicateFuncValue::CountEqual { value, .. } => { attributes.push(("type".to_string(), JValue::String("count".to_string())));