Skip to content

Didn't like mod tests inside tests #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brentesh merged 1 commit into from
May 21, 2026
Merged

Didn't like mod tests inside tests #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ pub mod evaluate;
pub mod lex;
pub mod parser;
pub mod simple_text_expr;
#[cfg(test)]
pub mod tests;
pub mod to_sql;
pub mod translate;
Expand Down
221 changes: 107 additions & 114 deletions src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,127 +78,120 @@ where
}
}

#[cfg(test)]
mod tests {
use super::{parser, *};

#[test]
fn field_concat_len_test() {
let (_, field_type) = parse_expression("ID + L_NAME").unwrap();
let FieldType::Character(30) = &field_type else {
panic!(
"Expected FieldType::Character(30) field type, got {:?}",
field_type
)
};
}
#[test]
fn field_concat_len_test() {
let (_, field_type) = parse_expression("ID + L_NAME").unwrap();
let FieldType::Character(30) = &field_type else {
panic!(
"Expected FieldType::Character(30) field type, got {:?}",
field_type
)
};
}

#[test]
fn field_concat_if_else_len_test() {
let (_, field_type) = parse_expression("ID + iif(__DELETED,'..', '.')").unwrap();
let FieldType::Character(12) = &field_type else {
panic!(
"Expected FieldType::Character(12) field type (length of ID plus max length of if/else), got {:?}",
field_type
)
};
#[test]
fn field_concat_if_else_len_test() {
let (_, field_type) = parse_expression("ID + iif(__DELETED,'..', '.')").unwrap();
let FieldType::Character(12) = &field_type else {
panic!(
"Expected FieldType::Character(12) field type (length of ID plus max length of if/else), got {:?}",
field_type
)
};

let (_, field_type) = parse_expression("ID + iif(__DELETED,'', '.')").unwrap();
let FieldType::Character(11) = &field_type else {
panic!(
"Expected FieldType::Character(11) field type (length of ID plus max length of if/else), got {:?}",
field_type
)
};
}
let (_, field_type) = parse_expression("ID + iif(__DELETED,'', '.')").unwrap();
let FieldType::Character(11) = &field_type else {
panic!(
"Expected FieldType::Character(11) field type (length of ID plus max length of if/else), got {:?}",
field_type
)
};
}

#[test]
fn field_concat_if_else_alltrim_len_test() {
let (_, field_type) = parse_expression("ID + iif(__DELETED,'', ALLTRIM('. '))").unwrap();
let FieldType::Character(13) = &field_type else {
panic!(
"Expected FieldType::Character(13) field type (length of ID plus max length of if/else), got {:?}",
field_type
)
};
}
#[test]
fn field_concat_if_else_alltrim_len_test() {
let (_, field_type) = parse_expression("ID + iif(__DELETED,'', ALLTRIM('. '))").unwrap();
let FieldType::Character(13) = &field_type else {
panic!(
"Expected FieldType::Character(13) field type (length of ID plus max length of if/else), got {:?}",
field_type
)
};
}

#[test]
fn substr_test() {
let (expression, field_type) = parse_expression("substr(ID, 0, 3)").unwrap();
let Expression::FunctionCall { name, args } = &*expression.borrow() else {
panic!("Expected FunctionCall, got {:?}", expression)
};
assert_eq!(name, "SUBSTR");
assert_eq!(args.len(), 3);
assert_eq!(field_type, FieldType::Character(3));
assert_eq!(
*args[0].borrow(),
Expression::Field {
name: "ID".to_string(),
field_type: FieldType::Character(10),
}
);
assert_eq!(
*args[1].borrow(),
Expression::NumberLiteral("1".to_string())
);
assert_eq!(
*args[2].borrow(),
Expression::NumberLiteral("3".to_string())
);
}
#[test]
fn substr_test() {
let (expression, field_type) = parse_expression("substr(ID, 0, 3)").unwrap();
let Expression::FunctionCall { name, args } = &*expression.borrow() else {
panic!("Expected FunctionCall, got {:?}", expression)
};
assert_eq!(name, "SUBSTR");
assert_eq!(args.len(), 3);
assert_eq!(field_type, FieldType::Character(3));
assert_eq!(
*args[0].borrow(),
Expression::Field {
name: "ID".to_string(),
field_type: FieldType::Character(10),
}
);
assert_eq!(
*args[1].borrow(),
Expression::NumberLiteral("1".to_string())
);
assert_eq!(
*args[2].borrow(),
Expression::NumberLiteral("3".to_string())
);
}

#[test]
fn substr_wrong_params_test() {
match parse_expression("substr(ID)") {
Err(Error::IncorrectArgCount(func, count)) => {
assert_eq!(func, "SUBSTR");
assert_eq!(count, 1);
}
other => panic!("Expected IncorrectArgCount error, got {:?}", other),
#[test]
fn substr_wrong_params_test() {
match parse_expression("substr(ID)") {
Err(Error::IncorrectArgCount(func, count)) => {
assert_eq!(func, "SUBSTR");
assert_eq!(count, 1);
}
other => panic!("Expected IncorrectArgCount error, got {:?}", other),
}
}

#[test]
fn substr_replace_0_with_1_test() {
let (expression, field_type) = parse_expression("substr(ID, 0, 3)").unwrap();
let Expression::FunctionCall { name, args } = &*expression.borrow() else {
panic!("Expected FunctionCall, got {:?}", expression)
};
assert_eq!(name, "SUBSTR");
assert_eq!(args.len(), 3);
assert_eq!(field_type, FieldType::Character(3));
assert_eq!(
*args[1].borrow(),
Expression::NumberLiteral("1".to_string())
);
assert_eq!(
*args[2].borrow(),
Expression::NumberLiteral("3".to_string())
);
}
#[test]
fn substr_replace_0_with_1_test() {
let (expression, field_type) = parse_expression("substr(ID, 0, 3)").unwrap();
let Expression::FunctionCall { name, args } = &*expression.borrow() else {
panic!("Expected FunctionCall, got {:?}", expression)
};
assert_eq!(name, "SUBSTR");
assert_eq!(args.len(), 3);
assert_eq!(field_type, FieldType::Character(3));
assert_eq!(
*args[1].borrow(),
Expression::NumberLiteral("1".to_string())
);
assert_eq!(
*args[2].borrow(),
Expression::NumberLiteral("3".to_string())
);
}

fn parse_expression(expr: &str) -> translate::Result {
let (tree, root) = parser::parse(expr).unwrap();
let cx = TestTranslator {
field_lookup: |alias: Option<&str>,
field: &str|
-> Result<(String, FieldType), String> {
let field = field.to_string().to_uppercase();
let field_type = match (alias, field.as_ref()) {
(_, "A" | "B" | "C") => FieldType::Integer,
(_, "BINDATAFIELD") => FieldType::MemoBinary,
(_, "SHIP_DATE") => FieldType::Date,
(_, "ID") => FieldType::Character(10),
(_, "L_NAME") => FieldType::Character(20),
(_, "__DELETED") => FieldType::Logical,
(Some(alias), _) => panic!("unknown field: {alias}.{field}"),
(None, _) => panic!("unknown field: {field}"),
};
Ok((field, field_type))
},
};
cx.translate(&root, &tree)
}
fn parse_expression(expr: &str) -> translate::Result {
Comment thread
brentesh marked this conversation as resolved.
let (tree, root) = parser::parse(expr).unwrap();
let cx = TestTranslator {
field_lookup: |alias: Option<&str>, field: &str| -> Result<(String, FieldType), String> {
let field = field.to_string().to_uppercase();
let field_type = match (alias, field.as_ref()) {
(_, "A" | "B" | "C") => FieldType::Integer,
(_, "BINDATAFIELD") => FieldType::MemoBinary,
(_, "SHIP_DATE") => FieldType::Date,
(_, "ID") => FieldType::Character(10),
(_, "L_NAME") => FieldType::Character(20),
(_, "__DELETED") => FieldType::Logical,
(Some(alias), _) => panic!("unknown field: {alias}.{field}"),
(None, _) => panic!("unknown field: {field}"),
};
Ok((field, field_type))
},
};
cx.translate(&root, &tree)
}