Apply pretty_assertions::assert_eq! to core/ ast_builder unit tests (g…

…luesql#1369)
ChobobDev · Aug 6, 2023 · d316ceb · d316ceb
1 parent 89d2440
commit d316ceb
Show file tree

Hide file tree

Showing 18 changed files with 128 additions and 60 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -39,3 +39,6 @@ features = ["v4", "js"]
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.uuid]
 version = "1"
 features = ["v4"]
+
+[dev-dependencies]
+pretty_assertions = "1"
diff --git a/core/src/ast_builder/assignment.rs b/core/src/ast_builder/assignment.rs
@@ -41,8 +41,12 @@ impl<'a> TryFrom<AssignmentNode<'a>> for Assignment {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast_builder::AssignmentNode, parse_sql::parse_assignment, translate::translate_assignment,
+    use {
+        crate::{
+            ast_builder::AssignmentNode, parse_sql::parse_assignment,
+            translate::translate_assignment,
+        },
+        pretty_assertions::assert_eq,
     };
 
     fn test(actual: AssignmentNode, expected: &str) {

diff --git a/core/src/ast_builder/expr_list.rs b/core/src/ast_builder/expr_list.rs
@@ -80,6 +80,7 @@ mod tests {
             ast::Expr, ast_builder::col, parse_sql::parse_comma_separated_exprs, result::Result,
             translate::translate_expr,
         },
+        pretty_assertions::assert_eq,
     };
 
     fn test(actual: ExprList, expected: &str) {

diff --git a/core/src/ast_builder/mod.rs b/core/src/ast_builder/mod.rs
@@ -91,7 +91,7 @@ fn test(actual: crate::result::Result<crate::ast::Statement>, expected: &str) {
 
     let parsed = &parse(expected).expect(expected)[0];
     let expected = translate(parsed);
-    assert_eq!(actual, expected);
+    pretty_assertions::assert_eq!(actual, expected);
 }
 
 #[cfg(test)]
@@ -100,7 +100,7 @@ fn test_expr(actual: crate::ast_builder::ExprNode, expected: &str) {
 
     let parsed = &parse_expr(expected).expect(expected);
     let expected = translate_expr(parsed);
-    assert_eq!(actual.try_into(), expected);
+    pretty_assertions::assert_eq!(actual.try_into(), expected);
 }
 
 #[cfg(test)]
@@ -109,5 +109,5 @@ fn test_query(actual: crate::ast_builder::QueryNode, expected: &str) {
 
     let parsed = &parse_query(expected).expect(expected);
     let expected = translate_query(parsed);
-    assert_eq!(actual.try_into(), expected);
+    pretty_assertions::assert_eq!(actual.try_into(), expected);
 }
diff --git a/core/src/ast_builder/order_by_expr.rs b/core/src/ast_builder/order_by_expr.rs
@@ -46,9 +46,12 @@ impl<'a> TryFrom<OrderByExprNode<'a>> for OrderByExpr {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast_builder::OrderByExprNode, parse_sql::parse_order_by_expr,
-        translate::translate_order_by_expr,
+    use {
+        crate::{
+            ast_builder::OrderByExprNode, parse_sql::parse_order_by_expr,
+            translate::translate_order_by_expr,
+        },
+        pretty_assertions::assert_eq,
     };
 
     fn test(actual: OrderByExprNode, expected: &str) {

diff --git a/core/src/ast_builder/query.rs b/core/src/ast_builder/query.rs
@@ -132,6 +132,7 @@ mod test {
                 test_query, SelectItemList,
             },
         },
+        pretty_assertions::assert_eq,
     };
 
     #[test]

diff --git a/core/src/ast_builder/select/filter.rs b/core/src/ast_builder/select/filter.rs
@@ -109,12 +109,15 @@ impl<'a> Prebuild<Select> for FilterNode<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::{
-            BinaryOperator, Expr, Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select,
-            SetExpr, Statement, TableFactor, TableWithJoins,
+    use {
+        crate::{
+            ast::{
+                BinaryOperator, Expr, Join, JoinConstraint, JoinExecutor, JoinOperator, Query,
+                Select, SetExpr, Statement, TableFactor, TableWithJoins,
+            },
+            ast_builder::{col, expr, table, test, Build, SelectItemList},
         },
-        ast_builder::{col, expr, table, test, Build, SelectItemList},
+        pretty_assertions::assert_eq,
     };
 
     #[test]

diff --git a/core/src/ast_builder/select/group_by.rs b/core/src/ast_builder/select/group_by.rs
@@ -112,12 +112,15 @@ impl<'a> Prebuild<Select> for GroupByNode<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::{
-            Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr, Statement,
-            TableFactor, TableWithJoins,
+    use {
+        crate::{
+            ast::{
+                Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr,
+                Statement, TableFactor, TableWithJoins,
+            },
+            ast_builder::{col, table, test, Build, SelectItemList},
         },
-        ast_builder::{col, table, test, Build, SelectItemList},
+        pretty_assertions::assert_eq,
     };
 
     #[test]

diff --git a/core/src/ast_builder/select/join/hash_join.rs b/core/src/ast_builder/select/join/hash_join.rs
@@ -143,12 +143,15 @@ fn build_join_executor(
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::{
-            Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr, Statement,
-            TableAlias, TableFactor, TableWithJoins,
+    use {
+        crate::{
+            ast::{
+                Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr,
+                Statement, TableAlias, TableFactor, TableWithJoins,
+            },
+            ast_builder::{col, expr, table, Build, SelectItemList},
         },
-        ast_builder::{col, expr, table, Build, SelectItemList},
+        pretty_assertions::assert_eq,
     };
 
     #[test]

diff --git a/core/src/ast_builder/select/join/join_constraint.rs b/core/src/ast_builder/select/join/join_constraint.rs
@@ -135,12 +135,15 @@ impl<'a> Prebuild<Select> for JoinConstraintNode<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::{
-            Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr, Statement,
-            TableFactor, TableWithJoins,
+    use {
+        crate::{
+            ast::{
+                Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr,
+                Statement, TableFactor, TableWithJoins,
+            },
+            ast_builder::{col, table, test, Build, SelectItemList},
         },
-        ast_builder::{col, table, test, Build, SelectItemList},
+        pretty_assertions::assert_eq,
     };
 
     #[test]

diff --git a/core/src/ast_builder/select/join/root.rs b/core/src/ast_builder/select/join/root.rs
@@ -188,7 +188,10 @@ impl<'a> Prebuild<Select> for JoinNode<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::ast_builder::{table, test, Build};
+    use {
+        crate::ast_builder::{table, test, Build},
+        pretty_assertions::assert_eq,
+    };
 
     #[test]
     fn inner_join() {

diff --git a/core/src/ast_builder/select/limit.rs b/core/src/ast_builder/select/limit.rs
@@ -131,12 +131,15 @@ impl<'a> Prebuild<Query> for LimitNode<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::{
-            Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr, Statement,
-            TableFactor, TableWithJoins,
+    use {
+        crate::{
+            ast::{
+                Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr,
+                Statement, TableFactor, TableWithJoins,
+            },
+            ast_builder::{col, num, table, test, Build, SelectItemList},
         },
-        ast_builder::{col, num, table, test, Build, SelectItemList},
+        pretty_assertions::assert_eq,
     };
 
     #[test]

diff --git a/core/src/ast_builder/select/offset.rs b/core/src/ast_builder/select/offset.rs
@@ -136,12 +136,15 @@ impl<'a> Prebuild<Query> for OffsetNode<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::{
-            Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr, Statement,
-            TableFactor, TableWithJoins,
+    use {
+        crate::{
+            ast::{
+                Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr,
+                Statement, TableFactor, TableWithJoins,
+            },
+            ast_builder::{col, num, table, test, Build, SelectItemList},
         },
-        ast_builder::{col, num, table, test, Build, SelectItemList},
+        pretty_assertions::assert_eq,
     };
 
     #[test]

diff --git a/core/src/ast_builder/select/order_by.rs b/core/src/ast_builder/select/order_by.rs
@@ -135,12 +135,15 @@ impl<'a> Prebuild<Query> for OrderByNode<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::{
-            Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr, Statement,
-            TableFactor, TableWithJoins,
+    use {
+        crate::{
+            ast::{
+                Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr,
+                Statement, TableFactor, TableWithJoins,
+            },
+            ast_builder::{col, table, test, Build, ExprNode, OrderByExprList, SelectItemList},
         },
-        ast_builder::{col, table, test, Build, ExprNode, OrderByExprList, SelectItemList},
+        pretty_assertions::assert_eq,
     };
 
     #[test]

diff --git a/core/src/ast_builder/select/project.rs b/core/src/ast_builder/select/project.rs
@@ -136,12 +136,15 @@ impl<'a> Prebuild<Select> for ProjectNode<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::{
-            Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr, Statement,
-            TableFactor, TableWithJoins,
+    use {
+        crate::{
+            ast::{
+                Join, JoinConstraint, JoinExecutor, JoinOperator, Query, Select, SetExpr,
+                Statement, TableFactor, TableWithJoins,
+            },
+            ast_builder::{col, table, test, Build, SelectItemList},
         },
-        ast_builder::{col, table, test, Build, SelectItemList},
+        pretty_assertions::assert_eq,
     };
 
     #[test]

diff --git a/core/src/ast_builder/select_item.rs b/core/src/ast_builder/select_item.rs
@@ -67,11 +67,14 @@ impl<'a> TryFrom<SelectItemNode<'a>> for SelectItem {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::SelectItem,
-        ast_builder::{col, SelectItemNode},
-        parse_sql::parse_select_item,
-        translate::translate_select_item,
+    use {
+        crate::{
+            ast::SelectItem,
+            ast_builder::{col, SelectItemNode},
+            parse_sql::parse_select_item,
+            translate::translate_select_item,
+        },
+        pretty_assertions::assert_eq,
     };
 
     fn test(actual: SelectItemNode, expected: &str) {

diff --git a/core/src/ast_builder/select_item_list.rs b/core/src/ast_builder/select_item_list.rs
@@ -70,12 +70,15 @@ impl<'a> TryFrom<SelectItemList<'a>> for Vec<SelectItem> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::SelectItem,
-        ast_builder::{col, expr, SelectItemList},
-        parse_sql::parse_select_items,
-        result::Result,
-        translate::translate_select_item,
+    use {
+        crate::{
+            ast::SelectItem,
+            ast_builder::{col, expr, SelectItemList},
+            parse_sql::parse_select_items,
+            result::Result,
+            translate::translate_select_item,
+        },
+        pretty_assertions::assert_eq,
     };
 
     fn test(actual: SelectItemList, expected: &str) {