diff --git a/src/commands/display.rs b/src/commands/display.rs index 33d6b13..818b812 100644 --- a/src/commands/display.rs +++ b/src/commands/display.rs @@ -130,7 +130,7 @@ mod tests { use pretty_assertions::assert_eq; use crate::database::SqliteDatabase; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use super::*; @@ -145,7 +145,7 @@ mod tests { DisplayCommand::handle(args, &mut db, &mut out, &mut err, &config, Utc::now()).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Timesheet: default + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Timesheet: default Day Start End Duration Notes Tue Jun 29, 2021 06:26:49 - 07:26:52 1:00:03 lets do some rust 1:00:03 @@ -178,7 +178,7 @@ mod tests { DisplayCommand::handle(args, &mut db, &mut out, &mut err, &config, Utc::now()).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("start,end,note,sheet + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("start,end,note,sheet 2021-06-30T10:10:00Z,,hola,default ")); @@ -201,7 +201,7 @@ mod tests { entries_for_display(None, None, None, &mut db, &mut out, &mut err, Formatter::Csv, true, Some("io".parse().unwrap()), Utc::now()).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("id,start,end,note,sheet + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("id,start,end,note,sheet 2,2021-06-30T10:10:00Z,,adios,default ")); @@ -231,7 +231,7 @@ mod tests { DisplayCommand::handle(args, &mut db, &mut out, &mut err, &config, Utc::now()).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Timesheet: sheet1 + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Timesheet: sheet1 Day Start End Duration Notes Wed Jun 30, 2021 10:00:00 - 11:00:00 1:00:00 12:00:00 - 13:00:00 1:00:00 @@ -270,7 +270,7 @@ Timesheet: sheet2 DisplayCommand::handle(args, &mut db, &mut out, &mut err, &config, Utc::now()).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("\ + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("\ Timesheet: _sheet2 Day Start End Duration Notes Wed Jun 30, 2021 11:00:00 - 12:00:00 1:00:00 diff --git a/src/commands/in.rs b/src/commands/in.rs index 474b45e..7f284ab 100644 --- a/src/commands/in.rs +++ b/src/commands/in.rs @@ -75,7 +75,7 @@ mod tests { use ansi_term::Color::Yellow; use chrono::{TimeZone, Local}; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use crate::database::SqliteDatabase; use super::*; @@ -104,8 +104,8 @@ mod tests { assert_eq!(e.end, None); assert_eq!(e.sheet, "default".to_owned()); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Checked into sheet \"default\".\n")); - assert_eq!(PrettyString(&String::from_utf8_lossy(&err)), PrettyString("")); + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Checked into sheet \"default\".\n")); + assert_eq!(Ps(&String::from_utf8_lossy(&err)), Ps("")); } #[test] @@ -130,8 +130,8 @@ mod tests { assert_eq!(d.entries_full(None, None).unwrap().len(), 1); assert_eq!( - PrettyString(&String::from_utf8_lossy(&out)), - PrettyString("Timer is already running for sheet 'default'\n") + Ps(&String::from_utf8_lossy(&out)), + Ps("Timer is already running for sheet 'default'\n") ); } @@ -185,8 +185,8 @@ mod tests { assert_eq!(e.end, None); assert_eq!(e.sheet, "default".to_owned()); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Checked into sheet \"default\".\n")); - assert_eq!(PrettyString(&String::from_utf8_lossy(&err)), PrettyString(&format!( + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Checked into sheet \"default\".\n")); + assert_eq!(Ps(&String::from_utf8_lossy(&err)), Ps(&format!( "{} You are using the old timetrap format, it is advised that \ you update your database using t migrate\n", Yellow.bold().paint("[WARNING]")))); @@ -216,7 +216,7 @@ mod tests { assert_eq!(e.end, None); assert_eq!(e.sheet, "default".to_owned()); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Checked into sheet \"default\".\n")); - assert_eq!(PrettyString(&String::from_utf8_lossy(&err)), PrettyString("")); + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Checked into sheet \"default\".\n")); + assert_eq!(Ps(&String::from_utf8_lossy(&err)), Ps("")); } } diff --git a/src/commands/list.rs b/src/commands/list.rs index b49c816..9ce85ca 100644 --- a/src/commands/list.rs +++ b/src/commands/list.rs @@ -136,7 +136,7 @@ mod tests { use ansi_term::Color::Yellow; use crate::database::{SqliteDatabase, Database}; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use super::*; @@ -163,7 +163,7 @@ mod tests { ListCommand::handle(args, &mut db, &mut out, &mut err, &config, now).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString(" Timesheet Running Today Total Time + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps(" Timesheet Running Today Total Time sheet1 0:00:00 0:00:00 10:13:55 * sheet2 0:00:00 0:00:00 0:00:00 @@ -180,7 +180,7 @@ mod tests { ListCommand::handle(args, &mut db, &mut out, &mut err, &config, now).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString(" Timesheet Running Today Total Time + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps(" Timesheet Running Today Total Time _archived 0:00:00 0:00:00 1:00:00 sheet1 0:00:00 0:00:00 10:13:55 @@ -202,7 +202,7 @@ mod tests { ListCommand::handle(args, &mut db, &mut out, &mut err, &config, now.with_timezone(&Utc)).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString(" Timesheet Running Today Total Time + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps(" Timesheet Running Today Total Time * default 0:10:24 0:10:26 0:10:26 ")); diff --git a/src/commands/now.rs b/src/commands/now.rs index 5cb07df..d904d10 100644 --- a/src/commands/now.rs +++ b/src/commands/now.rs @@ -90,7 +90,7 @@ mod tests { use ansi_term::Color::Yellow; use crate::database::{SqliteDatabase, Database}; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use super::*; @@ -116,7 +116,7 @@ mod tests { NowCommand::handle(Default::default(), &mut db, &mut out, &mut err, &config, now).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString(" Timesheet Running Activity + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps(" Timesheet Running Activity - sheet4 1:52:45 some ")); @@ -133,7 +133,7 @@ mod tests { NowCommand::handle(Default::default(), &mut db, &mut out, &mut err, &config, now.with_timezone(&Utc)).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString(" Timesheet Running Activity + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps(" Timesheet Running Activity * default 0:10:24 que ")); diff --git a/src/commands/out.rs b/src/commands/out.rs index d00d677..c9f2a26 100644 --- a/src/commands/out.rs +++ b/src/commands/out.rs @@ -58,7 +58,7 @@ mod tests { use pretty_assertions::assert_eq; use chrono::{TimeZone, Local}; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use crate::database::SqliteDatabase; use super::*; @@ -81,8 +81,8 @@ mod tests { assert_eq!(e.end, Some(now)); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Checked out of sheet \"default\".\n")); - assert_eq!(PrettyString(&String::from_utf8_lossy(&err)), PrettyString("")); + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Checked out of sheet \"default\".\n")); + assert_eq!(Ps(&String::from_utf8_lossy(&err)), Ps("")); } #[test] @@ -99,8 +99,8 @@ mod tests { OutCommand::handle(args, &mut db, &mut out, &mut err, &Default::default(), now).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("No running entry on sheet \"default\".\n")); - assert_eq!(PrettyString(&String::from_utf8_lossy(&err)), PrettyString("")); + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("No running entry on sheet \"default\".\n")); + assert_eq!(Ps(&String::from_utf8_lossy(&err)), Ps("")); } #[test] @@ -121,8 +121,8 @@ mod tests { assert_eq!(e.end, Some(Utc.from_utc_datetime(&now.with_timezone(&Local).naive_local()))); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Checked out of sheet \"default\".\n")); - assert_eq!(PrettyString(&String::from_utf8_lossy(&err)), PrettyString(&format!( + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Checked out of sheet \"default\".\n")); + assert_eq!(Ps(&String::from_utf8_lossy(&err)), Ps(&format!( "{} You are using the old timetrap format, it is advised that \ you update your database using t migrate\n", Yellow.bold().paint("[WARNING]")))); diff --git a/src/commands/resume.rs b/src/commands/resume.rs index 4685651..16b50e7 100644 --- a/src/commands/resume.rs +++ b/src/commands/resume.rs @@ -96,7 +96,7 @@ mod tests { use chrono::Duration; use pretty_assertions::assert_eq; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use crate::database::SqliteDatabase; use super::*; @@ -129,9 +129,9 @@ mod tests { assert_eq!(all_entries[1].note, Some("fake note".into())); assert_eq!(all_entries[1].sheet, "default"); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Resuming \"fake note\" from entry #1 + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Resuming \"fake note\" from entry #1 Checked into sheet \"default\".\n")); - assert_eq!(PrettyString(&String::from_utf8_lossy(&err)), PrettyString("")); + assert_eq!(Ps(&String::from_utf8_lossy(&err)), Ps("")); } #[test] @@ -146,7 +146,7 @@ Checked into sheet \"default\".\n")); ResumeCommand::handle(args, &mut db, &mut out, &mut err, &Default::default(), now).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("\ + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("\ No entry to resume in the sheet 'default'. Perhaps start a new one? Hint: use t in ")); diff --git a/src/commands/sheet.rs b/src/commands/sheet.rs index 55ca646..2d47b95 100644 --- a/src/commands/sheet.rs +++ b/src/commands/sheet.rs @@ -75,7 +75,7 @@ mod tests { use pretty_assertions::assert_eq; use crate::database::SqliteDatabase; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use super::*; @@ -94,8 +94,8 @@ mod tests { SheetCommand::handle(args, &mut db, &mut out, &mut err, &Default::default(), now).unwrap(); assert_eq!(db.current_sheet().unwrap().unwrap(), "new_sheet"); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Switching to sheet 'new_sheet'\n")); - assert_eq!(PrettyString(&String::from_utf8_lossy(&err)), PrettyString("")); + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Switching to sheet 'new_sheet'\n")); + assert_eq!(Ps(&String::from_utf8_lossy(&err)), Ps("")); } #[test] @@ -114,8 +114,8 @@ mod tests { SheetCommand::handle(args, &mut db, &mut out, &mut err, &Default::default(), now).unwrap(); assert_eq!(db.current_sheet().unwrap().unwrap(), "foo"); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Already on sheet 'foo'\n")); - assert_eq!(PrettyString(&String::from_utf8_lossy(&err)), PrettyString("")); + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Already on sheet 'foo'\n")); + assert_eq!(Ps(&String::from_utf8_lossy(&err)), Ps("")); } #[test] @@ -136,7 +136,7 @@ mod tests { assert_eq!(db.current_sheet().unwrap().unwrap(), "var"); assert_eq!(db.last_sheet().unwrap().unwrap(), "foo"); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Switching to sheet 'var'\n")); - assert_eq!(PrettyString(&String::from_utf8_lossy(&err)), PrettyString("")); + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("Switching to sheet 'var'\n")); + assert_eq!(Ps(&String::from_utf8_lossy(&err)), Ps("")); } } diff --git a/src/commands/yesterday.rs b/src/commands/yesterday.rs index 857dc19..c6ea15b 100644 --- a/src/commands/yesterday.rs +++ b/src/commands/yesterday.rs @@ -59,7 +59,7 @@ mod tests { use pretty_assertions::assert_eq; use crate::database::SqliteDatabase; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use super::*; @@ -86,7 +86,7 @@ mod tests { YesterdayCommand::handle(args, &mut db, &mut out, &mut err, &config, Utc::now()).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString(&format!("start,end,note,sheet + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps(&format!("start,end,note,sheet {},,This!,default ", yesterday.and_hms(1, 2, 3).with_timezone(&Utc).to_rfc3339_opts(chrono::SecondsFormat::Secs, true)))); diff --git a/src/formatters/csv.rs b/src/formatters/csv.rs index 87a3dfb..c3bab0d 100644 --- a/src/formatters/csv.rs +++ b/src/formatters/csv.rs @@ -41,7 +41,7 @@ pub fn print_formatted(entries: Vec, out: &mut W, ids: bool) -> mod tests { use chrono::{TimeZone, Utc}; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use super::*; @@ -55,7 +55,7 @@ mod tests { print_formatted(entries, &mut out, false).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("start,end,note,sheet + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("start,end,note,sheet 2021-06-30T18:12:34Z,2021-06-30T19:00:00Z,entry 1,default 2021-06-30T18:12:34Z,,entry 2,default ")); @@ -71,7 +71,7 @@ mod tests { print_formatted(entries, &mut out, true).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("id,start,end,note,sheet + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps("id,start,end,note,sheet 1,2021-06-30T18:12:34Z,2021-06-30T19:00:00Z,entry 1,default 2,2021-06-30T18:12:34Z,,entry 2,default ")); diff --git a/src/formatters/ical.rs b/src/formatters/ical.rs index 92172c5..aa46341 100644 --- a/src/formatters/ical.rs +++ b/src/formatters/ical.rs @@ -42,7 +42,7 @@ mod tests { use pretty_assertions::assert_eq; use chrono::{Utc, Duration}; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use super::*; @@ -63,7 +63,7 @@ mod tests { let host = hostname::get().unwrap(); let host = host.to_string_lossy(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString(&format!("BEGIN:VCALENDAR + assert_eq!(Ps(&String::from_utf8_lossy(&out)), Ps(&format!("BEGIN:VCALENDAR CALSCALE:GREGORIAN METHOD:PUBLISH PRODID:tiempo-rs diff --git a/src/formatters/text.rs b/src/formatters/text.rs index addf160..7ac3e83 100644 --- a/src/formatters/text.rs +++ b/src/formatters/text.rs @@ -133,7 +133,7 @@ mod tests { use pretty_assertions::assert_eq; use chrono::TimeZone; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use super::*; @@ -154,7 +154,7 @@ mod tests { print_formatted(entries, &mut output, now, false).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&output)), PrettyString("Timesheet: default + assert_eq!(Ps(&String::from_utf8_lossy(&output)), Ps("Timesheet: default Day Start End Duration Notes Fri Oct 03, 2008 12:00:00 - 14:00:00 2:00:00 entry 1 16:00:00 - 18:00:00 2:00:00 entry 2 @@ -179,7 +179,7 @@ mod tests { print_formatted(entries, &mut output, now, false).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&output)), PrettyString("Timesheet: default + assert_eq!(Ps(&String::from_utf8_lossy(&output)), Ps("Timesheet: default Day Start End Duration Notes Fri Oct 03, 2008 12:00:00 - 14:00:00 1:59:59 entry 1 1:59:59 @@ -201,7 +201,7 @@ mod tests { print_formatted(entries, &mut output, now, false).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&output)), PrettyString("Timesheet: default + assert_eq!(Ps(&String::from_utf8_lossy(&output)), Ps("Timesheet: default Day Start End Duration Notes Wed Oct 01, 2008 12:00:00 - 14:00:00+2d 50:00:00 entry 1 50:00:00 @@ -227,7 +227,7 @@ mod tests { print_formatted(entries, &mut output, now, true).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&output)), PrettyString("Timesheet: default + assert_eq!(Ps(&String::from_utf8_lossy(&output)), Ps("Timesheet: default ID Day Start End Duration Notes 1 Fri Oct 03, 2008 12:00:00 - 14:00:00 2:00:00 entry 1 2 16:00:00 - 18:00:00 2:00:00 entry 2 @@ -258,7 +258,7 @@ mod tests { print_formatted(entries, &mut output, now, true).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&output)), PrettyString("Timesheet: default + assert_eq!(Ps(&String::from_utf8_lossy(&output)), Ps("Timesheet: default ID Day Start End Duration Notes 60000 Sun Oct 05, 2008 16:00:00 - 18:00:00 2:00:00 chatting with bob about upcoming task, district sharing of images, how the user @@ -292,7 +292,7 @@ mod tests { print_formatted(entries, &mut output, now, false).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&output)), PrettyString("Timesheet: default + assert_eq!(Ps(&String::from_utf8_lossy(&output)), Ps("Timesheet: default Day Start End Duration Notes Sun Oct 05, 2008 16:00:00 - 18:00:00 2:00:00 first line and a second line @@ -320,7 +320,7 @@ mod tests { print_formatted(entries, &mut output, now, false).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&output)), PrettyString("Timesheet: default + assert_eq!(Ps(&String::from_utf8_lossy(&output)), Ps("Timesheet: default Day Start End Duration Notes Sun Oct 05, 2008 16:00:00 - 18:00:00 2:00:00 quiúbole 2:00:00 @@ -355,7 +355,7 @@ mod tests { print_formatted(entries, &mut output, now, false).unwrap(); - assert_eq!(PrettyString(&String::from_utf8_lossy(&output)), PrettyString("Timesheet: sheet1 + assert_eq!(Ps(&String::from_utf8_lossy(&output)), Ps("Timesheet: sheet1 Day Start End Duration Notes Sun Oct 05, 2008 16:00:00 - 18:00:00 2:00:00 quiúbole 2:00:00 diff --git a/src/tabulate.rs b/src/tabulate.rs index d7081b8..b22998c 100644 --- a/src/tabulate.rs +++ b/src/tabulate.rs @@ -161,7 +161,7 @@ impl Tabulate { mod tests { use pretty_assertions::assert_eq; - use crate::test_utils::PrettyString; + use crate::test_utils::Ps; use super::*; @@ -207,7 +207,7 @@ mod tests { tabs.separator('-'); tabs.feed(vec!["Total".into(), "".into(), "8:00:00".into(), "".into()]); - assert_eq!(PrettyString(&tabs.print()), PrettyString("\ + assert_eq!(Ps(&tabs.print()), Ps("\ Day Start End Duration Notes Fri Oct 03, 2008 12:00:00 - 14:00:00 2:00:00 entry 1 16:00:00 - 18:00:00 2:00:00 entry 2 @@ -237,7 +237,7 @@ Total 8:00:00 tabs.separator('-'); tabs.feed(vec!["Total".into(), "".into(), "52:00:00".into(), "".into()]); - assert_eq!(PrettyString(&tabs.print()), PrettyString("\ + assert_eq!(Ps(&tabs.print()), Ps("\ Day Start End Duration Notes Wed Oct 01, 2008 12:00:00 - 14:00:00+2d 50:00:00 entry 1 50:00:00 @@ -268,7 +268,7 @@ Total 52:00:00 tabs.separator('-'); tabs.feed(vec!["".into(), "Total".into(), "".into(), "8:00:00".into()]); - assert_eq!(PrettyString(&tabs.print()), PrettyString(" ID Day Start End Duration Notes + assert_eq!(Ps(&tabs.print()), Ps(" ID Day Start End Duration Notes 1 Fri Oct 03, 2008 12:00:00 - 14:00:00 2:00:00 entry 1 2 16:00:00 - 18:00:00 2:00:00 entry 2 4:00:00 @@ -296,7 +296,7 @@ Total 52:00:00 tabs.separator('-'); tabs.feed(vec!["".into(), "Total".into(), "".into(), "2:00:00".into()]); - assert_eq!(PrettyString(&tabs.print()), PrettyString(" ID Day Start End Duration Notes + assert_eq!(Ps(&tabs.print()), Ps(" ID Day Start End Duration Notes 60000 Sun Oct 05, 2008 16:00:00 - 18:00:00 2:00:00 chatting with bob about upcoming task, district sharing of images, how the user settings currently works etc. Discussing the @@ -326,7 +326,7 @@ Total 52:00:00 tabs.separator('-'); tabs.feed(vec!["Total".into(), "".into(), "2:00:00".into(), "".into()]); - assert_eq!(PrettyString(&tabs.print()), PrettyString("\ + assert_eq!(Ps(&tabs.print()), Ps("\ Day Start End Duration Notes Sun Oct 05, 2008 16:00:00 - 18:00:00 2:00:00 first line and a second line @@ -351,7 +351,7 @@ Total 2:00:00 tabs.separator('-'); tabs.feed(vec!["Total".into(), "".into(), "2:00:00".into(), "".into()]); - assert_eq!(PrettyString(&tabs.print()), PrettyString("\ + assert_eq!(Ps(&tabs.print()), Ps("\ Day Start End Duration Notes Sun Oct 05, 2008 16:00:00 - 18:00:00 2:00:00 quiúbole 2:00:00 @@ -372,7 +372,7 @@ Total 2:00:00 tabs.separator('-'); tabs.feed(vec!["ta güeno".into()]); - assert_eq!(PrettyString(&tabs.print()), PrettyString("\ + assert_eq!(Ps(&tabs.print()), Ps("\ Hola adiós diff --git a/src/test_utils.rs b/src/test_utils.rs index ac6c577..9032471 100644 --- a/src/test_utils.rs +++ b/src/test_utils.rs @@ -1,10 +1,10 @@ use std::fmt; #[derive(PartialEq, Eq)] -pub struct PrettyString<'a>(pub &'a str); +pub struct Ps<'a>(pub &'a str); /// Make diff to display string as multi-line string -impl<'a> fmt::Debug for PrettyString<'a> { +impl<'a> fmt::Debug for Ps<'a> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.write_str(self.0) }