Skip to content

Commit e5c6105

Browse files
hallfoxhallfox
committed
Move bmqtst globals into a helper struct
Signed-off-by: Taylor Foxhall <[email protected]>
1 parent a5f8a06 commit e5c6105

File tree

202 files changed

+7032
-5002
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+7032
-5002
lines changed

‎src/applications/bmqstoragetool/m_bmqstoragetool_commandprocessorfactory.t.cpp‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,18 @@ static void test1_breathingTest()
4242
{
4343
bmqtst::TestHelper::printTestName("BREATHING TEST");
4444
// Empty parameters
45-
CommandLineArguments arguments(s_allocator_p);
46-
Parameters params(arguments, s_allocator_p);
47-
bslma::ManagedPtr<FileManager> fileManager(new (*s_allocator_p)
48-
FileManagerMock(),
49-
s_allocator_p);
45+
CommandLineArguments arguments(bmqtst::TestHelperUtil::allocator());
46+
Parameters params(arguments, bmqtst::TestHelperUtil::allocator());
47+
bslma::ManagedPtr<FileManager> fileManager(
48+
new (*bmqtst::TestHelperUtil::allocator()) FileManagerMock(),
49+
bmqtst::TestHelperUtil::allocator());
5050

5151
bslma::ManagedPtr<CommandProcessor> cmdProcessor =
52-
CommandProcessorFactory::createCommandProcessor(&params,
53-
fileManager,
54-
bsl::cout,
55-
s_allocator_p);
52+
CommandProcessorFactory::createCommandProcessor(
53+
&params,
54+
fileManager,
55+
bsl::cout,
56+
bmqtst::TestHelperUtil::allocator());
5657
ASSERT(dynamic_cast<JournalFileProcessor*>(cmdProcessor.get()) != 0);
5758
}
5859

@@ -70,7 +71,7 @@ int main(int argc, char* argv[])
7071
default: {
7172
bsl::cerr << "WARNING: CASE '" << _testCase << "' NOT FOUND."
7273
<< bsl::endl;
73-
s_testStatus = -1;
74+
bmqtst::TestHelperUtil::testStatus() = -1;
7475
} break;
7576
}
7677

‎src/applications/bmqstoragetool/m_bmqstoragetool_journalfileprocessor.t.cpp‎

Lines changed: 247 additions & 187 deletions
Large diffs are not rendered by default.

‎src/applications/bmqstoragetool/m_bmqstoragetool_searchresultfactory.t.cpp‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,18 @@ static void test1_breathingTest()
4343
{
4444
bmqtst::TestHelper::printTestName("BREATHING TEST");
4545
// Empty parameters
46-
CommandLineArguments arguments(s_allocator_p);
47-
Parameters params(arguments, s_allocator_p);
48-
bslma::ManagedPtr<FileManager> fileManager(new (*s_allocator_p)
49-
FileManagerMock(),
50-
s_allocator_p);
46+
CommandLineArguments arguments(bmqtst::TestHelperUtil::allocator());
47+
Parameters params(arguments, bmqtst::TestHelperUtil::allocator());
48+
bslma::ManagedPtr<FileManager> fileManager(
49+
new (*bmqtst::TestHelperUtil::allocator()) FileManagerMock(),
50+
bmqtst::TestHelperUtil::allocator());
5151

5252
bsl::shared_ptr<SearchResult> searchResult =
53-
SearchResultFactory::createSearchResult(&params,
54-
fileManager,
55-
bsl::cout,
56-
s_allocator_p);
53+
SearchResultFactory::createSearchResult(
54+
&params,
55+
fileManager,
56+
bsl::cout,
57+
bmqtst::TestHelperUtil::allocator());
5758
ASSERT(dynamic_cast<SearchResult*>(searchResult.get()) != 0);
5859
}
5960

@@ -70,7 +71,7 @@ int main(int argc, char* argv[])
7071
case 1: test1_breathingTest(); break;
7172
default: {
7273
cerr << "WARNING: CASE '" << _testCase << "' NOT FOUND." << endl;
73-
s_testStatus = -1;
74+
bmqtst::TestHelperUtil::testStatus() = -1;
7475
} break;
7576
}
7677

‎src/applications/bmqtool/m_bmqtool_inpututil.t.cpp‎

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,17 @@ static void test1_decodeHexDumpTest()
101101
for (size_t idx = 0; idx < k_NUM_DATA; ++idx) {
102102
const Test& test = k_DATA[idx];
103103

104-
bsl::istringstream input(bsl::string(test.d_hexdumpStr, s_allocator_p),
105-
s_allocator_p);
106-
bmqu::MemOutStream output(s_allocator_p);
107-
bmqu::MemOutStream error(s_allocator_p);
108-
const bool rc =
109-
InputUtil::decodeHexDump(&output, &error, input, s_allocator_p);
104+
bsl::istringstream input(
105+
bsl::string(test.d_hexdumpStr,
106+
bmqtst::TestHelperUtil::allocator()),
107+
bmqtst::TestHelperUtil::allocator());
108+
bmqu::MemOutStream output(bmqtst::TestHelperUtil::allocator());
109+
bmqu::MemOutStream error(bmqtst::TestHelperUtil::allocator());
110+
const bool rc = InputUtil::decodeHexDump(
111+
&output,
112+
&error,
113+
input,
114+
bmqtst::TestHelperUtil::allocator());
110115
// Check rc
111116
ASSERT_EQ_D(test.d_line, rc, test.d_expectedRc);
112117
// Check error
@@ -251,13 +256,14 @@ static void test2_loadMessageFromFileTest()
251256

252257
// Check wrong file path
253258
{
254-
bmqu::MemOutStream stream(s_allocator_p);
255-
bmqu::MemOutStream error(s_allocator_p);
256-
const bool rc = InputUtil::loadMessageFromFile(&stream,
257-
&stream,
258-
&error,
259-
"wrongFilePath",
260-
s_allocator_p);
259+
bmqu::MemOutStream stream(bmqtst::TestHelperUtil::allocator());
260+
bmqu::MemOutStream error(bmqtst::TestHelperUtil::allocator());
261+
const bool rc = InputUtil::loadMessageFromFile(
262+
&stream,
263+
&stream,
264+
&error,
265+
"wrongFilePath",
266+
bmqtst::TestHelperUtil::allocator());
261267
ASSERT_EQ(rc, false);
262268
ASSERT_EQ(error.str(), "Failed to open file: wrongFilePath");
263269
}
@@ -267,32 +273,36 @@ static void test2_loadMessageFromFileTest()
267273
const Test& test = k_DATA[idx];
268274

269275
// Create temp file and write content
270-
bmqu::TempFile tempFile(s_allocator_p);
276+
bmqu::TempFile tempFile(bmqtst::TestHelperUtil::allocator());
271277
const bsl::string filePath = tempFile.path();
272278
{
273279
bsl::ofstream ofs(filePath.c_str());
274280
ASSERT_EQ(ofs.is_open(), true);
275281
ofs << test.d_fileContent;
276282
}
277283

278-
bmqu::MemOutStream payload(s_allocator_p);
279-
bsl::ostringstream properties(s_allocator_p);
280-
bmqu::MemOutStream error(s_allocator_p);
281-
const bool rc = InputUtil::loadMessageFromFile(&payload,
282-
&properties,
283-
&error,
284-
filePath,
285-
s_allocator_p);
284+
bmqu::MemOutStream payload(bmqtst::TestHelperUtil::allocator());
285+
bsl::ostringstream properties(bmqtst::TestHelperUtil::allocator());
286+
bmqu::MemOutStream error(bmqtst::TestHelperUtil::allocator());
287+
const bool rc = InputUtil::loadMessageFromFile(
288+
&payload,
289+
&properties,
290+
&error,
291+
filePath,
292+
bmqtst::TestHelperUtil::allocator());
286293
// Check rc
287294
ASSERT_EQ_D(test.d_line, rc, test.d_expectedRc);
288295
// Check error
289296
ASSERT_EQ_D(test.d_line, error.str(), test.d_expectedError);
290297
// Check payload
291298
ASSERT_EQ_D(test.d_line, payload.str(), test.d_expectedPayload);
292299
// Check properties (deserialize into properties instance)
293-
bdlbb::PooledBlobBufferFactory bufferFactory(128, s_allocator_p);
294-
bdlbb::Blob blob(&bufferFactory, s_allocator_p);
295-
bmqa::MessageProperties messageProperties(s_allocator_p);
300+
bdlbb::PooledBlobBufferFactory bufferFactory(
301+
128,
302+
bmqtst::TestHelperUtil::allocator());
303+
bdlbb::Blob blob(&bufferFactory, bmqtst::TestHelperUtil::allocator());
304+
bmqa::MessageProperties messageProperties(
305+
bmqtst::TestHelperUtil::allocator());
296306
bdlbb::BlobUtil::append(&blob,
297307
properties.str().c_str(),
298308
static_cast<int>(properties.str().size()));
@@ -314,7 +324,7 @@ int main(int argc, char* argv[])
314324
case 2: test2_loadMessageFromFileTest(); break;
315325
default: {
316326
cerr << "WARNING: CASE '" << _testCase << "' NOT FOUND." << endl;
317-
s_testStatus = -1;
327+
bmqtst::TestHelperUtil::testStatus() = -1;
318328
} break;
319329
}
320330

‎src/groups/bmq/bmqa/bmqa_abstractsession.t.cpp‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ static void test1_breathingTest()
291291
// PROTOCOL TEST
292292
// ------------------------------------------------------------------------
293293
{
294-
s_ignoreCheckDefAlloc = true;
294+
bmqtst::TestHelperUtil::ignoreCheckDefAlloc() = true;
295295
// The default allocator check fails in this test case because the
296296
// 'markDone' methods of AbstractSession may sometimes return a
297297
// memory-aware object without utilizing the parameter allocator.
@@ -302,7 +302,8 @@ static void test1_breathingTest()
302302
bmqa::AbstractSession concreteObj;
303303

304304
PV("Creating a test object");
305-
bsls::ProtocolTest<AbstractSessionTestImp> testObj(s_verbosityLevel > 2);
305+
bsls::ProtocolTest<AbstractSessionTestImp> testObj(
306+
bmqtst::TestHelperUtil::verbosityLevel() > 2);
306307

307308
PV("Verify that the protocol is NOT abstract");
308309
ASSERT(!testObj.testAbstract());
@@ -327,9 +328,11 @@ static void test1_breathingTest()
327328
bmqt::Uri dummyUri;
328329
bsls::TimeInterval dummyTimeInterval(0);
329330

330-
bmqa::OpenQueueStatus openQueueResult(s_allocator_p);
331-
bmqa::ConfigureQueueStatus configureQueueResult(s_allocator_p);
332-
bmqa::CloseQueueStatus closeQueueResult(s_allocator_p);
331+
bmqa::OpenQueueStatus openQueueResult(bmqtst::TestHelperUtil::allocator());
332+
bmqa::ConfigureQueueStatus configureQueueResult(
333+
bmqtst::TestHelperUtil::allocator());
334+
bmqa::CloseQueueStatus closeQueueResult(
335+
bmqtst::TestHelperUtil::allocator());
333336

334337
const bmqa::AbstractSession::OpenQueueCallback openQueueCallback;
335338
const bmqa::AbstractSession::ConfigureQueueCallback configureQueueCallback;
@@ -442,7 +445,7 @@ static void test2_instanceInvariants()
442445
// INSTANCE INVARIANTS
443446
// ------------------------------------------------------------------------
444447
{
445-
s_ignoreCheckDefAlloc = true;
448+
bmqtst::TestHelperUtil::ignoreCheckDefAlloc() = true;
446449
// Can't ensure no default memory is allocated because a default
447450
// QueueId is instantiated and that uses the default allocator to
448451
// allocate memory for an automatically generated CorrelationId.
@@ -464,12 +467,14 @@ static void test2_instanceInvariants()
464467
bmqa::QueueId* dummyQueueIdPtr = 0;
465468
bmqt::CorrelationId dummyCorrelationId;
466469
bmqt::QueueOptions dummyQueueOptions;
467-
bmqt::Uri dummyUri(s_allocator_p);
470+
bmqt::Uri dummyUri(bmqtst::TestHelperUtil::allocator());
468471
bsls::TimeInterval dummyTimeInterval(0);
469472

470-
bmqa::OpenQueueStatus openQueueResult(s_allocator_p);
471-
bmqa::ConfigureQueueStatus configureQueueResult(s_allocator_p);
472-
bmqa::CloseQueueStatus closeQueueResult(s_allocator_p);
473+
bmqa::OpenQueueStatus openQueueResult(bmqtst::TestHelperUtil::allocator());
474+
bmqa::ConfigureQueueStatus configureQueueResult(
475+
bmqtst::TestHelperUtil::allocator());
476+
bmqa::CloseQueueStatus closeQueueResult(
477+
bmqtst::TestHelperUtil::allocator());
473478

474479
const bmqa::AbstractSession::OpenQueueCallback openQueueCallback;
475480
const bmqa::AbstractSession::ConfigureQueueCallback configureQueueCallback;
@@ -622,7 +627,7 @@ int main(int argc, char* argv[])
622627
case 1: test1_breathingTest(); break;
623628
default: {
624629
cerr << "WARNING: CASE '" << _testCase << "' NOT FOUND." << endl;
625-
s_testStatus = -1;
630+
bmqtst::TestHelperUtil::testStatus() = -1;
626631
} break;
627632
}
628633

0 commit comments

Comments
 (0)