Mirrors/lsd
2
0
Fork 0
mirror of https://github.com/lsd-rs/lsd synced 2024-12-14 06:02:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the size tests

Browse source
This commit is contained in:
Pierre Peltier 2019-10-23 17:34:57 +02:00 committed by Abin Simon
parent 8b8c776eaa
commit 2ee9f8b46a
2 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/display.rs
View file

@ -387,7 +387,7 @@ fn detect_size_lengths(metas: &[Meta], flags: &Flags) -> (usize, usize) {
let mut max_unit_size: usize = 0;
for meta in metas {
let value_len = meta.size.size_string(flags).len();
let value_len = meta.size.value_string(flags).len();
let unit_len = meta.size.unit_string(&flags).len();
if value_len > max_value_length {

51
src/meta/size.rs
View file

@ -94,12 +94,12 @@ impl Size {
}
pub fn render_value(&self, colors: &Colors, flags: &Flags) -> ColoredString {
let content = self.size_string(flags);
let content = self.value_string(flags);
self.paint(colors, flags, content)
}
pub fn size_string(&self, flags: &Flags) -> String {
pub fn value_string(&self, flags: &Flags) -> String {
let unit = self.get_unit(flags);
match unit {
@ -159,82 +159,75 @@ mod test {
fn render_byte() {
let size = Size::new(42); // == 42 bytes
let mut flags = Flags::default();
let unit = size.get_unit(&flags);
assert_eq!(size.render_value(&unit).as_str(), "42");
assert_eq!(size.value_string(&flags).as_str(), "42");
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "B");
assert_eq!(size.unit_string(&flags).as_str(), "B");
flags.size = SizeFlag::Short;
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "B");
assert_eq!(size.unit_string(&flags).as_str(), "B");
flags.size = SizeFlag::Bytes;
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "");
assert_eq!(size.unit_string(&flags).as_str(), "");
}
#[test]
fn render_kilobyte() {
let size = Size::new(42 * 1024); // 42 kilobytes
let mut flags = Flags::default();
let unit = size.get_unit(&flags);
assert_eq!(size.render_value(&unit).as_str(), "42");
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "KB");
assert_eq!(size.value_string(&flags).as_str(), "42");
assert_eq!(size.unit_string(&flags).as_str(), "KB");
flags.size = SizeFlag::Short;
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "K");
assert_eq!(size.unit_string(&flags).as_str(), "K");
}
#[test]
fn render_megabyte() {
let size = Size::new(42 * 1024 * 1024); // 42 megabytes
let mut flags = Flags::default();
let unit = size.get_unit(&flags);
assert_eq!(size.render_value(&unit).as_str(), "42");
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "MB");
assert_eq!(size.value_string(&flags).as_str(), "42");
assert_eq!(size.unit_string(&flags).as_str(), "MB");
flags.size = SizeFlag::Short;
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "M");
assert_eq!(size.unit_string(&flags).as_str(), "M");
}
#[test]
fn render_gigabyte() {
let size = Size::new(42 * 1024 * 1024 * 1024); // 42 gigabytes
let mut flags = Flags::default();
let unit = size.get_unit(&flags);
assert_eq!(size.render_value(&unit).as_str(), "42");
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "GB");
assert_eq!(size.value_string(&flags).as_str(), "42");
assert_eq!(size.unit_string(&flags).as_str(), "GB");
flags.size = SizeFlag::Short;
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "G");
assert_eq!(size.unit_string(&flags).as_str(), "G");
}
#[test]
fn render_terabyte() {
let size = Size::new(42 * 1024 * 1024 * 1024 * 1024); // 42 terabytes
let mut flags = Flags::default();
let unit = size.get_unit(&flags);
assert_eq!(size.render_value(&unit).as_str(), "42");
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "TB");
assert_eq!(size.value_string(&flags).as_str(), "42");
assert_eq!(size.unit_string(&flags).as_str(), "TB");
flags.size = SizeFlag::Short;
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "T");
assert_eq!(size.unit_string(&flags).as_str(), "T");
}
#[test]
fn render_with_a_fraction() {
let size = Size::new(42 * 1024 + 103); // 42.1 kilobytes
let flags = Flags::default();
let unit = size.get_unit(&flags);
assert_eq!(size.render_value(&unit).as_str(), "42.1");
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "KB");
assert_eq!(size.value_string(&flags).as_str(), "42.1");
assert_eq!(size.unit_string(&flags).as_str(), "KB");
}
#[test]
fn render_with_a_truncated_fraction() {
let size = Size::new(42 * 1024 + 1); // 42.001 kilobytes == 42 kilobytes
let flags = Flags::default();
let unit = size.get_unit(&flags);
assert_eq!(size.render_value(&unit).as_str(), "42");
assert_eq!(Size::render_unit(&unit, &flags).as_str(), "KB");
assert_eq!(size.value_string(&flags).as_str(), "42");
assert_eq!(size.unit_string(&flags).as_str(), "KB");
}
}