Run metadata tests

Author: str4d

crates/flipperzero/src/furi/log/metadata.rs

@@ -467,7 +467,7 @@ impl PartialOrd<Level> for LevelFilter {
     }
 }
 
-#[cfg(test)]
+#[flipperzero_test::tests]
 mod tests {
     use super::*;
     use core::mem;

crates/flipperzero/src/furi/log/mod.rs

@@ -1,6 +1,6 @@
 //! Furi Logging system.
 
-mod metadata;
+pub(crate) mod metadata;
 pub use metadata::{Level, LevelFilter};
 
 /// The standard logging macro.

crates/flipperzero/src/lib.rs

@@ -45,7 +45,9 @@ pub mod __macro_support {
 
 flipperzero_test::tests_runner!(
     name = "flipperzero-rs Unit Tests",
+    stack_size = 4096,
     [
+        crate::furi::log::metadata::tests,
         crate::furi::message_queue::tests,
         crate::furi::rng::tests,
         crate::furi::string::tests,

crates/test/macros/src/deassert.rs

@@ -55,33 +55,45 @@ fn expr_macro(m: ExprMacro) -> parse::Result<Expr> {
             .into(),
         )
     } else if m.mac.path.is_ident("assert_eq") {
-        let (left, right) = binary_macro(m.mac.tokens)?;
+        let (left, right, msg) = binary_macro(m.mac.tokens)?;
         let left_str = quote!(#left).to_string();
         let right_str = quote!(#right).to_string();
+        let msg_str = if let Some(msg) = msg {
+            quote!(Some(#msg))
+        } else {
+            quote!(None)
+        };
         syn::parse(
             quote!(
                 if #left != #right {
                     return ::core::result::Result::Err(
                         ::flipperzero_test::TestFailure::AssertEq {
                             left: #left_str,
                             right: #right_str,
+                            msg: #msg_str,
                         }
                     );
                 }
             )
             .into(),
         )
     } else if m.mac.path.is_ident("assert_ne") {
-        let (left, right) = binary_macro(m.mac.tokens)?;
+        let (left, right, msg) = binary_macro(m.mac.tokens)?;
         let left_str = quote!(#left).to_string();
         let right_str = quote!(#right).to_string();
+        let msg_str = if let Some(msg) = msg {
+            quote!(Some(#msg))
+        } else {
+            quote!(None)
+        };
         syn::parse(
             quote!(
                 if #left == #right {
                     return ::core::result::Result::Err(
                         ::flipperzero_test::TestFailure::AssertNe {
                             left: #left_str,
                             right: #right_str,
+                            msg: #msg_str,
                         }
                     );
                 }
@@ -93,9 +105,9 @@ fn expr_macro(m: ExprMacro) -> parse::Result<Expr> {
     }
 }
 
-fn binary_macro(tokens: proc_macro2::TokenStream) -> parse::Result<(Expr, Expr)> {
+fn binary_macro(tokens: proc_macro2::TokenStream) -> parse::Result<(Expr, Expr, Option<Expr>)> {
     let parts: ExprTuple = syn::parse(quote!((#tokens)).into())?;
-    assert_eq!(parts.elems.len(), 2);
+    assert!(parts.elems.len() >= 2);
     let mut elems = parts.elems.into_iter();
-    Ok((elems.next().unwrap(), elems.next().unwrap()))
+    Ok((elems.next().unwrap(), elems.next().unwrap(), elems.next()))
 }

crates/test/src/lib.rs

@@ -14,10 +14,12 @@ pub enum TestFailure {
     AssertEq {
         left: &'static str,
         right: &'static str,
+        msg: Option<&'static str>,
     },
     AssertNe {
         left: &'static str,
         right: &'static str,
+        msg: Option<&'static str>,
     },
     Str(&'static str),
 }
@@ -34,17 +36,27 @@ impl ufmt::uDisplay for TestFailure {
         W: ufmt::uWrite + ?Sized,
     {
         match self {
-            TestFailure::AssertEq { left, right } => {
+            TestFailure::AssertEq { left, right, msg } => {
                 f.write_str("assertion failed: ")?;
                 f.write_str(left)?;
                 f.write_str(" == ")?;
-                f.write_str(right)
+                f.write_str(right)?;
+                if let Some(msg) = msg {
+                    f.write_str("\n")?;
+                    f.write_str(msg)?;
+                }
+                Ok(())
             }
-            TestFailure::AssertNe { left, right } => {
+            TestFailure::AssertNe { left, right, msg } => {
                 f.write_str("assertion failed: ")?;
                 f.write_str(left)?;
                 f.write_str(" != ")?;
-                f.write_str(right)
+                f.write_str(right)?;
+                if let Some(msg) = msg {
+                    f.write_str("\n")?;
+                    f.write_str(msg)?;
+                }
+                Ok(())
             }
             TestFailure::Str(s) => f.write_str(s),
         }