stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

sample,asserts: Fixed wrong usage of cr_assert_arr_eq_cmp in C++

Browse source
This commit is contained in:
Snaipe 2016-09-06 20:56:42 +02:00
parent c5bfe03733
commit cfd3212a4a
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
samples/asserts.cc
View file

@ -70,9 +70,9 @@ struct dummy_struct {
}
};
int eq_dummy(struct dummy_struct *a, struct dummy_struct *b)
int eq_dummy(struct dummy_struct &a, struct dummy_struct &b)
{
return *a == *b ? 0 : (*a < *b ? -1 : 1);
return a == b ? 0 : (a < b ? -1 : 1);
}
Test(asserts, array) {
@ -105,7 +105,7 @@ Test(asserts, array) {
/* cr_assert_arr_eq(&s1, &s2, 2 * sizeof (struct dummy_struct));
isn't guaranteed to work on structs. */
cr_assert_arr_eq_cmp(&s1, &s2, 2, eq_dummy);
cr_assert_arr_eq_cmp(s1, s2, 2, eq_dummy);
}
Test(asserts, exception) {

4
test/cram/asserts.t
View file

@ -12,8 +12,6 @@ Test C assertions:
Test C++ assertions:
$ asserts.cc.bin
[\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m108\x1b[0m: Assertion failed: The expression (&s1)[0..Size] == (&s2)[0..Size] is false. (esc)
\[\\x1b\[0;31mFAIL\\x1b\[0m\] asserts::array: \(\d\.\d\ds\) \(esc\) (re)
[\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m14\x1b[0m: Assertion failed: assert is fatal, expect isn't (esc)
[\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m15\x1b[0m: Assertion failed: This assert runs (esc)
\[\\x1b\[0;31mFAIL\\x1b\[0m\] asserts::base: \(\d\.\d\ds\) \(esc\) (re)
@ -22,7 +20,7 @@ Test C++ assertions:
[\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m20\x1b[0m: Assertion failed: You can fail an assertion with a message from anywhere (esc)
[\x1b[0;34m----\x1b[0m] \x1b[0;1masserts.cc\x1b[0m:\x1b[0;31m21\x1b[0m: Assertion failed: The conditions for this assertion were not met. (esc)
\[\\x1b\[0;31mFAIL\\x1b\[0m\] asserts::old_school: \(\d\.\d\ds\) \(esc\) (re)
[\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m7\x1b[0;1m | Passing: \x1b[0;32m3\x1b[0;1m | Failing: \x1b[0;31m4\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc)
[\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m7\x1b[0;1m | Passing: \x1b[0;32m4\x1b[0;1m | Failing: \x1b[0;31m3\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc)
Using redirections