1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: remove destructor from node_test_fixture

Browse Source 
This commit removes the destructor from node_test_fixture.h which calls
the TearDown function causing TearDown to be called twice. This also
allows us to remove the check of the platform_ in TearDown.

Also the Setup/TearDown functions in AliasBufferTest are removed as they
are not necessary.

PR-URL: https://github.com/nodejs/node/pull/18524
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Daniel Bevenius 2018-02-02 10:35:43 +01:00
parent b9a873e044
commit 83c93158fb
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/cctest/node_test_fixture.h
View File

@ -64,10 +64,6 @@ class NodeTestFixture : public ::testing::Test {
protected: protected:
v8::Isolate* isolate_; v8::Isolate* isolate_;
~NodeTestFixture() {
TearDown();
}
virtual void SetUp() { virtual void SetUp() {
CHECK_EQ(0, uv_loop_init(&current_loop)); CHECK_EQ(0, uv_loop_init(&current_loop));
platform_ = new node::NodePlatform(8, nullptr); platform_ = new node::NodePlatform(8, nullptr);
@ -86,7 +82,6 @@ class NodeTestFixture : public ::testing::Test {
} }
virtual void TearDown() { virtual void TearDown() {
if (platform_ == nullptr) return;
platform_->Shutdown(); platform_->Shutdown();
while (uv_loop_alive(&current_loop)) { while (uv_loop_alive(&current_loop)) {
uv_run(&current_loop, UV_RUN_ONCE); uv_run(&current_loop, UV_RUN_ONCE);

11
test/cctest/test_aliased_buffer.cc
View File

@ -5,16 +5,7 @@
using node::AliasedBuffer; using node::AliasedBuffer;
class AliasBufferTest : public NodeTestFixture { class AliasBufferTest : public NodeTestFixture {};
protected:
void SetUp() override {
NodeTestFixture::SetUp();
}
void TearDown() override {
NodeTestFixture::TearDown();
}
};
template<class NativeT> template<class NativeT>
void CreateOracleValues(NativeT* buf, size_t count) { void CreateOracleValues(NativeT* buf, size_t count) {