From 104b9b0864ecab9b5c88c1d01403f2352b660949 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Mon, 3 Apr 2017 16:44:04 -0400 Subject: [PATCH] Move around the tests for types --- src/types/bool.rs | 14 ++++++++++++-- src/types/char.rs | 9 ++++++++- src/types/mod.rs | 13 ------------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/types/bool.rs b/src/types/bool.rs index 4bc639d..2ded74f 100644 --- a/src/types/bool.rs +++ b/src/types/bool.rs @@ -35,10 +35,20 @@ impl IsChar for Bool { #[cfg(test)] mod tests { use super::Bool; - use types::value::{IsBool, IsChar}; + use types::value::{IsBool, IsChar, Value}; #[test] - fn chars_are_bools() { + fn equal_bools_are_equal() { + assert_eq!(Bool(true), Bool(true)); + assert_eq!(Bool(false), Bool(false)); + assert_ne!(Bool(true), Bool(false)); + + assert_eq!(Bool(true).as_value(), Bool(true).as_value()); + assert_ne!(Bool(true).as_value(), Bool(false).as_value()); + } + + #[test] + fn bools_are_bools() { assert_eq!(Bool(false).is_bool(), true); } diff --git a/src/types/char.rs b/src/types/char.rs index f790e98..f40653f 100644 --- a/src/types/char.rs +++ b/src/types/char.rs @@ -35,7 +35,14 @@ impl IsChar for Char { #[cfg(test)] mod tests { use super::Char; - use types::value::{IsBool, IsChar}; + use types::value::{IsBool, IsChar, Value}; + + #[test] + fn equal_chars_are_equal() { + assert_eq!(Char('a'), Char('a')); + assert_eq!(Char('a').as_value(), Char('a').as_value()); + assert_ne!(Char('a').as_value(), Char('b').as_value()); + } #[test] fn chars_are_chars() { diff --git a/src/types/mod.rs b/src/types/mod.rs index 1827819..b3ccfe3 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -16,19 +16,6 @@ pub use self::value::Value; mod tests { use super::*; - #[test] - fn booleans_are_equal() { - assert_eq!(Bool::new(true), Bool::new(true)); - assert_eq!(Bool::new(false), Bool::new(false)); - assert_ne!(Bool::new(true), Bool::new(false)); - } - - #[test] - fn equal_chars_are_equal() { - assert_eq!(Char::new('a'), Char::new('a')); - assert_eq!(Char::new('a').as_value(), Char::new('a').as_value()); - } - #[test] fn booleans_and_chars_are_not_equal() { assert_ne!(Bool::new(true).as_value(), Char::new('a').as_value());