Skip to content

Commit

Permalink
Refactor Parameters class - test creator helper function
Browse files Browse the repository at this point in the history 
Signed-off-by: Dmitrii Petukhov <[email protected]>
  • Loading branch information
@bbpetukhov
bbpetukhov committed Jan 13, 2025
1 parent 28fc3f5 commit e28074b
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 67 deletions.
108 changes: 42 additions & 66 deletions src/applications/bmqstoragetool/m_bmqstoragetool_journalfileprocessor.t.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,18 @@ void outputGuidString(bsl::ostream& ostream,
ostream << bsl::endl;
}

/// Helper function to instantiate test Parameters
Parameters createTestParameters()
{
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());

params.d_processRecordTypes.d_message = true;

return params;
};

} // close unnamed namespace

static void test1_breathingTest()
Expand All @@ -189,9 +201,7 @@ static void test1_breathingTest()
journalFile.addAllTypesRecords(&records);

// Prepare parameters
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

// Prepare file manager
bslma::ManagedPtr<FileManager> fileManager(
Expand Down Expand Up @@ -250,9 +260,7 @@ static void test2_searchGuidTest()
journalFile.addAllTypesRecords(&records);

// Prepare parameters
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

// Get list of message GUIDs for searching
bsl::vector<bsl::string>& searchGuids = params.d_guid;
Expand Down Expand Up @@ -321,9 +329,7 @@ static void test3_searchNonExistingGuidTest()
journalFile.addAllTypesRecords(&records);

// Prepare parameters
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

// Get list of message GUIDs for searching
bsl::vector<bsl::string>& searchGuids = params.d_guid;
Expand Down Expand Up @@ -386,9 +392,7 @@ static void test4_searchExistingAndNonExistingGuidTest()
journalFile.addAllTypesRecords(&records);

// Prepare parameters
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

// Get list of message GUIDs for searching
bsl::vector<bsl::string>& searchGuids = params.d_guid;
Expand Down Expand Up @@ -476,11 +480,10 @@ static void test5_searchOutstandingMessagesTest()
true);

// Configure parameters to search outstanding messages
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_outstanding = true;

// Prepare file manager
bslma::ManagedPtr<FileManager> fileManager(
new (*bmqtst::TestHelperUtil::allocator())
Expand Down Expand Up @@ -543,9 +546,7 @@ static void test6_searchConfirmedMessagesTest()
false);

// Configure parameters to search confirmed messages
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_confirmed = true;
// Prepare file manager
Expand Down Expand Up @@ -613,9 +614,7 @@ static void test7_searchPartiallyConfirmedMessagesTest()
&partiallyConfirmedGUIDS);

// Configure parameters to search partially confirmed messages
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_partiallyConfirmed = true;
// Prepare file manager
Expand Down Expand Up @@ -683,9 +682,7 @@ static void test8_searchMessagesByQueueKeyTest()
queueKey2);

// Configure parameters to search messages by queueKey1
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_queueKey.push_back(queueKey1);
// Prepare file manager
Expand Down Expand Up @@ -755,9 +752,7 @@ static void test9_searchMessagesByQueueNameTest()
}
QueueMap qMap(bmqtst::TestHelperUtil::allocator());

Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_queueName.push_back("queue1");
params.d_queueMap.insert(queueInfo);
Expand Down Expand Up @@ -832,9 +827,7 @@ static void test10_searchMessagesByQueueNameAndQueueKeyTest()
}
QueueMap qMap(bmqtst::TestHelperUtil::allocator());

Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_queueName.push_back("queue1");
params.d_queueMap.insert(queueInfo);
Expand Down Expand Up @@ -893,9 +886,7 @@ static void test11_searchMessagesByTimestamp()
const bsls::Types::Uint64 ts2 = 40 * journalFile.timestampIncrement();

// Configure parameters to search messages by timestamps
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_range.d_timestampGt = ts1;
params.d_range.d_timestampLt = ts2;
Expand Down Expand Up @@ -972,9 +963,7 @@ static void test12_printMessagesDetailsTest()
false);

// Configure parameters to print message details
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_details = true;
// Prepare file manager
Expand Down Expand Up @@ -1107,9 +1096,7 @@ static void test13_searchMessagesWithPayloadDumpTest()

// Configure parameters to search confirmed messages GUIDs with dumping
// messages payload.
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_confirmed = true;
params.d_dumpPayload = true;
Expand Down Expand Up @@ -1198,9 +1185,7 @@ static void test14_summaryTest()
&partiallyConfirmedGUIDS);

// Configure parameters to output summary
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_summary = true;
// Prepare file manager
Expand Down Expand Up @@ -1549,9 +1534,7 @@ static void test17_searchMessagesBySequenceNumbersRange()
const CompositeSequenceNumber seqNumLt(4, 6);

// Configure parameters to search messages by sequence number range
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_range.d_seqNumGt = seqNumGt;
params.d_range.d_seqNumLt = seqNumLt;
Expand Down Expand Up @@ -1624,9 +1607,7 @@ static void test18_searchMessagesByOffsetsRange()
mqbs::FileStoreProtocol::k_JOURNAL_RECORD_SIZE * 35 + k_HEADER_SIZE;

// Configure parameters to search messages by offsets
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_range.d_offsetGt = offsetGt;
params.d_range.d_offsetLt = offsetLt;
Expand Down Expand Up @@ -1697,13 +1678,13 @@ static void test19_searchQueueOpRecords()
mqbs::FileStoreProtocol::k_JOURNAL_RECORD_SIZE * 35 + k_HEADER_SIZE;

// Configure parameters to search queueOp records by offsets
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_processRecordTypes.d_message = false;
params.d_processRecordTypes.d_queueOp = true;
params.d_range.d_offsetGt = offsetGt;
params.d_range.d_offsetLt = offsetLt;

// Prepare file manager
bslma::ManagedPtr<FileManager> fileManager(
new (*bmqtst::TestHelperUtil::allocator())
Expand Down Expand Up @@ -1775,13 +1756,13 @@ static void test20_searchJournalOpRecords()
mqbs::FileStoreProtocol::k_JOURNAL_RECORD_SIZE * 35 + k_HEADER_SIZE;

// Configure parameters to search journalOp records by offsets
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_processRecordTypes.d_message = false;
params.d_processRecordTypes.d_journalOp = true;
params.d_range.d_offsetGt = offsetGt;
params.d_range.d_offsetLt = offsetLt;

// Prepare file manager
bslma::ManagedPtr<FileManager> fileManager(
new (*bmqtst::TestHelperUtil::allocator())
Expand Down Expand Up @@ -1853,9 +1834,8 @@ static void test21_searchAllTypesRecords()
mqbs::FileStoreProtocol::k_JOURNAL_RECORD_SIZE * 35 + k_HEADER_SIZE;

// Configure parameters to search journalOp records by offsets
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_processRecordTypes.d_message = true;
params.d_processRecordTypes.d_queueOp = true;
params.d_processRecordTypes.d_journalOp = true;
Expand Down Expand Up @@ -1954,9 +1934,8 @@ static void test22_searchQueueOpRecordsByOffset()
const size_t k_HEADER_OFFSET = sizeof(mqbs::FileHeader) / 2;

// Configure parameters to search queueOp records
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_processRecordTypes.d_message = false;
params.d_processRecordTypes.d_queueOp = true;

Expand Down Expand Up @@ -2029,9 +2008,8 @@ static void test23_searchJournalOpRecordsBySeqNumber()
journalFile.addAllTypesRecords(&records);

// Configure parameters to search journalOp
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_processRecordTypes.d_message = false;
params.d_processRecordTypes.d_journalOp = true;

Expand Down Expand Up @@ -2106,9 +2084,7 @@ static void test24_summaryWithQueueDetailsTest()
&partiallyConfirmedGUIDS);

// Configure parameters to output summary
Parameters params(
CommandLineArguments(bmqtst::TestHelperUtil::allocator()),
bmqtst::TestHelperUtil::allocator());
Parameters params = createTestParameters();

params.d_summary = true;
params.d_minRecordsPerQueue = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/applications/bmqstoragetool/m_bmqstoragetool_parameters.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ Parameters::ProcessRecordTypes::ProcessRecordTypes(bool enableDefault)

Parameters::Parameters(const CommandLineArguments& arguments,
bslma::Allocator* allocator)
: d_processRecordTypes(true)
: d_processRecordTypes(false)
, d_queueMap(allocator)
, d_range()
, d_guid(arguments.d_guid, allocator)
Expand Down

0 comments on commit e28074b

Please sign in to comment.