From 1cee2414f4922ae38fb16d53e24902570ce4261e Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Thu, 17 Jun 2021 08:56:21 +0100 Subject: [PATCH] fixup: more comparisons, re-order tests slightly --- libraries/cbor/src/values.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libraries/cbor/src/values.rs b/libraries/cbor/src/values.rs index 13b378a..eee304c 100644 --- a/libraries/cbor/src/values.rs +++ b/libraries/cbor/src/values.rs @@ -307,29 +307,37 @@ mod test { assert!(cbor_map! {cbor_array![] => 0} < cbor_map! {cbor_map!{} => 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! {0 => 0} < cbor_tagged!(2, cbor_int!(0))); assert!(cbor_map! {0 => 0, 0 => 0} < cbor_bool!(false)); assert!(cbor_bool!(false) < cbor_bool!(true)); assert!(cbor_bool!(true) < Value::Simple(SimpleValue::NullValue)); 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_text!("s")); assert!(cbor_int!(1) < cbor_array![]); 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_bytes!(vec![0x00])); assert!(cbor_int!(-1) < cbor_text!("s")); assert!(cbor_int!(-1) < cbor_array![]); 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_bytes!(vec![0x00]) < cbor_text!("s")); assert!(cbor_bytes!(vec![0x00]) < cbor_array![]); 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_bool!(false)); + assert!(cbor_text!("s") < cbor_array![]); 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_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_tagged!(1, cbor_text!("s")) < cbor_tagged!(2, cbor_int!(0))); assert!(cbor_tagged!(1, cbor_text!("s")) < cbor_bool!(false)); } }