fixup: more comparisons, re-order tests slightly

This commit is contained in:
David Drysdale
2021-06-17 08:56:21 +01:00
committed by kaczmarczyck
parent fbe68b55cd
commit 1cee2414f4

View File

@@ -307,29 +307,37 @@ mod test {
assert!(cbor_map! {cbor_array![] => 0} < cbor_map! {cbor_map!{} => 0}); assert!(cbor_map! {cbor_array![] => 0} < cbor_map! {cbor_map!{} => 0});
assert!(cbor_map! {cbor_map!{} => 0} < cbor_map! {false => 0}); assert!(cbor_map! {cbor_map!{} => 0} < cbor_map! {false => 0});
assert!(cbor_map! {false => 0} < cbor_map! {0 => 0, 0 => 0}); assert!(cbor_map! {false => 0} < cbor_map! {0 => 0, 0 => 0});
assert!(cbor_map! {0 => 0} < cbor_tagged!(2, cbor_int!(0)));
assert!(cbor_map! {0 => 0, 0 => 0} < cbor_bool!(false)); assert!(cbor_map! {0 => 0, 0 => 0} < cbor_bool!(false));
assert!(cbor_bool!(false) < cbor_bool!(true)); assert!(cbor_bool!(false) < cbor_bool!(true));
assert!(cbor_bool!(true) < Value::Simple(SimpleValue::NullValue)); assert!(cbor_bool!(true) < Value::Simple(SimpleValue::NullValue));
assert!(Value::Simple(SimpleValue::NullValue) < Value::Simple(SimpleValue::Undefined)); assert!(Value::Simple(SimpleValue::NullValue) < Value::Simple(SimpleValue::Undefined));
assert!(cbor_tagged!(1, cbor_text!("s")) < cbor_tagged!(2, cbor_int!(0)));
assert!(cbor_int!(1) < cbor_int!(-1));
assert!(cbor_int!(1) < cbor_bytes!(vec![0x00])); assert!(cbor_int!(1) < cbor_bytes!(vec![0x00]));
assert!(cbor_int!(1) < cbor_text!("s")); assert!(cbor_int!(1) < cbor_text!("s"));
assert!(cbor_int!(1) < cbor_array![]); assert!(cbor_int!(1) < cbor_array![]);
assert!(cbor_int!(1) < cbor_map! {}); assert!(cbor_int!(1) < cbor_map! {});
assert!(cbor_int!(1) < cbor_tagged!(1, cbor_text!("s")));
assert!(cbor_int!(1) < cbor_bool!(false)); assert!(cbor_int!(1) < cbor_bool!(false));
assert!(cbor_int!(-1) < cbor_bytes!(vec![0x00]));
assert!(cbor_int!(-1) < cbor_text!("s")); assert!(cbor_int!(-1) < cbor_text!("s"));
assert!(cbor_int!(-1) < cbor_array![]); assert!(cbor_int!(-1) < cbor_array![]);
assert!(cbor_int!(-1) < cbor_map! {}); assert!(cbor_int!(-1) < cbor_map! {});
assert!(cbor_int!(-1) < cbor_tagged!(1, cbor_text!("s"))); assert!(cbor_int!(-1) < cbor_tagged!(1, cbor_text!("s")));
assert!(cbor_int!(-1) < cbor_bool!(false)); assert!(cbor_int!(-1) < cbor_bool!(false));
assert!(cbor_bytes!(vec![0x00]) < cbor_text!("s"));
assert!(cbor_bytes!(vec![0x00]) < cbor_array![]); assert!(cbor_bytes!(vec![0x00]) < cbor_array![]);
assert!(cbor_bytes!(vec![0x00]) < cbor_map! {}); assert!(cbor_bytes!(vec![0x00]) < cbor_map! {});
assert!(cbor_bytes!(vec![0x00]) < cbor_bool!(false));
assert!(cbor_bytes!(vec![0x00]) < cbor_tagged!(1, cbor_text!("s"))); assert!(cbor_bytes!(vec![0x00]) < cbor_tagged!(1, cbor_text!("s")));
assert!(cbor_bytes!(vec![0x00]) < cbor_bool!(false));
assert!(cbor_text!("s") < cbor_array![]);
assert!(cbor_text!("s") < cbor_map! {}); assert!(cbor_text!("s") < cbor_map! {});
assert!(cbor_text!("s") < cbor_bool!(false));
assert!(cbor_text!("s") < cbor_tagged!(1, cbor_text!("s"))); assert!(cbor_text!("s") < cbor_tagged!(1, cbor_text!("s")));
assert!(cbor_text!("s") < cbor_bool!(false));
assert!(cbor_array![] < cbor_map!(0 => 1));
assert!(cbor_array![] < cbor_tagged!(2, cbor_int!(0)));
assert!(cbor_array![] < cbor_bool!(false)); assert!(cbor_array![] < cbor_bool!(false));
assert!(cbor_tagged!(1, cbor_text!("s")) < cbor_tagged!(2, cbor_int!(0)));
assert!(cbor_tagged!(1, cbor_text!("s")) < cbor_bool!(false)); assert!(cbor_tagged!(1, cbor_text!("s")) < cbor_bool!(false));
} }
} }