Fix merge conflicts from storagetool-add-seqnum branch

Signed-off-by: Aleksandr Ivanov <[email protected]>
bloomberg · Dec 3, 2024 · 70ffcb2 · 70ffcb2
2 parents 465e609 + 10b24b5
commit 70ffcb2
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/src/applications/bmqstoragetool/m_bmqstoragetool_compositesequencenumber.t.cpp b/src/applications/bmqstoragetool/m_bmqstoragetool_compositesequencenumber.t.cpp
@@ -71,13 +71,14 @@ static void test2_fromStringTest()
 {
     bmqtst::TestHelper::printTestName("FROM STRING TEST");
 
-    bmqu::MemOutStream errorDescription(s_allocator_p);
+    bmqu::MemOutStream errorDescription(bmqtst::TestHelperUtil::allocator());
 
     // Valid string
     {
         CompositeSequenceNumber compositeSeqNum;
 
-        bsl::string inputString("123-456", s_allocator_p);
+        bsl::string inputString("123-456",
+                                bmqtst::TestHelperUtil::allocator());
 
         compositeSeqNum.fromString(errorDescription, inputString);
         ASSERT(compositeSeqNum.isSet());
@@ -90,7 +91,8 @@ static void test2_fromStringTest()
     {
         CompositeSequenceNumber compositeSeqNum;
 
-        bsl::string inputString("00123-000456", s_allocator_p);
+        bsl::string inputString("00123-000456",
+                                bmqtst::TestHelperUtil::allocator());
 
         compositeSeqNum.fromString(errorDescription, inputString);
         ASSERT(compositeSeqNum.isSet());
@@ -103,7 +105,7 @@ static void test2_fromStringTest()
     {
         CompositeSequenceNumber compositeSeqNum;
 
-        bsl::string inputString("", s_allocator_p);
+        bsl::string inputString("", bmqtst::TestHelperUtil::allocator());
 
         compositeSeqNum.fromString(errorDescription, inputString);
         ASSERT_EQ(compositeSeqNum.isSet(), false);
@@ -115,7 +117,7 @@ static void test2_fromStringTest()
     {
         CompositeSequenceNumber compositeSeqNum;
 
-        bsl::string inputString("123456", s_allocator_p);
+        bsl::string inputString("123456", bmqtst::TestHelperUtil::allocator());
         errorDescription.reset();
 
         compositeSeqNum.fromString(errorDescription, inputString);
@@ -129,7 +131,8 @@ static void test2_fromStringTest()
     {
         CompositeSequenceNumber compositeSeqNum;
 
-        bsl::string inputString("123_456", s_allocator_p);
+        bsl::string inputString("123_456",
+                                bmqtst::TestHelperUtil::allocator());
         errorDescription.reset();
 
         compositeSeqNum.fromString(errorDescription, inputString);
@@ -143,7 +146,8 @@ static void test2_fromStringTest()
     {
         CompositeSequenceNumber compositeSeqNum;
 
-        bsl::string inputString("1a23-456", s_allocator_p);
+        bsl::string inputString("1a23-456",
+                                bmqtst::TestHelperUtil::allocator());
         errorDescription.reset();
 
         compositeSeqNum.fromString(errorDescription, inputString);
@@ -157,7 +161,8 @@ static void test2_fromStringTest()
     {
         CompositeSequenceNumber compositeSeqNum;
 
-        bsl::string inputString("123-45a6", s_allocator_p);
+        bsl::string inputString("123-45a6",
+                                bmqtst::TestHelperUtil::allocator());
         errorDescription.reset();
 
         compositeSeqNum.fromString(errorDescription, inputString);
@@ -171,7 +176,7 @@ static void test2_fromStringTest()
     {
         CompositeSequenceNumber compositeSeqNum;
 
-        bsl::string inputString("0-456", s_allocator_p);
+        bsl::string inputString("0-456", bmqtst::TestHelperUtil::allocator());
         errorDescription.reset();
 
         compositeSeqNum.fromString(errorDescription, inputString);
@@ -185,7 +190,7 @@ static void test2_fromStringTest()
     {
         CompositeSequenceNumber compositeSeqNum;
 
-        bsl::string inputString("123-0", s_allocator_p);
+        bsl::string inputString("123-0", bmqtst::TestHelperUtil::allocator());
         errorDescription.reset();
 
         compositeSeqNum.fromString(errorDescription, inputString);
@@ -200,7 +205,8 @@ static void test2_fromStringTest()
         CompositeSequenceNumber compositeSeqNum;
 
         // Simulate unsigned int overflow
-        bsl::string inputString("11111111111-123", s_allocator_p);
+        bsl::string inputString("11111111111-123",
+                                bmqtst::TestHelperUtil::allocator());
         errorDescription.reset();
 
         compositeSeqNum.fromString(errorDescription, inputString);
@@ -215,7 +221,8 @@ static void test2_fromStringTest()
         CompositeSequenceNumber compositeSeqNum;
 
         // Simulate bsls::Types::Uint64 overflow
-        bsl::string inputString("123-111111111111111111111", s_allocator_p);
+        bsl::string inputString("123-111111111111111111111",
+                                bmqtst::TestHelperUtil::allocator());
         errorDescription.reset();
 
         compositeSeqNum.fromString(errorDescription, inputString);
@@ -311,7 +318,7 @@ int main(int argc, char* argv[])
     case 3: test3_comparisonTest(); break;
     default: {
         cerr << "WARNING: CASE '" << _testCase << "' NOT FOUND." << endl;
-        s_testStatus = -1;
+        bmqtst::TestHelperUtil::testStatus() = -1;
     } break;
     }