Skip to content

Commit c6224ac

Browse files
Alami-AmineAlami-Amine
committed
removing pointless nullptr check from TestContext
1 parent ac12ff3 commit c6224ac

12 files changed

+53
-143
lines changed

‎src/app/tests/TestAclAttribute.cpp

+6-19
Original file line numberDiff line numberDiff line change
@@ -116,36 +116,23 @@ class TestAclAttribute : public ::testing::Test
116116
{
117117

118118
mpTestContext = new chip::Test::AppContext;
119-
120119
mpTestContext->SetUpTestSuite();
121120
}
122121
static void TearDownTestSuite()
123122
{
124123
mpTestContext->TearDownTestSuite();
125-
if (mpTestContext != nullptr)
126-
{
127-
delete mpTestContext;
128-
}
124+
delete mpTestContext;
129125
}
130126

131127
void SetUp() override
132128
{
129+
mpTestContext->SetUp();
133130

134-
if (mpTestContext != nullptr)
135-
{
136-
mpTestContext->SetUp();
137-
138-
Access::GetAccessControl().Finish();
139-
Access::GetAccessControl().Init(GetTestAccessControlDelegate(), gDeviceTypeResolver);
140-
}
141-
}
142-
void TearDown() override
143-
{
144-
if (mpTestContext != nullptr)
145-
{
146-
mpTestContext->TearDown();
147-
}
131+
Access::GetAccessControl().Finish();
132+
Access::GetAccessControl().Init(GetTestAccessControlDelegate(), gDeviceTypeResolver);
148133
}
134+
void TearDown() override { mpTestContext->TearDown(); }
135+
149136
static chip::Test::AppContext * mpTestContext;
150137
};
151138

‎src/app/tests/TestAclEvent.cpp

+1-5
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,12 @@ class TestAclEvent : public ::testing::Test
179179
{
180180

181181
mpTestContext = new chip::Test::AppContext;
182-
183182
mpTestContext->SetUpTestSuite();
184183
}
185184
static void TearDownTestSuite()
186185
{
187186
mpTestContext->TearDownTestSuite();
188-
if (mpTestContext != nullptr)
189-
{
190-
delete mpTestContext;
191-
}
187+
delete mpTestContext;
192188
}
193189

194190
// Performs setup for each individual test in the test suite

‎src/app/tests/TestClusterStateCache.cpp

+5-18
Original file line numberDiff line numberDiff line change
@@ -119,25 +119,12 @@ class TestClusterStateCache : public ::testing::Test
119119
static void TearDownTestSuite()
120120
{
121121
mpTestContext->TearDownTestSuite();
122-
if (mpTestContext != nullptr)
123-
{
124-
delete mpTestContext;
125-
}
126-
}
127-
void SetUp() override
128-
{
129-
if (mpTestContext != nullptr)
130-
{
131-
mpTestContext->SetUp();
132-
}
133-
}
134-
void TearDown() override
135-
{
136-
if (mpTestContext != nullptr)
137-
{
138-
mpTestContext->TearDown();
139-
}
122+
delete mpTestContext;
140123
}
124+
125+
void SetUp() override { mpTestContext->SetUp(); }
126+
void TearDown() override { mpTestContext->TearDown(); }
127+
141128
static TestContext * mpTestContext;
142129
};
143130
TestContext * TestClusterStateCache::mpTestContext = nullptr;

‎src/app/tests/TestCommandInteraction.cpp

+4-18
Original file line numberDiff line numberDiff line change
@@ -397,26 +397,12 @@ class TestCommandInteraction : public ::testing::Test
397397
static void TearDownTestSuite()
398398
{
399399
mpTestContext->TearDownTestSuite();
400-
if (mpTestContext != nullptr)
401-
{
402-
delete mpTestContext;
403-
}
400+
delete mpTestContext;
404401
}
405402

406-
void SetUp() override
407-
{
408-
if (mpTestContext != nullptr)
409-
{
410-
mpTestContext->SetUp();
411-
}
412-
}
413-
void TearDown() override
414-
{
415-
if (mpTestContext != nullptr)
416-
{
417-
mpTestContext->TearDown();
418-
}
419-
}
403+
void SetUp() override { mpTestContext->SetUp(); }
404+
void TearDown() override { mpTestContext->TearDown(); }
405+
420406
static TestContext * mpTestContext;
421407

422408
static size_t GetNumActiveCommandResponderObjects()

‎src/app/tests/TestEventLogging.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@ class TestEventLogging : public ::testing::Test
6464
static void TearDownTestSuite()
6565
{
6666
mpTestContext->TearDownTestSuite();
67-
if (mpTestContext != nullptr)
68-
{
69-
delete mpTestContext;
70-
}
67+
delete mpTestContext;
7168
}
7269
// Performs setup for each individual test in the test suite
7370
void SetUp() override

‎src/app/tests/TestEventLoggingNoUTCTime.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ class TestEventLoggingNoUTCTime : public ::testing::Test
8989
{
9090
sClock.ClearValue();
9191
mpTestContext->TearDownTestSuite();
92-
if (mpTestContext != nullptr)
93-
{
94-
delete mpTestContext;
95-
}
92+
delete mpTestContext;
9693
}
9794

9895
// Performs setup for each individual test in the test suite

‎src/app/tests/TestEventOverflow.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ class TestEventOverflow : public ::testing::Test
6262
static void TearDownTestSuite()
6363
{
6464
mpTestContext->TearDownTestSuite();
65-
if (mpTestContext != nullptr)
66-
{
67-
delete mpTestContext;
68-
}
65+
delete mpTestContext;
6966
}
7067

7168
// Performs setup for each individual test in the test suite

‎src/app/tests/TestFabricScopedEventLogging.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@ class TestFabricScopedEventLogging : public ::testing::Test
6464
static void TearDownTestSuite()
6565
{
6666
mpTestContext->TearDownTestSuite();
67-
if (mpTestContext != nullptr)
68-
{
69-
delete mpTestContext;
70-
}
67+
delete mpTestContext;
7168
}
7269

7370
// Performs setup for each individual test in the test suite

‎src/app/tests/TestReadInteraction.cpp

+7-14
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,9 @@ class TestReadInteraction : public ::testing::Test
289289
static void TearDownTestSuite()
290290
{
291291
chip::System::Clock::Internal::SetSystemClockForTesting(gRealClock);
292+
292293
mpTestContext->TearDownTestSuite();
293-
if (mpTestContext != nullptr)
294-
{
295-
delete mpTestContext;
296-
}
294+
delete mpTestContext;
297295
}
298296

299297
void SetUp()
@@ -303,21 +301,17 @@ class TestReadInteraction : public ::testing::Test
303301
{ &gInfoEventBuffer[0], sizeof(gInfoEventBuffer), chip::app::PriorityLevel::Info },
304302
{ &gCritEventBuffer[0], sizeof(gCritEventBuffer), chip::app::PriorityLevel::Critical },
305303
};
306-
if (mpTestContext != nullptr)
307-
{
308-
mpTestContext->SetUp();
309-
}
304+
305+
mpTestContext->SetUp();
306+
310307
ASSERT_EQ(mEventCounter.Init(0), CHIP_NO_ERROR);
311308
chip::app::EventManagement::CreateEventManagement(&mpTestContext->GetExchangeManager(), ArraySize(logStorageResources),
312309
gCircularEventBuffer, logStorageResources, &mEventCounter);
313310
}
314311
void TearDown()
315312
{
316313
chip::app::EventManagement::DestroyEventManagement();
317-
if (mpTestContext != nullptr)
318-
{
319-
mpTestContext->TearDown();
320-
}
314+
mpTestContext->TearDown();
321315
}
322316

323317
static chip::Test::AppContext * mpTestContext;
@@ -1238,8 +1232,7 @@ TEST_F(TestReadInteraction, TestSetDirtyBetweenChunks)
12381232
public:
12391233
DirtyingMockDelegate(AttributePathParams (&aReadPaths)[2], int & aNumAttributeResponsesWhenSetDirty,
12401234
int & aNumArrayItemsWhenSetDirty) :
1241-
mReadPaths(aReadPaths),
1242-
mNumAttributeResponsesWhenSetDirty(aNumAttributeResponsesWhenSetDirty),
1235+
mReadPaths(aReadPaths), mNumAttributeResponsesWhenSetDirty(aNumAttributeResponsesWhenSetDirty),
12431236
mNumArrayItemsWhenSetDirty(aNumArrayItemsWhenSetDirty)
12441237
{}
12451238

‎src/app/tests/TestReportingEngine.cpp

+4-9
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,15 @@ class TestReportingEngine : public ::testing::Test
5858
public:
5959
static void SetUpTestSuite()
6060
{
61-
if (mpTestContext == nullptr)
62-
{
63-
mpTestContext = std::make_unique<TestContext>();
64-
ASSERT_NE(mpTestContext, nullptr);
65-
}
61+
62+
mpTestContext = std::make_unique<TestContext>();
63+
ASSERT_NE(mpTestContext, nullptr);
6664
mpTestContext->SetUpTestSuite();
6765
}
6866
static void TearDownTestSuite()
6967
{
7068
mpTestContext->TearDownTestSuite();
71-
if (mpTestContext != nullptr)
72-
{
73-
mpTestContext.reset();
74-
}
69+
mpTestContext.reset();
7570
}
7671
void SetUp() { mpTestContext->SetUp(); }
7772
void TearDown() { mpTestContext->TearDown(); }

‎src/app/tests/TestTimedHandler.cpp

+17-32
Original file line numberDiff line numberDiff line change
@@ -45,41 +45,26 @@ class TestTimedHandler : public ::testing::Test
4545
static void SetUpTestSuite()
4646
{
4747

48-
pTestContext = new TestContext;
49-
pTestContext->SetUpTestSuite();
48+
mpTestContext = new TestContext;
49+
mpTestContext->SetUpTestSuite();
5050
}
5151
static void TearDownTestSuite()
5252
{
53-
pTestContext->TearDownTestSuite();
54-
if (pTestContext != nullptr)
55-
{
56-
delete pTestContext;
57-
}
53+
mpTestContext->TearDownTestSuite();
54+
delete mpTestContext;
5855
}
5956

60-
void SetUp() override
61-
{
62-
if (pTestContext != nullptr)
63-
{
64-
pTestContext->SetUp();
65-
}
66-
}
67-
void TearDown() override
68-
{
69-
if (pTestContext != nullptr)
70-
{
71-
pTestContext->TearDown();
72-
}
73-
}
74-
static TestContext * pTestContext;
57+
void SetUp() override { mpTestContext->SetUp(); }
58+
void TearDown() override { mpTestContext->TearDown(); }
59+
60+
static TestContext * mpTestContext;
7561

7662
static void TestFollowingMessageFastEnough(MsgType aMsgType);
7763
static void TestFollowingMessageTooSlow(MsgType aMsgType);
78-
7964
static void GenerateTimedRequest(uint16_t aTimeoutValue, System::PacketBufferHandle & aPayload);
8065
};
8166

82-
TestContext * TestTimedHandler::pTestContext = nullptr;
67+
TestContext * TestTimedHandler::mpTestContext = nullptr;
8368

8469
class TestExchangeDelegate : public Messaging::ExchangeDelegate
8570
{
@@ -140,7 +125,7 @@ void TestTimedHandler::TestFollowingMessageFastEnough(MsgType aMsgType)
140125
GenerateTimedRequest(500, payload);
141126

142127
TestExchangeDelegate delegate;
143-
ExchangeContext * exchange = pTestContext->NewExchangeToAlice(&delegate);
128+
ExchangeContext * exchange = mpTestContext->NewExchangeToAlice(&delegate);
144129
ASSERT_NE(exchange, nullptr);
145130

146131
EXPECT_FALSE(delegate.mNewMessageReceived);
@@ -149,7 +134,7 @@ void TestTimedHandler::TestFollowingMessageFastEnough(MsgType aMsgType)
149134

150135
EXPECT_EQ(exchange->SendMessage(MsgType::TimedRequest, std::move(payload), SendMessageFlags::kExpectResponse), CHIP_NO_ERROR);
151136

152-
pTestContext->DrainAndServiceIO();
137+
mpTestContext->DrainAndServiceIO();
153138
EXPECT_TRUE(delegate.mNewMessageReceived);
154139
EXPECT_TRUE(delegate.mLastMessageWasStatus);
155140
EXPECT_EQ(delegate.mError, CHIP_NO_ERROR);
@@ -164,7 +149,7 @@ void TestTimedHandler::TestFollowingMessageFastEnough(MsgType aMsgType)
164149

165150
EXPECT_EQ(exchange->SendMessage(aMsgType, std::move(payload), SendMessageFlags::kExpectResponse), CHIP_NO_ERROR);
166151

167-
pTestContext->DrainAndServiceIO();
152+
mpTestContext->DrainAndServiceIO();
168153
EXPECT_TRUE(delegate.mNewMessageReceived);
169154
EXPECT_TRUE(delegate.mLastMessageWasStatus);
170155
EXPECT_NE(StatusIB(delegate.mError).mStatus, Status::UnsupportedAccess);
@@ -188,7 +173,7 @@ void TestTimedHandler::TestFollowingMessageTooSlow(MsgType aMsgType)
188173
GenerateTimedRequest(50, payload);
189174

190175
TestExchangeDelegate delegate;
191-
ExchangeContext * exchange = pTestContext->NewExchangeToAlice(&delegate);
176+
ExchangeContext * exchange = mpTestContext->NewExchangeToAlice(&delegate);
192177
ASSERT_NE(exchange, nullptr);
193178

194179
EXPECT_FALSE(delegate.mNewMessageReceived);
@@ -197,7 +182,7 @@ void TestTimedHandler::TestFollowingMessageTooSlow(MsgType aMsgType)
197182

198183
EXPECT_EQ(exchange->SendMessage(MsgType::TimedRequest, std::move(payload), SendMessageFlags::kExpectResponse), CHIP_NO_ERROR);
199184

200-
pTestContext->DrainAndServiceIO();
185+
mpTestContext->DrainAndServiceIO();
201186
EXPECT_TRUE(delegate.mNewMessageReceived);
202187
EXPECT_TRUE(delegate.mLastMessageWasStatus);
203188
EXPECT_EQ(delegate.mError, CHIP_NO_ERROR);
@@ -215,7 +200,7 @@ void TestTimedHandler::TestFollowingMessageTooSlow(MsgType aMsgType)
215200

216201
EXPECT_EQ(exchange->SendMessage(aMsgType, std::move(payload), SendMessageFlags::kExpectResponse), CHIP_NO_ERROR);
217202

218-
pTestContext->DrainAndServiceIO();
203+
mpTestContext->DrainAndServiceIO();
219204
EXPECT_TRUE(delegate.mNewMessageReceived);
220205
EXPECT_TRUE(delegate.mLastMessageWasStatus);
221206
EXPECT_EQ(StatusIB(delegate.mError).mStatus, Status::UnsupportedAccess);
@@ -240,14 +225,14 @@ TEST_F(TestTimedHandler, TestInvokeNeverComes)
240225
GenerateTimedRequest(50, payload);
241226

242227
TestExchangeDelegate delegate;
243-
ExchangeContext * exchange = pTestContext->NewExchangeToAlice(&delegate);
228+
ExchangeContext * exchange = mpTestContext->NewExchangeToAlice(&delegate);
244229
ASSERT_NE(exchange, nullptr);
245230

246231
EXPECT_FALSE(delegate.mNewMessageReceived);
247232

248233
EXPECT_EQ(exchange->SendMessage(MsgType::TimedRequest, std::move(payload), SendMessageFlags::kExpectResponse), CHIP_NO_ERROR);
249234

250-
pTestContext->DrainAndServiceIO();
235+
mpTestContext->DrainAndServiceIO();
251236
EXPECT_TRUE(delegate.mNewMessageReceived);
252237
EXPECT_TRUE(delegate.mLastMessageWasStatus);
253238
EXPECT_EQ(delegate.mError, CHIP_NO_ERROR);

0 commit comments

Comments
 (0)