Use claim to simplify assertions

Author: Turbo87

Cargo.lock

@@ -88,6 +88,7 @@ toml = "0.5"
 url = "2.1"
 
 [dev-dependencies]
+claim = "0.4.0"
 conduit-test = "0.9.0-alpha.3"
 diesel_migrations = { version = "1.3.0", features = ["postgres"] }
 hyper-tls = "0.4"

Cargo.toml

@@ -187,5 +187,5 @@ fn parse_traffic_patterns_splits_on_comma_and_looks_for_equal_sign() {
     let patterns_2 = parse_traffic_patterns(pattern_string_2).collect::<Vec<_>>();
     assert_eq!(vec![("Baz", "QUX")], patterns_2);
 
-    assert!(parse_traffic_patterns(pattern_string_3).next().is_none());
+    assert_none!(parse_traffic_patterns(pattern_string_3).next());
 }

src/config.rs

@@ -141,12 +141,12 @@ mod tests {
             "test",
             "test",
         );
-        assert!(result.is_err());
+        assert_err!(result);
     }
 
     #[test]
     fn sending_to_valid_email_succeeds() {
         let result = send_email("[email protected]", "test", "test");
-        assert!(result.is_ok());
+        assert_ok!(result);
     }
 }

src/email.rs

@@ -7,6 +7,9 @@
 #![warn(clippy::all, rust_2018_idioms)]
 #![warn(missing_debug_implementations, missing_copy_implementations)]
 
+#[cfg(test)]
+#[macro_use]
+extern crate claim;
 #[macro_use]
 extern crate derive_deref;
 #[macro_use]

src/lib.rs

@@ -564,7 +564,7 @@ mod tests {
             repository: None,
             max_upload_size: None,
         };
-        assert!(krate.validate().is_err());
+        assert_err!(krate.validate());
     }
 
     #[test]

src/models/krate.rs

@@ -133,14 +133,12 @@ mod tests {
             last_used_at: Some(NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 12)),
         };
         let json = serde_json::to_string(&tok).unwrap();
-        assert!(json
+        assert_some!(json
             .as_str()
-            .find(r#""created_at":"2017-01-06T14:23:11+00:00""#)
-            .is_some());
-        assert!(json
+            .find(r#""created_at":"2017-01-06T14:23:11+00:00""#));
+        assert_some!(json
             .as_str()
-            .find(r#""last_used_at":"2017-01-06T14:23:12+00:00""#)
-            .is_some());
+            .find(r#""last_used_at":"2017-01-06T14:23:12+00:00""#));
     }
 
     #[test]
@@ -154,13 +152,11 @@ mod tests {
             last_used_at: Some(NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 12)),
         };
         let json = serde_json::to_string(&tok).unwrap();
-        assert!(json
+        assert_some!(json
             .as_str()
-            .find(r#""created_at":"2017-01-06T14:23:11+00:00""#)
-            .is_some());
-        assert!(json
+            .find(r#""created_at":"2017-01-06T14:23:11+00:00""#));
+        assert_some!(json
             .as_str()
-            .find(r#""last_used_at":"2017-01-06T14:23:12+00:00""#)
-            .is_some());
+            .find(r#""last_used_at":"2017-01-06T14:23:12+00:00""#));
     }
 }

src/models/token.rs

@@ -1,5 +1,7 @@
 #![warn(clippy::all, rust_2018_idioms)]
 
+#[macro_use]
+extern crate claim;
 #[macro_use]
 extern crate diesel;
 #[macro_use]
@@ -33,15 +35,6 @@ use conduit_test::MockRequest;
 use diesel::prelude::*;
 use reqwest::{blocking::Client, Proxy};
 
-macro_rules! t {
-    ($e:expr) => {
-        match $e {
-            Ok(e) => e,
-            Err(m) => panic!("{} failed with: {}", stringify!($e), m),
-        }
-    };
-}
-
 mod account_lock;
 mod authentication;
 mod badge;
@@ -164,7 +157,7 @@ fn build_app(
     };
 
     let app = App::new(config, client);
-    t!(t!(app.primary_database.get()).begin_test_transaction());
+    assert_ok!(assert_ok!(app.primary_database.get()).begin_test_transaction());
     let app = Arc::new(app);
     let handler = cargo_registry::build_handler(Arc::clone(&app));
     (app, handler)

src/tests/all.rs

@@ -14,7 +14,7 @@ lazy_static! {
         {
             let mut ar =
                 tar::Builder::new(GzEncoder::new(&mut empty_tarball, Compression::default()));
-            t!(ar.finish());
+            assert_ok!(ar.finish());
         }
         empty_tarball
     };
@@ -88,12 +88,12 @@ impl PublishBuilder {
             let mut ar = tar::Builder::new(GzEncoder::new(&mut tarball, Compression::default()));
             for &mut (name, ref mut data, size) in files {
                 let mut header = tar::Header::new_gnu();
-                t!(header.set_path(name));
+                assert_ok!(header.set_path(name));
                 header.set_size(size);
                 header.set_cksum();
-                t!(ar.append(&header, data));
+                assert_ok!(ar.append(&header, data));
             }
-            t!(ar.finish());
+            assert_ok!(ar.finish());
         }
 
         self.tarball = tarball;

src/tests/builders/publish.rs

@@ -44,8 +44,10 @@ fn show() {
 
     // Create a category and a subcategory
     app.db(|conn| {
-        t!(new_category("Foo Bar", "foo-bar", "Foo Bar crates").create_or_update(conn));
-        t!(new_category("Foo Bar::Baz", "foo-bar::baz", "Baz crates").create_or_update(conn));
+        assert_ok!(new_category("Foo Bar", "foo-bar", "Foo Bar crates").create_or_update(conn));
+        assert_ok!(
+            new_category("Foo Bar::Baz", "foo-bar::baz", "Baz crates").create_or_update(conn)
+        );
     });
 
     // The category and its subcategories should be in the json
@@ -69,8 +71,10 @@ fn update_crate() {
     let user = user.as_model();
 
     app.db(|conn| {
-        t!(new_category("cat1", "cat1", "Category 1 crates").create_or_update(conn));
-        t!(new_category("Category 2", "category-2", "Category 2 crates").create_or_update(conn));
+        assert_ok!(new_category("cat1", "cat1", "Category 1 crates").create_or_update(conn));
+        assert_ok!(
+            new_category("Category 2", "category-2", "Category 2 crates").create_or_update(conn)
+        );
         let krate = CrateBuilder::new("foo_crate", user.id).expect_build(&conn);
 
         // Updating with no categories has no effect
@@ -122,7 +126,7 @@ fn update_crate() {
         assert_eq!(count(&anon, "category-2"), 0);
 
         // Add a category and its subcategory
-        t!(new_category("cat1::bar", "cat1::bar", "bar crates").create_or_update(conn));
+        assert_ok!(new_category("cat1::bar", "cat1::bar", "bar crates").create_or_update(conn));
         Category::update_crate(&conn, &krate, &["cat1", "cat1::bar"]).unwrap();
 
         assert_eq!(count(&anon, "cat1"), 1);