Fix tests using Error instead of ErrorKind

Author: kellerkindt

src/io/per/unaligned/buffer.rs

@@ -409,7 +409,7 @@ pub mod tests {
         assert!(buffer.read_bit()?);
         assert!(!buffer.read_bit()?);
 
-        assert_eq!(buffer.read_bit(), Err(Error::EndOfStream));
+        assert_eq!(buffer.read_bit(), Err(ErrorKind::EndOfStream.into()));
 
         Ok(())
     }
@@ -789,12 +789,12 @@ pub mod tests {
         // lower check
         assert_eq!(
             buffer.write_constrained_whole_number(10, 127, 0),
-            Err(Error::ValueNotInRange(0, 10, 127))
+            Err(ErrorKind::ValueNotInRange(0, 10, 127).into())
         );
         // upper check
         assert_eq!(
             buffer.write_constrained_whole_number(10, 127, 128),
-            Err(Error::ValueNotInRange(128, 10, 127))
+            Err(ErrorKind::ValueNotInRange(128, 10, 127).into())
         );
     }
 
@@ -804,12 +804,12 @@ pub mod tests {
         // lower check
         assert_eq!(
             buffer.write_constrained_whole_number(-10, -1, -11),
-            Err(Error::ValueNotInRange(-11, -10, -1))
+            Err(ErrorKind::ValueNotInRange(-11, -10, -1).into())
         );
         // upper check
         assert_eq!(
             buffer.write_constrained_whole_number(-10, -1, 0),
-            Err(Error::ValueNotInRange(0, -10, -1))
+            Err(ErrorKind::ValueNotInRange(0, -10, -1).into())
         );
     }
 
@@ -819,12 +819,12 @@ pub mod tests {
         // lower check
         assert_eq!(
             buffer.write_constrained_whole_number(-10, 1, -11),
-            Err(Error::ValueNotInRange(-11, -10, 1))
+            Err(ErrorKind::ValueNotInRange(-11, -10, 1).into())
         );
         // upper check
         assert_eq!(
             buffer.write_constrained_whole_number(-10, 1, 2),
-            Err(Error::ValueNotInRange(2, -10, 1))
+            Err(ErrorKind::ValueNotInRange(2, -10, 1).into())
         );
     }
 

tests/basic_ia5string.rs

@@ -36,11 +36,10 @@ fn detect_only_invalid_character() {
     }
         .write(&mut writer);
     assert_eq!(
-        Err(asn1rs::io::per::Error::InvalidString(
-            asn1rs::model::Charset::Ia5,
-            '\u{80}',
-            128
-        )),
+        Err(
+            asn1rs::io::per::ErrorKind::InvalidString(asn1rs::model::Charset::Ia5, '\u{80}', 128)
+                .into()
+        ),
         result
     )
 }

tests/basic_numeric_string.rs

@@ -35,11 +35,10 @@ fn detect_only_invalid_character() {
     }
     .write(&mut writer);
     assert_eq!(
-        Err(asn1rs::io::per::Error::InvalidString(
-            asn1rs::model::Charset::Numeric,
-            'x',
-            11
-        )),
+        Err(
+            asn1rs::io::per::ErrorKind::InvalidString(asn1rs::model::Charset::Numeric, 'x', 11)
+                .into()
+        ),
         result
     )
 }

tests/basic_printable_string.rs

@@ -36,11 +36,10 @@ fn detect_only_invalid_character() {
     }
     .write(&mut writer);
     assert_eq!(
-        Err(asn1rs::io::per::Error::InvalidString(
-            asn1rs::model::Charset::Printable,
-            '!',
-            74
-        )),
+        Err(
+            asn1rs::io::per::ErrorKind::InvalidString(asn1rs::model::Charset::Printable, '!', 74)
+                .into()
+        ),
         result
     )
 }

tests/basic_proc_macro_attribute.rs

@@ -698,9 +698,10 @@ fn test_extensible_struct_fail_inconsistent() {
         value16: Some(146),
     };
     assert_eq!(
-        Err(asn1rs::io::per::Error::ExtensionFieldsInconsistent(
+        Err(asn1rs::io::per::ErrorKind::ExtensionFieldsInconsistent(
             "ExtensibleStruct".to_string()
-        )),
+        )
+        .into()),
         uper.write(&v)
     );
 }

tests/basic_visible_string.rs

@@ -36,11 +36,12 @@ fn detect_only_invalid_character() {
     }
     .write(&mut writer);
     assert_eq!(
-        Err(asn1rs::io::per::Error::InvalidString(
+        Err(asn1rs::io::per::ErrorKind::InvalidString(
             asn1rs::model::Charset::Visible,
             '\u{7F}',
             95
-        )),
+        )
+        .into()),
         result
     )
 }