From 4dfabb8cc0497752dfeedd67147725ecdaf86a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jind=C5=99ich=20Moravec?= <xmorave2@fi.muni.cz>
Date: Fri, 26 Jan 2024 22:14:09 +0100
Subject: [PATCH] Revert "tests: asynchronize some interpreter tests"

This reverts commit 88fb13325a3f6d8533d86ee70f81fd3e1765d8cb.
---
 minisql/Cargo.toml         |  2 +-
 minisql/src/interpreter.rs | 58 +++++++++++++++++---------------------
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/minisql/Cargo.toml b/minisql/Cargo.toml
index 9cdfae0..22d0242 100644
--- a/minisql/Cargo.toml
+++ b/minisql/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2021"
 [dependencies]
 bimap = "0.6.3"
 thiserror = "1.0.50"
-tokio = { version = "1.35.1", features = ["sync", "rt", "macros"] }
+tokio = { version = "1.35.1", features = ["sync"] }
diff --git a/minisql/src/interpreter.rs b/minisql/src/interpreter.rs
index 0be4310..99d3e25 100644
--- a/minisql/src/interpreter.rs
+++ b/minisql/src/interpreter.rs
@@ -211,8 +211,8 @@ mod tests {
         assert!(table.table_name() == &users);
     }
 
-    #[tokio::test]
-    async fn test_select_empty() {
+    #[test]
+    fn test_select_empty() {
         let mut state = State::new();
         let users_schema = users_schema();
         let users = users_schema.table_name().clone();
@@ -227,9 +227,8 @@ mod tests {
         let Response::Selected(_schema, rows) = response else {
             panic!()
         };
-
-        let mut rows = rows.lock().await;
-        assert!(rows.next().is_none());
+        let rows: Vec<_> = rows.collect();
+        assert!(rows.len() == 0);
     }
 
     #[test]
@@ -244,8 +243,8 @@ mod tests {
         assert!(matches!(response, Err(Error::TableDoesNotExist(_))));
     }
 
-    #[tokio::test]
-    async fn test_insert_select_basic1() {
+    #[test]
+    fn test_insert_select_basic1() {
         use IndexableValue::*;
         use Value::*;
 
@@ -281,19 +280,18 @@ mod tests {
         let Response::Selected(_schema, rows) = response else {
             panic!()
         };
+        let rows: Vec<_> = rows.collect();
+        assert!(rows.len() == 1);
+        let row = &rows[0];
 
-        let mut rows = rows.lock().await;
-        let row = rows.next().expect("expected single row");
         assert!(row.len() == 3);
         assert!(row[0].1 == id);
         assert!(row[1].1 == name);
         assert!(row[2].1 == age);
-
-        assert!(rows.next().is_none());
     }
 
-    #[tokio::test]
-    async fn test_insert_select_basic2() {
+    #[test]
+    fn test_insert_select_basic2() {
         use ColumnSelection::*;
         use Condition::*;
         use IndexableValue::*;
@@ -348,21 +346,20 @@ mod tests {
                 panic!()
             };
 
-            let mut rows = rows.lock().await;
+            let rows: Vec<_> = rows.collect();
+            assert!(rows.len() == 2);
+            let row0 = &rows[0];
+            let row1 = &rows[1];
 
-            let row0 = rows.next().expect("expected first row");
             assert!(row0.len() == 3);
             assert!(row0[0].1 == id0);
             assert!(row0[1].1 == name0);
             assert!(row0[2].1 == age0);
 
-            let row1 = rows.next().expect("expected second row");
             assert!(row1.len() == 3);
             assert!(row1[0].1 == id1);
             assert!(row1[1].1 == name1);
             assert!(row1[2].1 == age1);
-
-            assert!(rows.next().is_none());
         }
 
         {
@@ -377,15 +374,14 @@ mod tests {
             let Response::Selected(_, rows) = response else {
                 panic!()
             };
-
-            let mut rows = rows.lock().await;
-            let row0 = rows.next().expect("expected first row");
+            let rows: Vec<_> = rows.collect();
+            assert!(rows.len() == 1);
+            let row0 = &rows[0];
 
             assert!(row0.len() == 3);
             assert!(row0[0].1 == id0);
             assert!(row0[1].1 == name0);
             assert!(row0[2].1 == age0);
-            assert!(rows.next().is_none());
         }
 
         {
@@ -400,19 +396,18 @@ mod tests {
             let Response::Selected(_, rows) = response else {
                 panic!()
             };
-
-            let mut rows = rows.lock().await;
-            let row0 = rows.next().expect("expected first row");
+            let rows: Vec<_> = rows.collect();
+            assert!(rows.len() == 1);
+            let row0 = &rows[0];
 
             assert!(row0.len() == 2);
             assert!(row0[0].1 == name0);
             assert!(row0[1].1 == id0);
-            assert!(rows.next().is_none());
         }
     }
 
-    #[tokio::test]
-    async fn test_delete() {
+    #[test]
+    fn test_delete() {
         use ColumnSelection::*;
         use Condition::*;
         use IndexableValue::*;
@@ -475,15 +470,14 @@ mod tests {
         let Response::Selected(_, rows) = response else {
             panic!()
         };
-
-        let mut rows = rows.lock().await;
-        let row = rows.next().expect("expected first row");
+        let rows: Vec<_> = rows.collect();
+        assert!(rows.len() == 1);
+        let row = &rows[0];
 
         assert!(row.len() == 3);
         assert!(row[0].1 == id1);
         assert!(row[1].1 == name1);
         assert!(row[2].1 == age1);
-        assert!(rows.next().is_none());
     }
 
     #[test]