From dce6bfce26170264dd95a67721f6badc1a104038 Mon Sep 17 00:00:00 2001
From: Sudan Landge <sudanl@amazon.com>
Date: Fri, 24 Nov 2023 09:32:22 +0000
Subject: [PATCH] test: remove levelfilter_from_str test

Remove redundant logic from levelfilter_from_str because
levelfilter_from_str_all_variants is a better place to logic.

Signed-off-by: Sudan Landge <sudanl@amazon.com>
---
 src/vmm/src/logger/logging.rs | 36 +++++------------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/vmm/src/logger/logging.rs b/src/vmm/src/logger/logging.rs
index bb6a601105cf..582b9031ca70 100644
--- a/src/vmm/src/logger/logging.rs
+++ b/src/vmm/src/logger/logging.rs
@@ -300,17 +300,18 @@ mod tests {
             log::LevelFilter::Error
         );
     }
+
     #[test]
     fn levelfilter_from_str_all_variants() {
         use itertools::Itertools;
 
-        #[derive(Debug, Deserialize)]
+        #[derive(Deserialize)]
         struct Foo {
             #[allow(dead_code)]
             level: LevelFilter,
         }
 
-        for level in [
+        for pair in [
             ("off", LevelFilter::Off),
             ("trace", LevelFilter::Trace),
             ("debug", LevelFilter::Debug),
@@ -319,6 +320,7 @@ mod tests {
             ("warning", LevelFilter::Warn),
             ("error", LevelFilter::Error),
         ] {
+            let (level, level_enum) = pair;
             let multi = level.chars().map(|_| 0..=1).multi_cartesian_product();
             for combination in multi {
                 let variant = level
@@ -332,7 +334,7 @@ mod tests {
                     .collect::<String>();
 
                 let ex = format!("{{ \"level\": \"{}\" }}", variant);
-                assert!(LevelFilter::from_str(&variant).is_ok(), "{variant}");
+                assert_eq!(LevelFilter::from_str(&variant), Ok(level_enum.clone()));
                 assert!(serde_json::from_str::<Foo>(&ex).is_ok(), "{ex}");
             }
         }
@@ -341,38 +343,10 @@ mod tests {
             serde_json::from_str::<Foo>(&ex).is_err(),
             "expected error got {ex:#?}"
         );
-    }
-    #[test]
-    fn levelfilter_from_str() {
         assert_eq!(
             LevelFilter::from_str("bad"),
             Err(LevelFilterFromStrError(String::from("bad")))
         );
-
-        assert_eq!(LevelFilter::from_str("Off"), Ok(LevelFilter::Off));
-        assert_eq!(LevelFilter::from_str("Trace"), Ok(LevelFilter::Trace));
-        assert_eq!(LevelFilter::from_str("Debug"), Ok(LevelFilter::Debug));
-        assert_eq!(LevelFilter::from_str("Info"), Ok(LevelFilter::Info));
-        assert_eq!(LevelFilter::from_str("Warn"), Ok(LevelFilter::Warn));
-        assert_eq!(LevelFilter::from_str("Error"), Ok(LevelFilter::Error));
-
-        assert_eq!(LevelFilter::from_str("off"), Ok(LevelFilter::Off));
-        assert_eq!(LevelFilter::from_str("trace"), Ok(LevelFilter::Trace));
-        assert_eq!(LevelFilter::from_str("debug"), Ok(LevelFilter::Debug));
-        assert_eq!(LevelFilter::from_str("info"), Ok(LevelFilter::Info));
-        assert_eq!(LevelFilter::from_str("warn"), Ok(LevelFilter::Warn));
-        assert_eq!(LevelFilter::from_str("error"), Ok(LevelFilter::Error));
-
-        assert_eq!(LevelFilter::from_str("OFF"), Ok(LevelFilter::Off));
-        assert_eq!(LevelFilter::from_str("TRACE"), Ok(LevelFilter::Trace));
-        assert_eq!(LevelFilter::from_str("DEBUG"), Ok(LevelFilter::Debug));
-        assert_eq!(LevelFilter::from_str("INFO"), Ok(LevelFilter::Info));
-        assert_eq!(LevelFilter::from_str("WARN"), Ok(LevelFilter::Warn));
-        assert_eq!(LevelFilter::from_str("ERROR"), Ok(LevelFilter::Error));
-
-        assert_eq!(LevelFilter::from_str("warning"), Ok(LevelFilter::Warn));
-        assert_eq!(LevelFilter::from_str("Warning"), Ok(LevelFilter::Warn));
-        assert_eq!(LevelFilter::from_str("WARNING"), Ok(LevelFilter::Warn));
     }
 
     #[test]