test formatting

1 files changed, 28 insertions, 60 deletions

diff --git a/src/mongo/db/session_test.cpp b/src/mongo/db/session_test.cpp
index 59294301ec7..248da45d091 100644
--- a/src/mongo/db/session_test.cpp
+++ b/src/mongo/db/session_test.cpp
@@ -1473,53 +1473,37 @@ TEST_F(SessionTest, TrackTotalActiveAndInactiveTransactionsWithCommit) {
     opCtx()->setLogicalSessionId(sessionId);
     opCtx()->setTxnNumber(txnNum);
 
-    unsigned long long firstActiveCounter =
+    unsigned long long beforeActiveCounter =
         ServerTransactionsMetrics::get(opCtx())->getCurrentActive();
-    unsigned long long firstInactiveCounter =
+    unsigned long long beforeInactiveCounter =
         ServerTransactionsMetrics::get(opCtx())->getCurrentInactive();
 
     // Tests that the first unstash only increments the active counter only.
     session.beginOrContinueTxn(opCtx(), txnNum, false, true, "testDB", "insert");
     session.unstashTransactionResources(opCtx(), "insert");
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(), firstActiveCounter + 1U);
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), firstInactiveCounter);
-
-    unsigned long long secondActiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentActive();
-    unsigned long long secondInactiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentInactive();
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(),
+              beforeActiveCounter + 1U);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), beforeInactiveCounter);
 
     // Tests that stashing the transaction resources decrements active counter and increments
     // inactive counter.
     { Lock::GlobalLock lk(opCtx(), MODE_IX, Date_t::now(), Lock::InterruptBehavior::kThrow); }
     session.stashTransactionResources(opCtx());
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(),
-              secondActiveCounter - 1U);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(), beforeActiveCounter);
     ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(),
-              secondInactiveCounter + 1U);
-
-    unsigned long long thirdActiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentActive();
-    unsigned long long thirdInactiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentInactive();
+              beforeInactiveCounter + 1U);
 
     // Tests that the second unstash increments the active counter and decrements the inactive
     // counter.
     session.unstashTransactionResources(opCtx(), "insert");
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(), thirdActiveCounter + 1U);
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(),
-              thirdInactiveCounter - 1U);
-
-    unsigned long long fourthActiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentActive();
-    unsigned long long fourthInactiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentInactive();
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(),
+              beforeActiveCounter + 1U);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), beforeInactiveCounter);
 
     // Tests that committing a transaction decrements the active counter only.
     session.commitTransaction(opCtx());
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(),
-              fourthActiveCounter - 1U);
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), fourthInactiveCounter);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(), beforeActiveCounter);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), beforeInactiveCounter);
 }
 
 TEST_F(SessionTest, TrackTotalActiveAndInactiveTransactionsWithStashedAbort) {
@@ -1531,41 +1515,30 @@ TEST_F(SessionTest, TrackTotalActiveAndInactiveTransactionsWithStashedAbort) {
     opCtx()->setLogicalSessionId(sessionId);
     opCtx()->setTxnNumber(txnNum);
 
-    unsigned long long firstActiveCounter =
+    unsigned long long beforeActiveCounter =
         ServerTransactionsMetrics::get(opCtx())->getCurrentActive();
-    unsigned long long firstInactiveCounter =
+    unsigned long long beforeInactiveCounter =
         ServerTransactionsMetrics::get(opCtx())->getCurrentInactive();
 
     // Tests that the first unstash only increments the active counter only.
     session.beginOrContinueTxn(opCtx(), txnNum, false, true, "testDB", "insert");
     session.unstashTransactionResources(opCtx(), "insert");
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(), firstActiveCounter + 1U);
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), firstInactiveCounter);
-
-    unsigned long long secondActiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentActive();
-    unsigned long long secondInactiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentInactive();
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(),
+              beforeActiveCounter + 1U);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), beforeInactiveCounter);
 
     // Tests that stashing the transaction resources decrements active counter and increments
     // inactive counter.
     { Lock::GlobalLock lk(opCtx(), MODE_IX, Date_t::now(), Lock::InterruptBehavior::kThrow); }
     session.stashTransactionResources(opCtx());
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(),
-              secondActiveCounter - 1U);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(), beforeActiveCounter);
     ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(),
-              secondInactiveCounter + 1U);
-
-    unsigned long long thirdActiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentActive();
-    unsigned long long thirdInactiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentInactive();
+              beforeInactiveCounter + 1U);
 
     // Tests that aborting a stashed transaction decrements the inactive counter only.
     session.abortArbitraryTransaction();
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(), thirdActiveCounter);
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(),
-              thirdInactiveCounter - 1U);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(), beforeActiveCounter);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), beforeInactiveCounter);
 }
 
 TEST_F(SessionTest, TrackTotalActiveAndInactiveTransactionsWithUnstashedAbort) {
@@ -1577,27 +1550,22 @@ TEST_F(SessionTest, TrackTotalActiveAndInactiveTransactionsWithUnstashedAbort) {
     opCtx()->setLogicalSessionId(sessionId);
     opCtx()->setTxnNumber(txnNum);
 
-    unsigned long long firstActiveCounter =
+    unsigned long long beforeActiveCounter =
         ServerTransactionsMetrics::get(opCtx())->getCurrentActive();
-    unsigned long long firstInactiveCounter =
+    unsigned long long beforeInactiveCounter =
         ServerTransactionsMetrics::get(opCtx())->getCurrentInactive();
 
     // Tests that the first unstash only increments the active counter only.
     session.beginOrContinueTxn(opCtx(), txnNum, false, true, "testDB", "insert");
     session.unstashTransactionResources(opCtx(), "insert");
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(), firstActiveCounter + 1U);
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), firstInactiveCounter);
-
-    unsigned long long secondActiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentActive();
-    unsigned long long secondInactiveCounter =
-        ServerTransactionsMetrics::get(opCtx())->getCurrentInactive();
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(),
+              beforeActiveCounter + 1U);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), beforeInactiveCounter);
 
     // Tests that aborting a stashed transaction decrements the active counter only.
     session.abortArbitraryTransaction();
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(),
-              secondActiveCounter - 1U);
-    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), secondInactiveCounter);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentActive(), beforeActiveCounter);
+    ASSERT_EQ(ServerTransactionsMetrics::get(opCtx())->getCurrentInactive(), beforeInactiveCounter);
 }
 
 /**