From 922e71cd4dfa053fa438a95ff5e824f6584a5181 Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Thu, 24 Dec 2020 21:14:20 +0000 Subject: [PATCH] use a s!(..) shorthand in CLI tests --- cli/src/argparse/args.rs | 20 +++++------ cli/src/argparse/command.rs | 2 +- cli/src/argparse/filter.rs | 2 +- cli/src/argparse/modification.rs | 12 +++---- cli/src/argparse/subcommand.rs | 16 ++++----- cli/src/invocation/cmd/add.rs | 2 +- cli/src/invocation/cmd/help.rs | 4 +-- cli/src/invocation/cmd/info.rs | 4 +-- cli/src/invocation/cmd/list.rs | 4 +-- cli/src/invocation/cmd/modify.rs | 4 +-- cli/src/invocation/filter.rs | 58 ++++++++++++++------------------ cli/src/macros.rs | 6 ++++ 12 files changed, 65 insertions(+), 69 deletions(-) diff --git a/cli/src/argparse/args.rs b/cli/src/argparse/args.rs index edf6248a9..c58b5ac51 100644 --- a/cli/src/argparse/args.rs +++ b/cli/src/argparse/args.rs @@ -197,27 +197,27 @@ mod test { fn test_id_list_uuids() { assert_eq!( id_list("12341234").unwrap().1, - vec![TaskId::PartialUuid("12341234".to_owned())] + vec![TaskId::PartialUuid(s!("12341234"))] ); assert_eq!( id_list("1234abcd").unwrap().1, - vec![TaskId::PartialUuid("1234abcd".to_owned())] + vec![TaskId::PartialUuid(s!("1234abcd"))] ); assert_eq!( id_list("abcd1234").unwrap().1, - vec![TaskId::PartialUuid("abcd1234".to_owned())] + vec![TaskId::PartialUuid(s!("abcd1234"))] ); assert_eq!( id_list("abcd1234-1234").unwrap().1, - vec![TaskId::PartialUuid("abcd1234-1234".to_owned())] + vec![TaskId::PartialUuid(s!("abcd1234-1234"))] ); assert_eq!( id_list("abcd1234-1234-2345").unwrap().1, - vec![TaskId::PartialUuid("abcd1234-1234-2345".to_owned())] + vec![TaskId::PartialUuid(s!("abcd1234-1234-2345"))] ); assert_eq!( id_list("abcd1234-1234-2345-3456").unwrap().1, - vec![TaskId::PartialUuid("abcd1234-1234-2345-3456".to_owned())] + vec![TaskId::PartialUuid(s!("abcd1234-1234-2345-3456"))] ); assert_eq!( id_list("abcd1234-1234-2345-3456-0123456789ab").unwrap().1, @@ -241,10 +241,10 @@ mod test { #[test] fn test_id_list_uuids_mixed() { assert_eq!(id_list("abcd1234,abcd1234-1234,abcd1234-1234-2345,abcd1234-1234-2345-3456,abcd1234-1234-2345-3456-0123456789ab").unwrap().1, - vec![TaskId::PartialUuid("abcd1234".to_owned()), - TaskId::PartialUuid("abcd1234-1234".to_owned()), - TaskId::PartialUuid("abcd1234-1234-2345".to_owned()), - TaskId::PartialUuid("abcd1234-1234-2345-3456".to_owned()), + vec![TaskId::PartialUuid(s!("abcd1234")), + TaskId::PartialUuid(s!("abcd1234-1234")), + TaskId::PartialUuid(s!("abcd1234-1234-2345")), + TaskId::PartialUuid(s!("abcd1234-1234-2345-3456")), TaskId::Uuid(Uuid::parse_str("abcd1234-1234-2345-3456-0123456789ab").unwrap()), ]); } diff --git a/cli/src/argparse/command.rs b/cli/src/argparse/command.rs index 7d55616e7..fec430d2c 100644 --- a/cli/src/argparse/command.rs +++ b/cli/src/argparse/command.rs @@ -55,7 +55,7 @@ mod test { Command::from_argv(argv!["task", "version"]).unwrap(), Command { subcommand: Subcommand::Version, - command_name: "task".to_owned(), + command_name: s!("task"), } ); } diff --git a/cli/src/argparse/filter.rs b/cli/src/argparse/filter.rs index 07129a75b..f381e5862 100644 --- a/cli/src/argparse/filter.rs +++ b/cli/src/argparse/filter.rs @@ -210,7 +210,7 @@ mod test { Filter { universe: Universe::IdList(vec![ TaskId::WorkingSetId(1), - TaskId::PartialUuid("abcd1234".to_owned()), + TaskId::PartialUuid(s!("abcd1234")), ]), ..Default::default() } diff --git a/cli/src/argparse/modification.rs b/cli/src/argparse/modification.rs index fbcc97370..d449f1ef6 100644 --- a/cli/src/argparse/modification.rs +++ b/cli/src/argparse/modification.rs @@ -155,7 +155,7 @@ mod test { assert_eq!( modification, Modification { - description: DescriptionMod::Set("newdesc".to_owned()), + description: DescriptionMod::Set(s!("newdesc")), ..Default::default() } ); @@ -168,7 +168,7 @@ mod test { assert_eq!( modification, Modification { - add_tags: set!["abc".to_owned(), "def".to_owned()], + add_tags: set![s!("abc"), s!("def")], ..Default::default() } ); @@ -181,7 +181,7 @@ mod test { assert_eq!( modification, Modification { - description: DescriptionMod::Set("new desc fun".to_owned()), + description: DescriptionMod::Set(s!("new desc fun")), ..Default::default() } ); @@ -195,9 +195,9 @@ mod test { assert_eq!( modification, Modification { - description: DescriptionMod::Set("new desc fun".to_owned()), - add_tags: set!["next".to_owned()], - remove_tags: set!["daytime".to_owned()], + description: DescriptionMod::Set(s!("new desc fun")), + add_tags: set![s!("next")], + remove_tags: set![s!("daytime")], ..Default::default() } ); diff --git a/cli/src/argparse/subcommand.rs b/cli/src/argparse/subcommand.rs index 9b2a0712e..5efa4c6d1 100644 --- a/cli/src/argparse/subcommand.rs +++ b/cli/src/argparse/subcommand.rs @@ -409,7 +409,7 @@ mod test { fn test_add_description() { let subcommand = Subcommand::Add { modification: Modification { - description: DescriptionMod::Set("foo".to_owned()), + description: DescriptionMod::Set(s!("foo")), ..Default::default() }, }; @@ -423,7 +423,7 @@ mod test { fn test_add_description_multi() { let subcommand = Subcommand::Add { modification: Modification { - description: DescriptionMod::Set("foo bar".to_owned()), + description: DescriptionMod::Set(s!("foo bar")), ..Default::default() }, }; @@ -441,7 +441,7 @@ mod test { ..Default::default() }, modification: Modification { - description: DescriptionMod::Set("foo bar".to_owned()), + description: DescriptionMod::Set(s!("foo bar")), ..Default::default() }, }; @@ -459,7 +459,7 @@ mod test { ..Default::default() }, modification: Modification { - description: DescriptionMod::Append("foo bar".to_owned()), + description: DescriptionMod::Append(s!("foo bar")), ..Default::default() }, }; @@ -477,7 +477,7 @@ mod test { ..Default::default() }, modification: Modification { - description: DescriptionMod::Prepend("foo bar".to_owned()), + description: DescriptionMod::Prepend(s!("foo bar")), ..Default::default() }, }; @@ -513,7 +513,7 @@ mod test { ..Default::default() }, modification: Modification { - description: DescriptionMod::Set("now-finished".to_owned()), + description: DescriptionMod::Set(s!("now-finished")), status: Some(Status::Completed), ..Default::default() }, @@ -551,7 +551,7 @@ mod test { }, modification: Modification { active: Some(true), - description: DescriptionMod::Set("mod".to_owned()), + description: DescriptionMod::Set(s!("mod")), ..Default::default() }, }; @@ -587,7 +587,7 @@ mod test { ..Default::default() }, modification: Modification { - description: DescriptionMod::Set("mod".to_owned()), + description: DescriptionMod::Set(s!("mod")), active: Some(false), ..Default::default() }, diff --git a/cli/src/invocation/cmd/add.rs b/cli/src/invocation/cmd/add.rs index 0b3618f4e..104a6357c 100644 --- a/cli/src/invocation/cmd/add.rs +++ b/cli/src/invocation/cmd/add.rs @@ -27,7 +27,7 @@ mod test { let mut w = test_writer(); let mut replica = test_replica(); let modification = Modification { - description: DescriptionMod::Set("my description".to_owned()), + description: DescriptionMod::Set(s!("my description")), ..Default::default() }; execute(&mut w, &mut replica, modification).unwrap(); diff --git a/cli/src/invocation/cmd/help.rs b/cli/src/invocation/cmd/help.rs index 0847ad9ab..df7bb5919 100644 --- a/cli/src/invocation/cmd/help.rs +++ b/cli/src/invocation/cmd/help.rs @@ -20,12 +20,12 @@ mod test { #[test] fn test_summary() { let mut w = test_writer(); - execute(&mut w, "task".to_owned(), true).unwrap(); + execute(&mut w, s!("task"), true).unwrap(); } #[test] fn test_long() { let mut w = test_writer(); - execute(&mut w, "task".to_owned(), false).unwrap(); + execute(&mut w, s!("task"), false).unwrap(); } } diff --git a/cli/src/invocation/cmd/info.rs b/cli/src/invocation/cmd/info.rs index f30e4a8fd..5d70163c7 100644 --- a/cli/src/invocation/cmd/info.rs +++ b/cli/src/invocation/cmd/info.rs @@ -52,9 +52,7 @@ mod test { fn test_info() { let mut w = test_writer(); let mut replica = test_replica(); - replica - .new_task(Status::Pending, "my task".to_owned()) - .unwrap(); + replica.new_task(Status::Pending, s!("my task")).unwrap(); let filter = Filter { ..Default::default() diff --git a/cli/src/invocation/cmd/list.rs b/cli/src/invocation/cmd/list.rs index 2905a9c19..b3d922527 100644 --- a/cli/src/invocation/cmd/list.rs +++ b/cli/src/invocation/cmd/list.rs @@ -41,9 +41,7 @@ mod test { fn test_list() { let mut w = test_writer(); let mut replica = test_replica(); - replica - .new_task(Status::Pending, "my task".to_owned()) - .unwrap(); + replica.new_task(Status::Pending, s!("my task")).unwrap(); let report = Report { filter: Filter { diff --git a/cli/src/invocation/cmd/modify.rs b/cli/src/invocation/cmd/modify.rs index b935f93af..d914da418 100644 --- a/cli/src/invocation/cmd/modify.rs +++ b/cli/src/invocation/cmd/modify.rs @@ -33,14 +33,14 @@ mod test { let mut replica = test_replica(); let task = replica - .new_task(Status::Pending, "old description".to_owned()) + .new_task(Status::Pending, s!("old description")) .unwrap(); let filter = Filter { ..Default::default() }; let modification = Modification { - description: DescriptionMod::Set("new description".to_owned()), + description: DescriptionMod::Set(s!("new description")), ..Default::default() }; execute(&mut w, &mut replica, filter, modification).unwrap(); diff --git a/cli/src/invocation/filter.rs b/cli/src/invocation/filter.rs index 4bca65825..881836009 100644 --- a/cli/src/invocation/filter.rs +++ b/cli/src/invocation/filter.rs @@ -124,9 +124,9 @@ mod test { fn exact_ids() { let mut replica = test_replica(); - let t1 = replica.new_task(Status::Pending, "A".to_owned()).unwrap(); - let t2 = replica.new_task(Status::Completed, "B".to_owned()).unwrap(); - let _t = replica.new_task(Status::Pending, "C".to_owned()).unwrap(); + let t1 = replica.new_task(Status::Pending, s!("A")).unwrap(); + let t2 = replica.new_task(Status::Completed, s!("B")).unwrap(); + let _t = replica.new_task(Status::Pending, s!("C")).unwrap(); replica.gc().unwrap(); let t1uuid = *t1.get_uuid(); @@ -144,16 +144,16 @@ mod test { .map(|t| t.get_description().to_owned()) .collect(); filtered.sort(); - assert_eq!(vec!["A".to_owned(), "B".to_owned()], filtered); + assert_eq!(vec![s!("A"), s!("B")], filtered); } #[test] fn partial_ids() { let mut replica = test_replica(); - let t1 = replica.new_task(Status::Pending, "A".to_owned()).unwrap(); - let t2 = replica.new_task(Status::Completed, "B".to_owned()).unwrap(); - let _t = replica.new_task(Status::Pending, "C".to_owned()).unwrap(); + let t1 = replica.new_task(Status::Pending, s!("A")).unwrap(); + let t2 = replica.new_task(Status::Completed, s!("B")).unwrap(); + let _t = replica.new_task(Status::Pending, s!("C")).unwrap(); replica.gc().unwrap(); let t1uuid = *t1.get_uuid(); @@ -173,16 +173,16 @@ mod test { .map(|t| t.get_description().to_owned()) .collect(); filtered.sort(); - assert_eq!(vec!["A".to_owned(), "B".to_owned()], filtered); + assert_eq!(vec![s!("A"), s!("B")], filtered); } #[test] fn all_tasks() { let mut replica = test_replica(); - replica.new_task(Status::Pending, "A".to_owned()).unwrap(); - replica.new_task(Status::Completed, "B".to_owned()).unwrap(); - replica.new_task(Status::Deleted, "C".to_owned()).unwrap(); + replica.new_task(Status::Pending, s!("A")).unwrap(); + replica.new_task(Status::Completed, s!("B")).unwrap(); + replica.new_task(Status::Deleted, s!("C")).unwrap(); replica.gc().unwrap(); let filter = Filter { @@ -194,10 +194,7 @@ mod test { .map(|t| t.get_description().to_owned()) .collect(); filtered.sort(); - assert_eq!( - vec!["A".to_owned(), "B".to_owned(), "C".to_owned()], - filtered - ); + assert_eq!(vec![s!("A"), s!("B"), s!("C")], filtered); } #[test] @@ -207,57 +204,54 @@ mod test { let no: Tag = "no".try_into()?; let mut t1 = replica - .new_task(Status::Pending, "A".to_owned())? + .new_task(Status::Pending, s!("A"))? .into_mut(&mut replica); t1.add_tag(&yes)?; let mut t2 = replica - .new_task(Status::Pending, "B".to_owned())? + .new_task(Status::Pending, s!("B"))? .into_mut(&mut replica); t2.add_tag(&yes)?; t2.add_tag(&no)?; let mut t3 = replica - .new_task(Status::Pending, "C".to_owned())? + .new_task(Status::Pending, s!("C"))? .into_mut(&mut replica); t3.add_tag(&no)?; - let _t4 = replica.new_task(Status::Pending, "D".to_owned())?; + let _t4 = replica.new_task(Status::Pending, s!("D"))?; // look for just "yes" (A and B) let filter = Filter { universe: Universe::AllTasks, - conditions: vec![Condition::HasTag("yes".to_owned())], + conditions: vec![Condition::HasTag(s!("yes"))], ..Default::default() }; let mut filtered: Vec<_> = filtered_tasks(&mut replica, &filter)? .map(|t| t.get_description().to_owned()) .collect(); filtered.sort(); - assert_eq!(vec!["A".to_owned(), "B".to_owned()], filtered); + assert_eq!(vec![s!("A"), s!("B")], filtered); // look for tags without "no" (A, D) let filter = Filter { universe: Universe::AllTasks, - conditions: vec![Condition::NoTag("no".to_owned())], + conditions: vec![Condition::NoTag(s!("no"))], ..Default::default() }; let mut filtered: Vec<_> = filtered_tasks(&mut replica, &filter)? .map(|t| t.get_description().to_owned()) .collect(); filtered.sort(); - assert_eq!(vec!["A".to_owned(), "D".to_owned()], filtered); + assert_eq!(vec![s!("A"), s!("D")], filtered); // look for tags with "yes" and "no" (B) let filter = Filter { universe: Universe::AllTasks, - conditions: vec![ - Condition::HasTag("yes".to_owned()), - Condition::HasTag("no".to_owned()), - ], + conditions: vec![Condition::HasTag(s!("yes")), Condition::HasTag(s!("no"))], ..Default::default() }; let filtered: Vec<_> = filtered_tasks(&mut replica, &filter)? .map(|t| t.get_description().to_owned()) .collect(); - assert_eq!(vec!["B".to_owned()], filtered); + assert_eq!(vec![s!("B")], filtered); Ok(()) } @@ -266,9 +260,9 @@ mod test { fn pending_tasks() { let mut replica = test_replica(); - replica.new_task(Status::Pending, "A".to_owned()).unwrap(); - replica.new_task(Status::Completed, "B".to_owned()).unwrap(); - replica.new_task(Status::Deleted, "C".to_owned()).unwrap(); + replica.new_task(Status::Pending, s!("A")).unwrap(); + replica.new_task(Status::Completed, s!("B")).unwrap(); + replica.new_task(Status::Deleted, s!("C")).unwrap(); replica.gc().unwrap(); let filter = Filter { @@ -280,6 +274,6 @@ mod test { .map(|t| t.get_description().to_owned()) .collect(); filtered.sort(); - assert_eq!(vec!["A".to_owned()], filtered); + assert_eq!(vec![s!("A")], filtered); } } diff --git a/cli/src/macros.rs b/cli/src/macros.rs index 83a347dd0..02e11e5cf 100644 --- a/cli/src/macros.rs +++ b/cli/src/macros.rs @@ -24,3 +24,9 @@ macro_rules! set( } }; ); + +/// Create a String from an &str; just a testing shorthand +#[cfg(test)] +macro_rules! s( + { $s:expr } => { $s.to_owned() }; +);