Commit fdb4dbc
test: remove destructor from node_test_fixture
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: #18524
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 659b2a1 commit fdb4dbc
2 files changed
Lines changed: 1 addition & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -61,10 +61,6 @@ class NodeTestFixture : public ::testing::Test { | |||
| 61 | 61 | protected: | |
| 62 | 62 | v8::Isolate* isolate_; | |
| 63 | 63 | ||
| 64 | - ~NodeTestFixture() { | ||
| 65 | - TearDown(); | ||
| 66 | - } | ||
| 67 | - | ||
| 68 | 64 | virtual void SetUp() { | |
| 69 | 65 | CHECK_EQ(0, uv_loop_init(¤t_loop)); | |
| 70 | 66 | platform_ = new node::NodePlatform(8, ¤t_loop, nullptr); | |
@@ -76,7 +72,6 @@ class NodeTestFixture : public ::testing::Test { | |||
| 76 | 72 | } | |
| 77 | 73 | ||
| 78 | 74 | virtual void TearDown() { | |
| 79 | - if (platform_ == nullptr) return; | ||
| 80 | 75 | platform_->Shutdown(); | |
| 81 | 76 | while (uv_loop_alive(¤t_loop)) { | |
| 82 | 77 | uv_run(¤t_loop, UV_RUN_ONCE); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,16 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | 6 | using node::AliasedBuffer; | |
| 7 | 7 | ||
| 8 | - class AliasBufferTest : public NodeTestFixture { | ||
| 9 | - protected: | ||
| 10 | - void SetUp() override { | ||
| 11 | - NodeTestFixture::SetUp(); | ||
| 12 | - } | ||
| 13 | - | ||
| 14 | - void TearDown() override { | ||
| 15 | - NodeTestFixture::TearDown(); | ||
| 16 | - } | ||
| 17 | - }; | ||
| 8 | + class AliasBufferTest : public NodeTestFixture {}; | ||
| 18 | 9 | ||
| 19 | 10 | template<class NativeT> | |
| 20 | 11 | void CreateOracleValues(NativeT* buf, size_t count) { | |
0 commit comments