Skip to content
Merged
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
33 changes: 25 additions & 8 deletions src/assertions/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,35 +84,43 @@ where
if self.actual().ge(expected.borrow()) {
self.new_result().do_ok()
} else {
// TODO: write error message
self.new_result().do_fail()
self.new_result()
.add_fact("expected", format!("{:?}", self.actual()))
.add_fact("to be at least", format!("{:?}", expected.borrow()))
.do_fail()
}
}

fn is_at_most<B: Borrow<S>>(&self, expected: B) -> R {
if self.actual().le(expected.borrow()) {
self.new_result().do_ok()
} else {
// TODO: write error message
self.new_result().do_fail()
self.new_result()
.add_fact("expected", format!("{:?}", self.actual()))
.add_fact("to be at most", format!("{:?}", expected.borrow()))
.do_fail()
}
}

fn is_greater_than<B: Borrow<S>>(&self, expected: B) -> R {
if self.actual().gt(expected.borrow()) {
self.new_result().do_ok()
} else {
// TODO: write error message
self.new_result().do_fail()
self.new_result()
.add_fact("expected", format!("{:?}", self.actual()))
.add_fact("to be greater than", format!("{:?}", expected.borrow()))
.do_fail()
}
}

fn is_less_than<B: Borrow<S>>(&self, expected: B) -> R {
if self.actual().lt(expected.borrow()) {
self.new_result().do_ok()
} else {
// TODO: write error message
self.new_result().do_fail()
self.new_result()
.add_fact("expected", format!("{:?}", self.actual()))
.add_fact("to be less than", format!("{:?}", expected.borrow()))
.do_fail()
}
}
}
Expand Down Expand Up @@ -152,5 +160,14 @@ mod tests {
assert_that!(2).is_at_least(1);
assert_that!(2).is_at_least(2);
assert_that!(2_f32).is_at_least(1.);

assert_that!(check_that!(2).is_at_least(3)).facts_are(vec![
Fact::new("expected", "2"),
Fact::new("to be at least", "3"),
]);
assert_that!(check_that!(2).is_at_most(1)).facts_are(vec![
Fact::new("expected", "2"),
Fact::new("to be at most", "1"),
]);
}
}