SERVER-62395 Use tid field to create namespace on non-txn commands during oplog application

1 files changed, 4 insertions, 6 deletions

diff --git a/src/mongo/db/op_observer/op_observer_impl_test.cpp b/src/mongo/db/op_observer/op_observer_impl_test.cpp
index 4c7b546f925..a3bdd9c2155 100644
--- a/src/mongo/db/op_observer/op_observer_impl_test.cpp
+++ b/src/mongo/db/op_observer/op_observer_impl_test.cpp
@@ -689,8 +689,8 @@ TEST_F(OpObserverTest, OnRenameCollectionIncludesTenantIdFeatureFlagOff) {
     auto dropTargetUuid = UUID::gen();
     auto stayTemp = false;
     auto tid{TenantId(OID::gen())};  // rename should not occur across tenants
-    NamespaceString sourceNss(boost::none, str::stream() << tid.toString() << "_test.foo");
-    NamespaceString targetNss(boost::none, str::stream() << tid.toString() << "_test.bar");
+    NamespaceString sourceNss(tid, "test.foo");
+    NamespaceString targetNss(tid, "test.bar");
 
     // Write to the oplog.
     {
@@ -707,10 +707,8 @@ TEST_F(OpObserverTest, OnRenameCollectionIncludesTenantIdFeatureFlagOff) {
     // Ensure that renameCollection fields were properly added to oplog entry.
     ASSERT_EQUALS(uuid, unittest::assertGet(UUID::parse(oplogEntryObj["ui"])));
     ASSERT_FALSE(oplogEntry.getTid());
-    // TODO: SERVER-62395: Assert sourceNss and oplogEntry.getNss() are equal.
-    ASSERT_EQUALS(NamespaceStringUtil::deserialize(
-                      boost::none, str::stream() << sourceNss.dbName().toString() << ".$cmd"),
-                  oplogEntry.getNss());
+    ASSERT_EQUALS(sourceNss.getCommandNS(), oplogEntry.getNss());
+
     auto oExpected = BSON("renameCollection" << sourceNss.toStringWithTenantId() << "to"
                                              << targetNss.toStringWithTenantId() << "stayTemp"
                                              << stayTemp << "dropTarget" << dropTargetUuid);