From 4c3bc32fd80cd90082e9f1682a5b24ecce1e495c Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Mon, 23 Aug 2021 01:11:36 +0800 Subject: [PATCH] Refactor test case --- src/entity/column.rs | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/entity/column.rs b/src/entity/column.rs index 85100421..8ffb7275 100644 --- a/src/entity/column.rs +++ b/src/entity/column.rs @@ -353,22 +353,25 @@ mod tests { fn test_col_from_str() { use std::str::FromStr; - match fruit::Column::from_str("id") { - Ok(col) => assert!(matches!(col, fruit::Column::Id)), - Err(_) => panic!("fruit from_str fails"), - } - match fruit::Column::from_str("name") { - Ok(col) => assert!(matches!(col, fruit::Column::Name)), - Err(_) => panic!("fruit from_str fails"), - } - match fruit::Column::from_str("cake_id") { - Ok(col) => assert!(matches!(col, fruit::Column::CakeId)), - Err(_) => panic!("fruit from_str fails"), - } - match fruit::Column::from_str("cakeId") { - Ok(col) => assert!(matches!(col, fruit::Column::CakeId)), - Err(_) => panic!("fruit from_str fails"), - } - assert!(matches!(fruit::Column::from_str("does_not_exist"), Err(_))); + assert!(matches!( + fruit::Column::from_str("id"), + Ok(fruit::Column::Id) + )); + assert!(matches!( + fruit::Column::from_str("name"), + Ok(fruit::Column::Name) + )); + assert!(matches!( + fruit::Column::from_str("cake_id"), + Ok(fruit::Column::CakeId) + )); + assert!(matches!( + fruit::Column::from_str("cakeId"), + Ok(fruit::Column::CakeId) + )); + assert!(matches!( + fruit::Column::from_str("does_not_exist"), + Err(crate::ColumnFromStrErr(_)) + )); } }