Commit 8678f57b authored by Matthias Vallentin's avatar Matthias Vallentin

Merge pull request #407 from Lingxi-Li/topic/fix-unit-test

Fix compound Boolean expressions in unit tests
parents 532c069d 9a701255
......@@ -73,7 +73,7 @@ behavior tester(event_based_actor* self, const actor& aut) {
// must be still alive at this point
CAF_CHECK_EQUAL(s_testees.load(), 1);
CAF_CHECK_EQUAL(msg.reason, exit_reason::user_shutdown);
CAF_CHECK_EQUAL(self->current_message().vals()->get_reference_count(), 1);
CAF_CHECK_EQUAL(self->current_message().vals()->get_reference_count(), 1u);
CAF_CHECK(&msg == self->current_message().at(0));
// testee might be still running its cleanup code in
// another worker thread; by waiting some milliseconds, we make sure
......
......@@ -167,7 +167,7 @@ CAF_TEST(broadcast_actor_pool) {
CAF_TEST_ERROR("didn't receive a result");
}
);
CAF_CHECK_EQUAL(results.size(), 25);
CAF_CHECK_EQUAL(results.size(), 25u);
CAF_CHECK(std::all_of(results.begin(), results.end(),
[](int res) { return res == 3; }));
self->send_exit(w, exit_reason::user_shutdown);
......
......@@ -132,7 +132,7 @@ CAF_TEST(request_response_promise) {
CAF_CHECK(false);
},
[](error err) {
CAF_CHECK(err.code() == sec::request_receiver_down);
CAF_CHECK(err.code() == static_cast<uint8_t>(sec::request_receiver_down));
}
);
anon_send_exit(dbl, exit_reason::kill);
......
......@@ -64,7 +64,7 @@ CAF_TEST(redirect_aout_globally) {
}
);
self->await_all_other_actors_done();
CAF_CHECK_EQUAL(self->mailbox().count(), 0);
CAF_CHECK_EQUAL(self->mailbox().count(), 0u);
}
CAF_TEST(global_and_local_redirect) {
......@@ -92,5 +92,5 @@ CAF_TEST(global_and_local_redirect) {
);
CAF_CHECK(std::is_permutation(lines.begin(), lines.end(), expected.begin()));
self->await_all_other_actors_done();
CAF_CHECK_EQUAL(self->mailbox().count(), 0);
CAF_CHECK_EQUAL(self->mailbox().count(), 0u);
}
......@@ -83,7 +83,7 @@ CAF_TEST(receive_atoms) {
self->receive(
[&](foo_atom, uint32_t value) {
matched_pattern[0] = true;
CAF_CHECK_EQUAL(value, 42);
CAF_CHECK_EQUAL(value, 42u);
},
[&](abc_atom, def_atom, const std::string& str) {
matched_pattern[1] = true;
......
......@@ -310,11 +310,11 @@ public:
for (int i = 0; i < 100; ++i) {
send(this, ok_atom::value);
}
CAF_CHECK_EQUAL(mailbox().count(), 100);
CAF_CHECK_EQUAL(mailbox().count(), 100u);
for (int i = 0; i < 100; ++i) {
send(this, ok_atom::value);
}
CAF_CHECK_EQUAL(mailbox().count(), 200);
CAF_CHECK_EQUAL(mailbox().count(), 200u);
return {};
}
};
......
......@@ -73,12 +73,12 @@ CAF_TEST(cli_args) {
{"in-file,i", "read from file", input_file},
{"verbosity,v", "1-5", verbosity}
});
CAF_CHECK_EQUAL(res.remainder.size(), 0);
CAF_CHECK_EQUAL(res.remainder.size(), 0u);
CAF_CHECK(res.remainder == message{});
CAF_CHECK_EQUAL(res.opts.count("no-colors"), 1);
CAF_CHECK_EQUAL(res.opts.count("verbosity"), 1);
CAF_CHECK_EQUAL(res.opts.count("out-file"), 1);
CAF_CHECK_EQUAL(res.opts.count("in-file"), 0);
CAF_CHECK_EQUAL(res.opts.count("no-colors"), 1u);
CAF_CHECK_EQUAL(res.opts.count("verbosity"), 1u);
CAF_CHECK_EQUAL(res.opts.count("out-file"), 1u);
CAF_CHECK_EQUAL(res.opts.count("in-file"), 0u);
CAF_CHECK_EQUAL(output_file, "/dev/null");
CAF_CHECK_EQUAL(input_file, "");
}
......@@ -39,12 +39,12 @@ CAF_TEST(basics) {
limited_vector<int, 2> vec5 {3, 4};
vec4.insert(vec4.end(), vec5.begin(), vec5.end());
auto vec6 = vec4;
CAF_CHECK_EQUAL(vec1.size(), 4);
CAF_CHECK_EQUAL(vec2.size(), 4);
CAF_CHECK_EQUAL(vec3.size(), 4);
CAF_CHECK_EQUAL(vec4.size(), 4);
CAF_CHECK_EQUAL(vec5.size(), 2);
CAF_CHECK_EQUAL(vec6.size(), 4);
CAF_CHECK_EQUAL(vec1.size(), 4u);
CAF_CHECK_EQUAL(vec2.size(), 4u);
CAF_CHECK_EQUAL(vec3.size(), 4u);
CAF_CHECK_EQUAL(vec4.size(), 4u);
CAF_CHECK_EQUAL(vec5.size(), 2u);
CAF_CHECK_EQUAL(vec6.size(), 4u);
CAF_CHECK_EQUAL(vec1.full(), true);
CAF_CHECK_EQUAL(vec2.full(), false);
CAF_CHECK_EQUAL(vec3.full(), true);
......@@ -71,7 +71,7 @@ CAF_TEST(basics) {
vec7.assign(std::begin(arr2), std::end(arr2));
CAF_CHECK((std::equal(vec7.begin(), vec7.end(), std::begin(arr2))));
vec7.assign(5, 0);
CAF_CHECK_EQUAL(vec7.size(), 5);
CAF_CHECK_EQUAL(vec7.size(), 5u);
CAF_CHECK((std::all_of(vec7.begin(), vec7.end(),
[](int i) { return i == 0; })));
}
......@@ -115,10 +115,10 @@ CAF_TEST(extract_opts) {
{"file,f", "set output file", filename},
{"whatever", "do whatever"}
});
CAF_CHECK_EQUAL(res.opts.count("file"), 1);
CAF_CHECK_EQUAL(res.opts.count("file"), 1u);
CAF_CHECK(res.remainder.empty());
CAF_CHECK_EQUAL(filename, "hello.txt");
CAF_CHECK_EQUAL(log_level, 5);
CAF_CHECK_EQUAL(log_level, 5u);
};
f({"--file=hello.txt", "-l", "5"});
f({"-f", "hello.txt", "--log-level=5"});
......
......@@ -44,7 +44,7 @@ public:
behavior make_behavior() override {
return {
others >> [=] {
CAF_CHECK_EQUAL(current_message().cvals()->get_reference_count(), 2);
CAF_CHECK_EQUAL(current_message().cvals()->get_reference_count(), 2u);
quit();
return std::move(current_message());
}
......@@ -114,18 +114,18 @@ CAF_TEST(message_lifetime_in_scoped_actor) {
CAF_CHECK_EQUAL(a, 1);
CAF_CHECK_EQUAL(b, 2);
CAF_CHECK_EQUAL(c, 3);
CAF_CHECK_EQUAL(msg.cvals()->get_reference_count(), 2);
CAF_CHECK_EQUAL(self->current_message().cvals()->get_reference_count(), 2);
CAF_CHECK_EQUAL(msg.cvals()->get_reference_count(), 2u);
CAF_CHECK_EQUAL(self->current_message().cvals()->get_reference_count(), 2u);
CAF_CHECK(self->current_message().cvals().get() == msg.cvals().get());
}
);
CAF_CHECK_EQUAL(msg.cvals()->get_reference_count(), 1);
CAF_CHECK_EQUAL(msg.cvals()->get_reference_count(), 1u);
msg = make_message(42);
self->send(self, msg);
self->receive(
[&](int& value) {
CAF_CHECK_EQUAL(msg.cvals()->get_reference_count(), 1);
CAF_CHECK_EQUAL(self->current_message().cvals()->get_reference_count(), 1);
CAF_CHECK_EQUAL(msg.cvals()->get_reference_count(), 1u);
CAF_CHECK_EQUAL(self->current_message().cvals()->get_reference_count(), 1u);
CAF_CHECK(self->current_message().cvals().get() != msg.cvals().get());
value = 10;
}
......
......@@ -64,7 +64,7 @@ CAF_TEST(metaprogramming) {
CAF_CHECK((is_same<float, tl_at<l1, 1>::type>::value));
CAF_CHECK((is_same<std::string, tl_at<l1, 2>::type>::value));
CAF_CHECK_EQUAL(3, tl_size<l1>::value);
CAF_CHECK_EQUAL(3u, tl_size<l1>::value);
CAF_CHECK_EQUAL(tl_size<r1>::value, tl_size<l1>::value);
CAF_CHECK((is_same<tl_at<l1, 0>::type, tl_at<r1, 2>::type>::value));
CAF_CHECK((is_same<tl_at<l1, 1>::type, tl_at<r1, 1>::type>::value));
......@@ -75,8 +75,8 @@ CAF_TEST(metaprogramming) {
CAF_CHECK((is_same<int, tl_head<l2>::type>::value));
CAF_CHECK((is_same<l1, tl_tail<l2>::type>::value));
CAF_CHECK_EQUAL((detail::tl_count<l1, is_int>::value), 1);
CAF_CHECK_EQUAL((detail::tl_count<l2, is_int>::value), 2);
CAF_CHECK_EQUAL((detail::tl_count<l1, is_int>::value), 1u);
CAF_CHECK_EQUAL((detail::tl_count<l2, is_int>::value), 2u);
using il0 = int_list<0, 1, 2, 3, 4, 5>;
using il1 = int_list<4, 5>;
......
......@@ -188,7 +188,7 @@ CAF_TEST(request_response_promise) {
CAF_CHECK(false);
},
[](error err) {
CAF_CHECK(err.code() == sec::request_receiver_down);
CAF_CHECK(err.code() == static_cast<uint8_t>(sec::request_receiver_down));
}
);
anon_send_exit(f, exit_reason::kill);
......
......@@ -218,13 +218,13 @@ CAF_TEST(ieee_754_conversion) {
// check conversion of float
float f1 = 3.1415925f; // float value
auto p1 = caf::detail::pack754(f1); // packet value
CAF_CHECK_EQUAL(p1, 0x40490FDA);
CAF_CHECK_EQUAL(p1, static_cast<decltype(p1)>(0x40490FDA));
auto u1 = caf::detail::unpack754(p1); // unpacked value
CAF_CHECK_EQUAL(f1, u1);
// check conversion of double
double f2 = 3.14159265358979311600; // double value
auto p2 = caf::detail::pack754(f2); // packet value
CAF_CHECK_EQUAL(p2, 0x400921FB54442D18);
CAF_CHECK_EQUAL(p2, static_cast<decltype(p2)>(0x400921FB54442D18));
auto u2 = caf::detail::unpack754(p2); // unpacked value
CAF_CHECK_EQUAL(f2, u2);
}
......
......@@ -753,11 +753,11 @@ CAF_TEST(automatic_connection) {
basp::message_type::announce_proxy_instance, uint32_t{0}, uint64_t{0},
this_node(), remote_node(0),
invalid_actor_id, pseudo_remote(0)->id());
CAF_CHECK_EQUAL(mpx()->output_buffer(remote_hdl(1)).size(), 0);
CAF_CHECK_EQUAL(mpx()->output_buffer(remote_hdl(1)).size(), 0u);
CAF_CHECK_EQUAL(tbl().lookup_indirect(remote_node(0)), remote_node(1));
CAF_CHECK_EQUAL(tbl().lookup_indirect(remote_node(1)), invalid_node_id);
auto connection_helper = system.latest_actor_id();
CAF_CHECK_EQUAL(mpx()->output_buffer(remote_hdl(1)).size(), 0);
CAF_CHECK_EQUAL(mpx()->output_buffer(remote_hdl(1)).size(), 0u);
// create a dummy config server and respond to the name lookup
CAF_MESSAGE("receive ConfigServ of jupiter");
network::address_listing res;
......
This diff is collapsed.
......@@ -569,19 +569,6 @@ int main(int argc, char** argv) {
return result ? 0 : 1;
}
namespace detail {
expr::expr(test* parent, const char* filename, size_t lineno,
bool should_fail, const char* expression)
: test_{parent},
filename_{filename},
line_{lineno},
should_fail_{should_fail},
expr_{expression} {
assert(test_ != nullptr);
}
} // namespace detail
} // namespace test
} // namespace caf
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment