Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 56 additions & 56 deletions src/arguments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,34 +243,35 @@ mod tests {
use {super::*, clap::Parser, std::path::PathBuf};

#[test]
fn filename_only() {
let arguments = Arguments::parse_from(vec!["program", "file.txt"]);

assert!(arguments.filename.is_some());
assert!(arguments.expression.is_none());

assert_eq!(arguments.filename.unwrap(), PathBuf::from("file.txt"));
fn both_should_fail() {
assert!(
Arguments::try_parse_from(vec![
"program",
"file.txt",
"--expression",
"1 + 2"
])
.is_err()
);
}

#[test]
fn expression_only() {
let arguments =
Arguments::parse_from(vec!["program", "--expression", "1 + 2"]);

assert!(arguments.filename.is_none());
assert!(arguments.expression.is_some());

assert_eq!(arguments.expression.unwrap(), "1 + 2");
}
fn conflict_error_message() {
let result = Arguments::try_parse_from(vec![
"program",
"file.txt",
"--expression",
"1 + 2",
]);

#[test]
fn expression_short_form() {
let arguments = Arguments::parse_from(vec!["program", "-e", "1 + 2"]);
assert!(result.is_err());

assert!(arguments.filename.is_none());
assert!(arguments.expression.is_some());
let error = result.unwrap_err().to_string();

assert_eq!(arguments.expression.unwrap(), "1 + 2");
assert!(
error.contains("cannot be used with"),
"Error should mention conflicts: {error}"
);
}

#[test]
Expand All @@ -294,52 +295,34 @@ mod tests {
}

#[test]
fn nonzero_arguments_reject_zero() {
for argument in ["--precision", "--stack-size"] {
let result = Arguments::try_parse_from(vec!["program", argument, "0"]);
fn expression_only() {
let arguments =
Arguments::parse_from(vec!["program", "--expression", "1 + 2"]);

assert!(result.is_err());
}
}
assert!(arguments.filename.is_none());
assert!(arguments.expression.is_some());

#[test]
fn both_should_fail() {
assert!(
Arguments::try_parse_from(vec![
"program",
"file.txt",
"--expression",
"1 + 2"
])
.is_err()
);
assert_eq!(arguments.expression.unwrap(), "1 + 2");
}

#[test]
fn neither_provided() {
let arguments = Arguments::parse_from(vec!["program"]);
fn expression_short_form() {
let arguments = Arguments::parse_from(vec!["program", "-e", "1 + 2"]);

assert!(arguments.filename.is_none());
assert!(arguments.expression.is_none());
assert!(arguments.expression.is_some());

assert_eq!(arguments.expression.unwrap(), "1 + 2");
}

#[test]
fn conflict_error_message() {
let result = Arguments::try_parse_from(vec![
"program",
"file.txt",
"--expression",
"1 + 2",
]);

assert!(result.is_err());
fn filename_only() {
let arguments = Arguments::parse_from(vec!["program", "file.txt"]);

let error = result.unwrap_err().to_string();
assert!(arguments.filename.is_some());
assert!(arguments.expression.is_none());

assert!(
error.contains("cannot be used with"),
"Error should mention conflicts: {error}"
);
assert_eq!(arguments.filename.unwrap(), PathBuf::from("file.txt"));
}

#[test]
Expand All @@ -360,4 +343,21 @@ mod tests {
"Error should mention conflicts: {error}"
);
}

#[test]
fn neither_provided() {
let arguments = Arguments::parse_from(vec!["program"]);

assert!(arguments.filename.is_none());
assert!(arguments.expression.is_none());
}

#[test]
fn nonzero_arguments_reject_zero() {
for argument in ["--precision", "--stack-size"] {
let result = Arguments::try_parse_from(vec!["program", argument, "0"]);

assert!(result.is_err());
}
}
}
28 changes: 14 additions & 14 deletions src/number.rs
Original file line number Diff line number Diff line change
Expand Up @@ -499,20 +499,6 @@ mod tests {
assert_eq!(Number::Approx(Float::with_val(8, 23)).to_string(), "23");
}

#[test]
fn zero_precision_uses_minimum() {
let config = Config {
precision: 0,
..Config::default()
};

let Number::Approx(number) = Number::e(config) else {
panic!("expected approximate number");
};

assert_eq!(number.prec(), 1);
}

#[test]
fn display_approx_rounded_large_integer() {
assert_eq!(
Expand Down Expand Up @@ -569,4 +555,18 @@ mod tests {
assert!(approx < greater);
assert!(greater > approx);
}

#[test]
fn zero_precision_uses_minimum() {
let config = Config {
precision: 0,
..Config::default()
};

let Number::Approx(number) = Number::e(config) else {
panic!("expected approximate number");
};

assert_eq!(number.prec(), 1);
}
}
42 changes: 21 additions & 21 deletions src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -492,14 +492,6 @@ mod tests {
Test::new().program("break").ast("statements(break)").run();
}

#[test]
fn continue_statement() {
Test::new()
.program("continue")
.ast("statements(continue)")
.run();
}

#[test]
fn comments() {
Test::new()
Expand All @@ -513,6 +505,14 @@ mod tests {
.run();
}

#[test]
fn continue_statement() {
Test::new()
.program("continue")
.ast("statements(continue)")
.run();
}

#[test]
fn for_loop() {
Test::new()
Expand Down Expand Up @@ -734,19 +734,6 @@ mod tests {
.run();
}

#[test]
fn return_statement() {
Test::new()
.program("return 5")
.ast("statements(return(number(5)))")
.run();

Test::new()
.program("return")
.ast("statements(return())")
.run();
}

#[test]
fn reserved_words_are_not_identifiers() {
#[track_caller]
Expand Down Expand Up @@ -774,6 +761,19 @@ mod tests {
}
}

#[test]
fn return_statement() {
Test::new()
.program("return 5")
.ast("statements(return(number(5)))")
.run();

Test::new()
.program("return")
.ast("statements(return())")
.run();
}

#[test]
fn unclosed_string() {
Test::new()
Expand Down
Loading
Loading