list.rs: refactor tests for readability

Signed-off-by: Mroik <mroik@delayed.space>

1 files changed, 21 insertions, 27 deletions

diff --git a/src/list.rs b/src/list.rs
index 1a20093..4222cbf 100644
--- a/src/list.rs
+++ b/src/list.rs
@@ -383,8 +383,8 @@ mod tests {
     use anyhow::Result;
 
     use crate::{
-        database::{DB_NAME, Database},
-        list::{List, SubscriptionQuery, User},
+        database::{DB_NAME, Database, QueryResult},
+        list::{List, SubscriptionQuery, SubscriptionResult, User},
     };
 
     fn setup() -> Result<Database> {
@@ -410,12 +410,11 @@ mod tests {
             .execute(user.query_by_email())
             .expect("Failed query");
         match user2 {
-            crate::database::QueryResult::Empty => assert!(false),
-            crate::database::QueryResult::Vec(items) => {
+            QueryResult::Vec(items) => {
                 assert_eq!(items.len(), 1);
                 assert_eq!(items[0], user);
             }
-            crate::database::QueryResult::Single(_) => assert!(false),
+            _ => assert!(false),
         }
 
         drop(database);
@@ -435,12 +434,11 @@ mod tests {
             .execute(user.query_by_email())
             .expect("Failed query");
         match &user2 {
-            crate::database::QueryResult::Empty => assert!(false),
-            crate::database::QueryResult::Vec(items) => {
+            QueryResult::Vec(items) => {
                 assert_eq!(items.len(), 1);
                 assert_eq!(items[0], user);
             }
-            crate::database::QueryResult::Single(_) => assert!(false),
+            _ => assert!(false),
         }
 
         drop(database);
@@ -478,9 +476,8 @@ mod tests {
             .execute(User::query_all())
             .expect("Failed query all");
         match ris {
-            crate::database::QueryResult::Empty => assert!(false),
-            crate::database::QueryResult::Vec(items) => assert!(items.is_empty()),
-            crate::database::QueryResult::Single(_) => assert!(false),
+            QueryResult::Vec(items) => assert!(items.is_empty()),
+            _ => assert!(false),
         }
 
         drop(database);
@@ -498,12 +495,11 @@ mod tests {
         database.execute(list.insert()).expect("failed insert");
         let ris = database.execute(List::query_all()).expect("failed query");
         match ris {
-            crate::database::QueryResult::Empty => assert!(false),
-            crate::database::QueryResult::Vec(items) => {
+            QueryResult::Vec(items) => {
                 assert_eq!(items.len(), 1);
                 assert_eq!(items[0], list);
             }
-            crate::database::QueryResult::Single(_) => assert!(false),
+            _ => assert!(false),
         }
 
         cleanup().expect("failed cleanup");
@@ -520,12 +516,11 @@ mod tests {
         database.execute(list.insert()).expect("failed insert");
         let ris = database.execute(List::query_all()).expect("failed query");
         match ris {
-            crate::database::QueryResult::Empty => assert!(false),
-            crate::database::QueryResult::Vec(items) => {
+            QueryResult::Vec(items) => {
                 assert_eq!(items.len(), 1);
                 assert_eq!(items[0], list);
             }
-            crate::database::QueryResult::Single(_) => assert!(false),
+            _ => assert!(false),
         }
 
         drop(database);
@@ -562,9 +557,8 @@ mod tests {
             .execute(List::query_all())
             .expect("Failed query all");
         match ris {
-            crate::database::QueryResult::Empty => assert!(false),
-            crate::database::QueryResult::Vec(items) => assert!(items.is_empty()),
-            crate::database::QueryResult::Single(_) => assert!(false),
+            QueryResult::Vec(items) => assert!(items.is_empty()),
+            _ => assert!(false),
         }
 
         drop(database);
@@ -607,7 +601,7 @@ mod tests {
             .execute(SubscriptionQuery::Count)
             .expect("failed query");
         match ris {
-            crate::database::QueryResult::Single(crate::list::SubscriptionResult::Count(c)) => {
+            QueryResult::Single(SubscriptionResult::Count(c)) => {
                 assert_eq!(c, 1)
             }
             _ => assert!(false),
@@ -662,7 +656,7 @@ mod tests {
             .execute(SubscriptionQuery::Count)
             .expect("failed query");
         match ris {
-            crate::database::QueryResult::Single(crate::list::SubscriptionResult::Count(c)) => {
+            QueryResult::Single(SubscriptionResult::Count(c)) => {
                 assert_eq!(c, 4)
             }
             _ => assert!(false),
@@ -676,7 +670,7 @@ mod tests {
             .execute(SubscriptionQuery::Count)
             .expect("failed query");
         match ris {
-            crate::database::QueryResult::Single(crate::list::SubscriptionResult::Count(c)) => {
+            QueryResult::Single(SubscriptionResult::Count(c)) => {
                 assert_eq!(c, 3)
             }
             _ => assert!(false),
@@ -731,7 +725,7 @@ mod tests {
             .execute(SubscriptionQuery::Count)
             .expect("failed query");
         match ris {
-            crate::database::QueryResult::Single(crate::list::SubscriptionResult::Count(c)) => {
+            QueryResult::Single(SubscriptionResult::Count(c)) => {
                 assert_eq!(c, 4)
             }
             _ => assert!(false),
@@ -741,7 +735,7 @@ mod tests {
             .execute(user.subscribed_to())
             .expect("failed query");
         match ris {
-            crate::database::QueryResult::Vec(items) => assert_eq!(items.len(), 2),
+            QueryResult::Vec(items) => assert_eq!(items.len(), 2),
             _ => assert!(false),
         }
 
@@ -794,7 +788,7 @@ mod tests {
             .execute(SubscriptionQuery::Count)
             .expect("failed query");
         match ris {
-            crate::database::QueryResult::Single(crate::list::SubscriptionResult::Count(c)) => {
+            QueryResult::Single(SubscriptionResult::Count(c)) => {
                 assert_eq!(c, 4)
             }
             _ => assert!(false),
@@ -802,7 +796,7 @@ mod tests {
 
         ris = database.execute(list.subscribers()).expect("failed query");
         match ris {
-            crate::database::QueryResult::Vec(items) => assert_eq!(items.len(), 2),
+            QueryResult::Vec(items) => assert_eq!(items.len(), 2),
             _ => assert!(false),
         }