From 1b7372f2fb55f704b885e1097e2ec0381068c855 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 25 Jul 2017 12:20:40 +0200 Subject: src: replace ASSERT with CHECK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Builds always have asserts enabled so there is no point distinguishing between debug-only checks and run-time checks. Replace calls to ASSERT and friends with their CHECK counterparts. Fixes: https://github.com/nodejs/node/issues/14461 PR-URL: https://github.com/nodejs/node/pull/14474 Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Michaël Zasso Reviewed-By: Nikolai Vavilov Reviewed-By: XadillaX --- test/cctest/test_inspector_socket.cc | 2 +- test/cctest/test_inspector_socket_server.cc | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'test/cctest') diff --git a/test/cctest/test_inspector_socket.cc b/test/cctest/test_inspector_socket.cc index 741c7b189c..d1f5b4a98a 100644 --- a/test/cctest/test_inspector_socket.cc +++ b/test/cctest/test_inspector_socket.cc @@ -140,7 +140,7 @@ static void check_data_cb(read_expects* expectation, ssize_t nread, EXPECT_TRUE(nread >= 0 && nread != UV_EOF); ssize_t i; char c, actual; - ASSERT_GT(expectation->expected_len, 0); + CHECK_GT(expectation->expected_len, 0); for (i = 0; i < nread && expectation->pos <= expectation->expected_len; i++) { c = expectation->expected[expectation->pos++]; actual = buf->base[i]; diff --git a/test/cctest/test_inspector_socket_server.cc b/test/cctest/test_inspector_socket_server.cc index f9814274d0..8351261182 100644 --- a/test/cctest/test_inspector_socket_server.cc +++ b/test/cctest/test_inspector_socket_server.cc @@ -108,12 +108,12 @@ class TestInspectorServerDelegate : public SocketServerDelegate { } void MessageReceived(int session_id, const std::string& message) override { - ASSERT_EQ(session_id_, session_id); + CHECK_EQ(session_id_, session_id); buffer_.insert(buffer_.end(), message.begin(), message.end()); } void EndSession(int session_id) override { - ASSERT_EQ(session_id_, session_id); + CHECK_EQ(session_id_, session_id); disconnected++; } @@ -178,9 +178,9 @@ class SocketWrapper { } else { err = uv_ip4_addr(host.c_str(), port, &addr.v4); } - ASSERT_EQ(0, err); + CHECK_EQ(0, err); err = uv_tcp_connect(&connect_, &socket_, &addr.generic, Connected_); - ASSERT_EQ(0, err); + CHECK_EQ(0, err); SPIN_WHILE(!connected_) uv_read_start(reinterpret_cast(&socket_), AllocCallback, ReadCallback); @@ -195,11 +195,11 @@ class SocketWrapper { uv_tcp_init(loop_, &socket_); sockaddr_in addr; int err = uv_ip4_addr(host.c_str(), port, &addr); - ASSERT_EQ(0, err); + CHECK_EQ(0, err); err = uv_tcp_connect(&connect_, &socket_, reinterpret_cast(&addr), ConnectionMustFail_); - ASSERT_EQ(0, err); + CHECK_EQ(0, err); SPIN_WHILE(!connection_failed_) uv_read_start(reinterpret_cast(&socket_), AllocCallback, ReadCallback); @@ -244,7 +244,7 @@ class SocketWrapper { sending_ = true; int err = uv_write(&write_, reinterpret_cast(&socket_), buf, 1, WriteDone_); - ASSERT_EQ(err, 0); + CHECK_EQ(err, 0); SPIN_WHILE(sending_); } @@ -289,7 +289,7 @@ class SocketWrapper { delete[] buf->base; } static void WriteDone_(uv_write_t* req, int err) { - ASSERT_EQ(0, err); + CHECK_EQ(0, err); SocketWrapper* wrapper = node::ContainerOf(&SocketWrapper::write_, req); ASSERT_TRUE(wrapper->sending_); -- cgit v1.2.3