07ed063 refactor(src/events.rs)): uses ? in tests instead of expect — radicle-ci-broker

Radicle CI broker

refactor(src/events.rs)): uses ? in tests instead of expect

Lars Wirzenius committed 1 year ago

commit 07ed0639e7478a1ed3f3cd7f43397441804dd0cc
parent cf66efb550ad9e87dd405fb24372770bf98fb288

1 file changed +21 -19

modified src/event.rs

@@ -473,12 +473,13 @@ mod test_broker_event {

     use super::{BrokerEvent, NodeId, Oid, RefString, RepoId};
     #[test]
     fn name_for_branch() {
         let rid = RepoId::from_urn("rad:zwTxygwuz5LDGBq255RA2CbNGrz8").expect("RepoId");
         let name = RefString::try_from("main").expect("RefString");
         let oid = Oid::from_str("11d03559fb10183b0f14331175f254fbb077159a").expect("Oid");
     fn name_for_branch() -> anyhow::Result<()> {
         let rid = RepoId::from_urn("rad:zwTxygwuz5LDGBq255RA2CbNGrz8")?;
         let name = RefString::try_from("main")?;
         let oid = Oid::from_str("11d03559fb10183b0f14331175f254fbb077159a")?;
         let be = BrokerEvent::new(&rid, &name, &oid, None);
         assert_eq!(be.name(), Some(&name));
         Ok(())
     }
     #[test]

@@ -488,35 +489,36 @@ mod test_broker_event {

     }
     #[test]
     fn nid_for_plain_branch_name() {
         let rid = RepoId::from_urn("rad:zwTxygwuz5LDGBq255RA2CbNGrz8").expect("RepoId");
         let name = RefString::try_from("main").expect("RefString");
         let oid = Oid::from_str("11d03559fb10183b0f14331175f254fbb077159a").expect("Oid");
     fn nid_for_plain_branch_name() -> anyhow::Result<()> {
         let rid = RepoId::from_urn("rad:zwTxygwuz5LDGBq255RA2CbNGrz8")?;
         let name = RefString::try_from("main")?;
         let oid = Oid::from_str("11d03559fb10183b0f14331175f254fbb077159a")?;
         let be = BrokerEvent::new(&rid, &name, &oid, None);
         assert_eq!(be.nid(), None);
         Ok(())
     }
     #[test]
     fn nid_for_ref_without_namespace() {
         let rid = RepoId::from_urn("rad:zwTxygwuz5LDGBq255RA2CbNGrz8").expect("RepoId");
         let name = RefString::try_from("something/else/main").expect("RefString");
         let oid = Oid::from_str("11d03559fb10183b0f14331175f254fbb077159a").expect("Oid");
     fn nid_for_ref_without_namespace() -> anyhow::Result<()> {
         let rid = RepoId::from_urn("rad:zwTxygwuz5LDGBq255RA2CbNGrz8")?;
         let name = RefString::try_from("something/else/main")?;
         let oid = Oid::from_str("11d03559fb10183b0f14331175f254fbb077159a")?;
         let be = BrokerEvent::new(&rid, &name, &oid, None);
         assert_eq!(be.nid(), None);
         Ok(())
     }
     #[test]
     fn nid_for_ref_with_namespace() {
         let rid = RepoId::from_urn("rad:zwTxygwuz5LDGBq255RA2CbNGrz8").expect("RepoId");
     fn nid_for_ref_with_namespace() -> anyhow::Result<()> {
         let rid = RepoId::from_urn("rad:zwTxygwuz5LDGBq255RA2CbNGrz8")?;
         let name = RefString::try_from(
             "refs/namespaces/z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV/main",
         )
         .expect("RefString");
         let nid =
             NodeId::from_str("z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV").expect("NodeId");
         let oid = Oid::from_str("11d03559fb10183b0f14331175f254fbb077159a").expect("Oid");
         )?;
         let nid = NodeId::from_str("z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV")?;
         let oid = Oid::from_str("11d03559fb10183b0f14331175f254fbb077159a")?;
         let be = BrokerEvent::new(&rid, &name, &oid, None);
         assert_eq!(be.nid(), Some(nid));
         Ok(())
     }
 }