Better unwrapping of errors in test cases

Signed-off-by: Kate Goldenring <kate.goldenring@fermyon.com>
fermyon · Oct 9, 2023 · 45303bf · 45303bf
1 parent 29c6ec6
commit 45303bf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 22 deletions.
diff --git a/src/commands/link.rs b/src/commands/link.rs
@@ -239,13 +239,10 @@ mod link_tests {
             .returning(move |_| Ok(dbs.to_owned()));
 
         let result = command.link(mock, app_id).await;
-        match result {
-            Ok(_) => panic!("Expected error"),
-            Err(err) => assert_eq!(
-                err.to_string(),
-                r#"Database "does-not-exist" does not exist"#
-            ),
-        }
+        assert_eq!(
+            result.unwrap_err().to_string(),
+            r#"Database "does-not-exist" does not exist"#
+        );
         Ok(())
     }
 
@@ -300,13 +297,10 @@ mod link_tests {
         mock.expect_get_databases()
             .returning(move |_| Ok(dbs.to_owned()));
         let result = command.link(mock, app_id).await;
-        match result {
-            Ok(_) => panic!("Expected error"),
-            Err(err) => assert_eq!(
-                err.to_string(),
-                r#"Database "db1" is already linked to app "app" with the label "label""#
-            ),
-        }
+        assert_eq!(
+            result.unwrap_err().to_string(),
+            r#"Database "db1" is already linked to app "app" with the label "label""#
+        );
         Ok(())
     }
 

diff --git a/src/commands/sqlite.rs b/src/commands/sqlite.rs
@@ -469,10 +469,10 @@ mod sqlite_tests {
             .returning(move |_| Ok(dbs.to_owned()));
 
         let result = command.run(mock).await;
-        match result {
-            Ok(_) => panic!("Expected error"),
-            Err(err) => assert_eq!(err.to_string(), r#"Database "db1" already exists"#),
-        }
+        assert_eq!(
+            result.unwrap_err().to_string(),
+            r#"Database "db1" already exists"#
+        );
         Ok(())
     }
 
@@ -503,10 +503,10 @@ mod sqlite_tests {
         mock.expect_get_databases().returning(move |_| Ok(vec![]));
 
         let result = command.run(mock).await;
-        match result {
-            Ok(_) => panic!("Expected error"),
-            Err(err) => assert_eq!(err.to_string(), r#"No database found with name "db1""#),
-        }
+        assert_eq!(
+            result.unwrap_err().to_string(),
+            r#"No database found with name "db1""#
+        );
         Ok(())
     }