omedusyo/minisql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "tests: asynchronize some interpreter tests"

Browse source 
This reverts commit 88fb13325a.
This commit is contained in:
Jindřich Moravec 2024-01-26 22:14:09 +01:00
parent 04311ebe48
commit 4dfabb8cc0
2 changed files with 27 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
minisql/Cargo.toml
View file

@ -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"] }

58
minisql/src/interpreter.rs
View file

@ -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]