Orange-OpenSource/hurl
1
1
Fork 0
mirror of https://github.com/Orange-OpenSource/hurl.git synced 2024-11-24 04:31:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155 from Orange-OpenSource/feature/update-rust-1.50

Browse Source 
Update rust 1.50.0
This commit is contained in:
Fabrice Reix 2021-02-12 11:02:50 +01:00 committed by GitHub
commit 4463283bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 99 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
packages/hurl/src/runner/predicate.rs
View File

@ -302,28 +302,28 @@ fn eval_something(
// equals int
PredicateFuncValue::EqualInt {
value: expected, ..
} => assert_values_equal(value, Value::Integer(expected)),
} => Ok(assert_values_equal(value, Value::Integer(expected))),
// equals null
PredicateFuncValue::EqualNull { .. } => assert_values_equal(value, Value::Null),
PredicateFuncValue::EqualNull { .. } => Ok(assert_values_equal(value, Value::Null)),
// equals bool
PredicateFuncValue::EqualBool {
value: expected, ..
} => assert_values_equal(value, Value::Bool(expected)),
} => Ok(assert_values_equal(value, Value::Bool(expected))),
// equals float
PredicateFuncValue::EqualFloat {
value: Float { int, decimal, .. },
..
} => assert_values_equal(value, Value::Float(int, decimal)),
} => Ok(assert_values_equal(value, Value::Float(int, decimal))),
// equals string
PredicateFuncValue::EqualString {
value: expected, ..
} => {
let expected = eval_template(expected, variables)?;
assert_values_equal(value, Value::String(expected))
Ok(assert_values_equal(value, Value::String(expected)))
}
// equals expression
@ -331,40 +331,49 @@ fn eval_something(
value: expected, ..
} => {
let expected = eval_expr(expected, variables)?;
assert_values_equal(value, expected)
Ok(assert_values_equal(value, expected))
}
PredicateFuncValue::GreaterThanInt {
value: expected, ..
} => assert_values_greater(value, Value::Integer(expected)),
} => Ok(assert_values_greater(value, Value::Integer(expected))),
PredicateFuncValue::GreaterThanFloat {
value: Float { int, decimal, .. },
..
} => assert_values_greater(value, Value::Float(int, decimal)),
} => Ok(assert_values_greater(value, Value::Float(int, decimal))),
PredicateFuncValue::GreaterThanOrEqualInt {
value: expected, ..
} => assert_values_greater_or_equal(value, Value::Integer(expected)),
} => Ok(assert_values_greater_or_equal(
value,
Value::Integer(expected),
)),
PredicateFuncValue::GreaterThanOrEqualFloat {
value: Float { int, decimal, .. },
..
} => assert_values_greater_or_equal(value, Value::Float(int, decimal)),
} => Ok(assert_values_greater_or_equal(
value,
Value::Float(int, decimal),
)),
PredicateFuncValue::LessThanInt {
value: expected, ..
} => assert_values_less(value, Value::Integer(expected)),
} => Ok(assert_values_less(value, Value::Integer(expected))),
PredicateFuncValue::LessThanFloat {
value: Float { int, decimal, .. },
..
} => assert_values_less(value, Value::Float(int, decimal)),
} => Ok(assert_values_less(value, Value::Float(int, decimal))),
PredicateFuncValue::LessThanOrEqualInt {
value: expected, ..
} => assert_values_less_or_equal(value, Value::Integer(expected)),
} => Ok(assert_values_less_or_equal(value, Value::Integer(expected))),
PredicateFuncValue::LessThanOrEqualFloat {
value: Float { int, decimal, .. },
..
} => assert_values_less_or_equal(value, Value::Float(int, decimal)),
} => Ok(assert_values_less_or_equal(
value,
Value::Float(int, decimal),
)),
// countEquals
PredicateFuncValue::CountEqual {
@ -442,34 +451,34 @@ fn eval_something(
value: expected, ..
} => {
let expected = eval_template(expected, variables)?;
assert_include(value, Value::String(expected))
Ok(assert_include(value, Value::String(expected)))
}
// includes int
PredicateFuncValue::IncludeInt {
value: expected, ..
} => assert_include(value, Value::Integer(expected)),
} => Ok(assert_include(value, Value::Integer(expected))),
// includes float
PredicateFuncValue::IncludeFloat {
value: Float { int, decimal, .. },
..
} => assert_include(value, Value::Float(int, decimal)),
} => Ok(assert_include(value, Value::Float(int, decimal))),
// includes bool
PredicateFuncValue::IncludeBool {
value: expected, ..
} => assert_include(value, Value::Bool(expected)),
} => Ok(assert_include(value, Value::Bool(expected))),
// includes null
PredicateFuncValue::IncludeNull { .. } => assert_include(value, Value::Null),
PredicateFuncValue::IncludeNull { .. } => Ok(assert_include(value, Value::Null)),
// includes expression
PredicateFuncValue::IncludeExpression {
value: expected, ..
} => {
let expected = eval_expr(expected, variables)?;
assert_include(value, expected)
Ok(assert_include(value, expected))
}
// match string
@ -556,183 +565,174 @@ fn eval_something(
}
}
fn assert_values_equal(actual: Value, expected: Value) -> Result<AssertResult, Error> {
fn assert_values_equal(actual: Value, expected: Value) -> AssertResult {
match (actual.clone(), expected.clone()) {
(Value::Null {}, Value::Null {}) => Ok(AssertResult {
(Value::Null {}, Value::Null {}) => AssertResult {
success: true,
actual: actual.display(),
expected: expected.display(),
type_mismatch: false,
}),
(Value::Bool(value1), Value::Bool(value2)) => Ok(AssertResult {
},
(Value::Bool(value1), Value::Bool(value2)) => AssertResult {
success: value1 == value2,
actual: actual.display(),
expected: expected.display(),
type_mismatch: false,
}),
(Value::Integer(value1), Value::Integer(value2)) => Ok(AssertResult {
},
(Value::Integer(value1), Value::Integer(value2)) => AssertResult {
success: value1 == value2,
actual: actual.display(),
expected: expected.display(),
type_mismatch: false,
}),
(Value::Float(int1, decimal), Value::Integer(int2)) => Ok(AssertResult {
},
(Value::Float(int1, decimal), Value::Integer(int2)) => AssertResult {
success: int1 == int2 && decimal == 0,
actual: actual.display(),
expected: expected.display(),
type_mismatch: false,
}),
(Value::Integer(int1), Value::Float(int2, decimal)) => Ok(AssertResult {
},
(Value::Integer(int1), Value::Float(int2, decimal)) => AssertResult {
success: int1 == int2 && decimal == 0,
actual: actual.display(),
expected: expected.display(),
type_mismatch: false,
}),
(Value::Float(i1, d1), Value::Float(i2, d2)) => Ok(AssertResult {
},
(Value::Float(i1, d1), Value::Float(i2, d2)) => AssertResult {
success: i1 == i2 && d1 == d2,
actual: actual.display(),
expected: expected.display(),
type_mismatch: false,
}),
(Value::String(value1), Value::String(value2)) => Ok(AssertResult {
},
(Value::String(value1), Value::String(value2)) => AssertResult {
success: value1 == value2,
actual: actual.display(),
expected: expected.display(),
type_mismatch: false,
}),
(Value::List(value1), Value::List(value2)) => Ok(AssertResult {
},
(Value::List(value1), Value::List(value2)) => AssertResult {
success: value1 == value2,
actual: actual.display(),
expected: expected.display(),
type_mismatch: false,
}),
(Value::Bytes(value1), Value::Bytes(value2)) => Ok(AssertResult {
},
(Value::Bytes(value1), Value::Bytes(value2)) => AssertResult {
success: value1 == value2,
actual: actual.display(),
expected: expected.display(),
type_mismatch: false,
}),
(Value::Unit, _) => Ok(AssertResult {
},
(Value::Unit, _) => AssertResult {
success: false,
actual: actual.display(),
expected: expected.display(),
type_mismatch: true,
}),
_ => Ok(AssertResult {
},
_ => AssertResult {
success: false,
actual: actual.display(),
expected: expected.display(),
type_mismatch: false,
}),
},
}
}
fn assert_values_greater(
actual_value: Value,
expected_value: Value,
) -> Result<AssertResult, Error> {
fn assert_values_greater(actual_value: Value, expected_value: Value) -> AssertResult {
let actual = actual_value.clone().display();
let expected = format!("greater than {}", expected_value.clone().display());
match compare_numbers(actual_value, expected_value) {
Some(1) => Ok(AssertResult {
Some(1) => AssertResult {
success: true,
actual,
expected,
type_mismatch: false,
}),
Some(0) | Some(-1) => Ok(AssertResult {
},
Some(0) | Some(-1) => AssertResult {
success: false,
actual,
expected,
type_mismatch: false,
}),
_ => Ok(AssertResult {
},
_ => AssertResult {
success: false,
actual,
expected,
type_mismatch: true,
}),
},
}
}
fn assert_values_greater_or_equal(
actual_value: Value,
expected_value: Value,
) -> Result<AssertResult, Error> {
fn assert_values_greater_or_equal(actual_value: Value, expected_value: Value) -> AssertResult {
let actual = actual_value.clone().display();
let expected = format!("greater or equal than {}", expected_value.clone().display());
match compare_numbers(actual_value, expected_value) {
Some(1) | Some(0) => Ok(AssertResult {
Some(1) | Some(0) => AssertResult {
success: true,
actual,
expected,
type_mismatch: false,
}),
Some(-1) => Ok(AssertResult {
},
Some(-1) => AssertResult {
success: false,
actual,
expected,
type_mismatch: false,
}),
_ => Ok(AssertResult {
},
_ => AssertResult {
success: false,
actual,
expected,
type_mismatch: true,
}),
},
}
}
fn assert_values_less(actual_value: Value, expected_value: Value) -> Result<AssertResult, Error> {
fn assert_values_less(actual_value: Value, expected_value: Value) -> AssertResult {
let actual = actual_value.clone().display();
let expected = format!("less than {}", expected_value.clone().display());
match compare_numbers(actual_value, expected_value) {
Some(-1) => Ok(AssertResult {
Some(-1) => AssertResult {
success: true,
actual,
expected,
type_mismatch: false,
}),
Some(0) | Some(1) => Ok(AssertResult {
},
Some(0) | Some(1) => AssertResult {
success: false,
actual,
expected,
type_mismatch: false,
}),
_ => Ok(AssertResult {
},
_ => AssertResult {
success: false,
actual,
expected,
type_mismatch: true,
}),
},
}
}
fn assert_values_less_or_equal(
actual_value: Value,
expected_value: Value,
) -> Result<AssertResult, Error> {
fn assert_values_less_or_equal(actual_value: Value, expected_value: Value) -> AssertResult {
let actual = actual_value.clone().display();
let expected = format!("less or equal than {}", expected_value.clone().display());
match compare_numbers(actual_value, expected_value) {
Some(-1) | Some(0) => Ok(AssertResult {
Some(-1) | Some(0) => AssertResult {
success: true,
actual,
expected,
type_mismatch: false,
}),
Some(1) => Ok(AssertResult {
},
Some(1) => AssertResult {
success: false,
actual,
expected,
type_mismatch: false,
}),
_ => Ok(AssertResult {
},
_ => AssertResult {
success: false,
actual,
expected,
type_mismatch: true,
}),
},
}
}
@ -766,31 +766,31 @@ fn compare_float((i1, d1): (i64, u64), (i2, d2): (i64, u64)) -> i32 {
}
}
fn assert_include(value: Value, element: Value) -> Result<AssertResult, Error> {
fn assert_include(value: Value, element: Value) -> AssertResult {
let expected = format!("includes {}", element.clone().display());
match value.clone() {
Value::List(values) => {
let mut success = false;
for v in values {
let result = assert_values_equal(v, element.clone())?;
let result = assert_values_equal(v, element.clone());
if result.success {
success = true;
break;
}
}
Ok(AssertResult {
AssertResult {
success,
actual: value.display(),
expected,
type_mismatch: false,
})
}
}
_ => Ok(AssertResult {
_ => AssertResult {
success: false,
actual: value.display(),
expected,
type_mismatch: true,
}),
},
}
}
@ -1227,7 +1227,7 @@ mod tests {
#[test]
fn test_assert_value_greater() {
assert_eq!(
assert_values_greater(Value::Integer(2), Value::Integer(1)).unwrap(),
assert_values_greater(Value::Integer(2), Value::Integer(1)),
AssertResult {
success: true,
type_mismatch: false,
@ -1236,7 +1236,7 @@ mod tests {
}
);
assert_eq!(
assert_values_greater(Value::Integer(1), Value::Integer(1)).unwrap(),
assert_values_greater(Value::Integer(1), Value::Integer(1)),
AssertResult {
success: false,
type_mismatch: false,
@ -1245,7 +1245,7 @@ mod tests {
}
);
assert_eq!(
assert_values_greater(Value::Float(1, 1), Value::Integer(1)).unwrap(),
assert_values_greater(Value::Float(1, 1), Value::Integer(1)),
AssertResult {
success: true,
type_mismatch: false,
@ -1254,7 +1254,7 @@ mod tests {
}
);
assert_eq!(
assert_values_greater(Value::Float(1, 1), Value::Integer(2)).unwrap(),
assert_values_greater(Value::Float(1, 1), Value::Integer(2)),
AssertResult {
success: false,
type_mismatch: false,

5
packages/hurl/src/runner/template.rs
View File

@ -76,7 +76,10 @@ pub fn eval_expression(expr: Expr, variables: &HashMap<String, Value>) -> Result
impl Value {
pub fn is_renderable(&self) -> bool {
matches!(self, Value::Integer(_) | Value::Bool(_) | Value::Float(_, _) | Value::String(_))
matches!(
self,
Value::Integer(_) | Value::Bool(_) | Value::Float(_, _) | Value::String(_)
)
}
}

10
packages/hurl_core/src/parser/sections.rs
View File

@ -144,7 +144,7 @@ fn cookie(reader: &mut Reader) -> ParseResult<'static, Cookie> {
let space1 = zero_or_more_spaces(reader)?;
recover(|p1| literal(":", p1), reader)?;
let space2 = zero_or_more_spaces(reader)?;
let value = cookie_value(reader)?;
let value = cookie_value(reader);
let line_terminator0 = line_terminator(reader)?;
Ok(Cookie {
line_terminators,
@ -161,7 +161,7 @@ fn cookie(reader: &mut Reader) -> ParseResult<'static, Cookie> {
/// The cookie-value must not be wrapped within double-quotes
/// This is optional in the spec, if you really want to include these optional quotes, you must use directly the header Cookie
///
fn cookie_value(reader: &mut Reader) -> ParseResult<'static, CookieValue> {
fn cookie_value(reader: &mut Reader) -> CookieValue {
//let start = reader.state.clone();
let value = reader.read_while(|c| {
c.is_ascii_alphanumeric()
@ -171,7 +171,7 @@ fn cookie_value(reader: &mut Reader) -> ParseResult<'static, CookieValue> {
]
.contains(&c)
});
Ok(CookieValue { value })
CookieValue { value }
}
fn multipart_param(reader: &mut Reader) -> ParseResult<'static, MultipartParam> {
@ -517,7 +517,7 @@ mod tests {
fn test_cookie_value() {
let mut reader = Reader::init("Bar");
assert_eq!(
cookie_value(&mut reader).unwrap(),
cookie_value(&mut reader),
CookieValue {
value: String::from("Bar")
}
@ -525,7 +525,7 @@ mod tests {
let mut reader = Reader::init("\"Bar\"");
assert_eq!(
cookie_value(&mut reader).unwrap(),
cookie_value(&mut reader),
CookieValue {
value: String::from("")
}