Skip to content

test: Remove SetUp and TearDown methods in tests #2086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathbunnyru merged 1 commit into from
May 7, 2025
Merged

test: Remove SetUp and TearDown methods in tests #2086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/integration/data/BackendFactoryTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ struct BackendCassandraFactoryTest : SyncAsioContextTest, util::prometheus::With

class BackendCassandraFactoryTestWithDB : public BackendCassandraFactoryTest {
protected:
void
TearDown() override
~BackendCassandraFactoryTestWithDB()
{
// drop the keyspace for next test
data::cassandra::Handle const handle{TestGlobals::instance().backendHost};
Expand Down
17 changes: 4 additions & 13 deletions tests/integration/data/cassandra/BackendTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,26 +111,17 @@ class BackendCassandraTest : public SyncAsioContextTest, public WithPrometheus {

// recreated for each test
data::LedgerCache cache_;
std::unique_ptr<BackendInterface> backend_;
std::unique_ptr<BackendInterface> backend_{std::make_unique<CassandraBackend>(settingsProvider_, cache_, false)};

void
SetUp() override
{
SyncAsioContextTest::SetUp();
backend_ = std::make_unique<CassandraBackend>(settingsProvider_, cache_, false);
}
void
TearDown() override
{
backend_.reset();
std::default_random_engine randomEngine_{0};

~BackendCassandraTest()
{
// drop the keyspace for next test
Handle const handle{TestGlobals::instance().backendHost};
EXPECT_TRUE(handle.connect());
handle.execute("DROP KEYSPACE " + TestGlobals::instance().backendKeyspace);
}

std::default_random_engine randomEngine_{0};
};

TEST_F(BackendCassandraTest, Basic)
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/migration/cassandra/CassandraMigrationManagerTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ class MigrationCassandraSimpleTest : public WithPrometheus, public NoLoggerFixtu
setupDatabase();
}

void
TearDown() override
~MigrationCassandraSimpleTest()
{
// drop the keyspace
Handle const handle{TestGlobals::instance().backendHost};
Expand Down
11 changes: 0 additions & 11 deletions tests/unit/etl/LedgerPublisherTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,6 @@ constexpr auto kAGE = 800;
} // namespace

struct ETLLedgerPublisherTest : util::prometheus::WithPrometheus, MockBackendTestStrict, SyncAsioContextTest {
void
SetUp() override
{
SyncAsioContextTest::SetUp();
}

void
TearDown() override
{
SyncAsioContextTest::TearDown();
}
util::config::ClioConfigDefinition cfg{{}};
MockLedgerCache mockCache;
StrictMockSubscriptionManagerSharedPtr mockSubscriptionManagerPtr;
Expand Down
9 changes: 1 addition & 8 deletions tests/unit/etl/TransformerTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,14 @@ struct ETLTransformerTest : util::prometheus::WithPrometheus, MockBackendTest {
using TransformerType = etl::impl::
Transformer<ExtractionDataPipeType, LedgerLoaderType, LedgerPublisherType, AmendmentBlockHandlerType>;

void
SetUp() override
ETLTransformerTest()
{
state_.isStopping = false;
state_.writeConflict = false;
state_.isReadOnly = false;
state_.isWriting = false;
}

void
TearDown() override
{
transformer_.reset();
}

protected:
ExtractionDataPipeType dataPipe_;
LedgerLoaderType ledgerLoader_;
Expand Down
10 changes: 2 additions & 8 deletions tests/unit/rpc/RPCHelpersTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,10 @@ constexpr auto kAMM_ID = 54321;
} // namespace

class RPCHelpersTest : public util::prometheus::WithPrometheus, public MockBackendTest, public SyncAsioContextTest {
void
SetUp() override
public:
RPCHelpersTest()
{
backend_->setRange(10, 300);
SyncAsioContextTest::SetUp();
}
void
TearDown() override
{
SyncAsioContextTest::TearDown();
}

protected:
Expand Down
4 changes: 1 addition & 3 deletions tests/unit/rpc/handlers/GetAggregatePriceTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,8 @@ mockLedgerObject(

class RPCGetAggregatePriceHandlerTest : public HandlerBaseTest {
protected:
void
SetUp() override
RPCGetAggregatePriceHandlerTest()
{
HandlerBaseTest::SetUp();
backend_->setRange(kRANGE_MIN, kRANGE_MAX);
}
};
Expand Down
15 changes: 1 addition & 14 deletions tests/unit/rpc/handlers/ServerInfoTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,11 @@ constexpr auto kCLIENT_IP = "1.1.1.1";
} // namespace

struct RPCServerInfoHandlerTest : HandlerBaseTest, MockLoadBalancerTest, MockCountersTest {
void
SetUp() override
RPCServerInfoHandlerTest()
{
HandlerBaseTest::SetUp();
MockLoadBalancerTest::SetUp();
MockCountersTest::SetUp();

backend_->setRange(10, 30);
}

void
TearDown() override
{
MockCountersTest::TearDown();
MockLoadBalancerTest::TearDown();
HandlerBaseTest::TearDown();
}

static void
validateNormalOutput(rpc::ReturnType const& output)
{
Expand Down
Loading