Fix bmqstoragetool-related enterprise CI fails (bloomberg#253)

Signed-off-by: Anton Pryakhin <[email protected]> Co-authored-by: Evgeny Malygin <[email protected]>
alexander-e1off · Oct 24, 2024 · 95ae384 · 95ae384
1 parent b8d3c4b
commit 95ae384
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/src/applications/bmqstoragetool/m_bmqstoragetool_commandprocessorfactory.t.cpp b/src/applications/bmqstoragetool/m_bmqstoragetool_commandprocessorfactory.t.cpp
@@ -56,8 +56,7 @@ static void test1_breathingTest()
                                                         fileManager,
                                                         bsl::cout,
                                                         s_allocator_p);
-    ASSERT_NE(dynamic_cast<JournalFileProcessor*>(cmdProcessor.get()),
-              bsl::nullptr_t());
+    ASSERT(dynamic_cast<JournalFileProcessor*>(cmdProcessor.get()) != 0);
 }
 
 // ============================================================================

diff --git a/src/applications/bmqstoragetool/m_bmqstoragetool_journalfileprocessor.t.cpp b/src/applications/bmqstoragetool/m_bmqstoragetool_journalfileprocessor.t.cpp
@@ -515,9 +515,8 @@ static void test8_searchMessagesByQueueKeyTest()
                                                   queueKey2);
 
     // Configure parameters to search messages by queueKey1
-    Parameters               params(s_allocator_p);
-    bsl::vector<bsl::string> queueKeys(1, queueKey1, s_allocator_p);
-    params.d_queueKey = bsl::move(queueKeys);
+    Parameters params(s_allocator_p);
+    params.d_queueKey.push_back(queueKey1);
     // Prepare file manager
     bslma::ManagedPtr<FileManager> fileManager(
         new (*s_allocator_p) FileManagerMock(journalFile, s_allocator_p),
@@ -652,9 +651,7 @@ static void test10_searchMessagesByQueueNameAndQueueKeyTest()
     Parameters params(s_allocator_p);
     params.d_queueName.push_back("queue1");
     params.d_queueMap.insert(queueInfo);
-
-    bsl::vector<bsl::string> queueKeys(1, queueKey2, s_allocator_p);
-    params.d_queueKey = bsl::move(queueKeys);
+    params.d_queueKey.push_back(queueKey2);
 
     // Prepare file manager
     bslma::ManagedPtr<FileManager> fileManager(

diff --git a/src/applications/bmqstoragetool/m_bmqstoragetool_searchresultfactory.t.cpp b/src/applications/bmqstoragetool/m_bmqstoragetool_searchresultfactory.t.cpp
@@ -56,8 +56,7 @@ static void test1_breathingTest()
                                                 fileManager,
                                                 bsl::cout,
                                                 s_allocator_p);
-    ASSERT_NE(dynamic_cast<SearchResult*>(searchResult.get()),
-              bsl::nullptr_t());
+    ASSERT(dynamic_cast<SearchResult*>(searchResult.get()) != 0);
 }
 
 // ============================================================================

diff --git a/src/applications/bmqstoragetool/m_bmqstoragetool_testutils.h b/src/applications/bmqstoragetool/m_bmqstoragetool_testutils.h
@@ -226,6 +226,8 @@ class FileManagerMock : public FileManager {
 
     mqbs::JournalFileIterator d_journalFileIt;
     // Journal file iterator.
+    mqbs::DataFileIterator d_dataFileIt;
+    // Data file iterator.
 
   public:
     // CREATORS
@@ -234,7 +236,7 @@ class FileManagerMock : public FileManager {
     explicit FileManagerMock(bslma::Allocator* allocator = 0)
     {
         EXPECT_CALL(*this, dataFileIterator())
-            .WillRepeatedly(Return(bsl::nullptr_t()));
+            .WillRepeatedly(Return(&d_dataFileIt));
     }
 
     /// Constructor using the specified `journalFile` and `allocator`.
@@ -245,7 +247,7 @@ class FileManagerMock : public FileManager {
                       false)
     {
         EXPECT_CALL(*this, dataFileIterator())
-            .WillRepeatedly(Return(bsl::nullptr_t()));
+            .WillRepeatedly(Return(&d_dataFileIt));
     }
 
     // MANIPULATORS