From 0c877043b5d788feaed15489aea589b21601055f Mon Sep 17 00:00:00 2001
From: Zixuan Liu <nodeces@gmail.com>
Date: Wed, 27 Jul 2022 18:50:48 +0800
Subject: [PATCH] Revert "[fix][ci] Fix tests memory leak due to mockito-inline
 (#15513)"

This reverts commit 14b95ecc45f73543fac1385a57fac8b6feeb2f5e.
---
 buildtools/pom.xml                            | 11 -----------
 .../pulsar/tests/MockitoCleanupListener.java  | 19 +++----------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index ccf2caaf4948e..b1508a28f23f5 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -50,7 +50,6 @@
     <guava.version>31.0.1-jre</guava.version>
     <ant.version>1.10.12</ant.version>
     <snakeyaml.version>1.30</snakeyaml.version>
-    <mockito.version>3.12.4</mockito.version>
     <!-- required for running tests on JDK11+ -->
     <test.additional.args>
       --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
@@ -133,16 +132,6 @@
       <version>4.1.77.Final</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>${mockito.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java b/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java
index 73fff1bb7e269..354a55c10e39f 100644
--- a/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java
+++ b/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java
@@ -18,7 +18,6 @@
  */
 package org.apache.pulsar.tests;
 
-import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,22 +36,10 @@ public class MockitoCleanupListener extends BetweenTestClassesListenerAdapter {
 
     @Override
     protected void onBetweenTestClasses(Class<?> endedTestClass, Class<?> startedTestClass) {
-        if (MOCKITO_CLEANUP_ENABLED) {
-            if (MockitoThreadLocalStateCleaner.INSTANCE.isEnabled()) {
-                LOG.info("Cleaning up Mockito's ThreadSafeMockingProgress.MOCKING_PROGRESS_PROVIDER thread local state.");
-                MockitoThreadLocalStateCleaner.INSTANCE.cleanup();
-            }
-            cleanupMockitoInline();
+        if (MOCKITO_CLEANUP_ENABLED && MockitoThreadLocalStateCleaner.INSTANCE.isEnabled()) {
+            LOG.info("Cleaning up Mockito's ThreadSafeMockingProgress.MOCKING_PROGRESS_PROVIDER thread local state.");
+            MockitoThreadLocalStateCleaner.INSTANCE.cleanup();
         }
     }
 
-    /**
-     * Mockito-inline can leak mocked objects, we need to clean up the inline mocks after every test.
-     * See <a href="https://javadoc.io/doc/org.mockito/mockito-core/latest/org/mockito/Mockito.html#47"}>
-     *     mockito docs</a>.
-     */
-    private void cleanupMockitoInline() {
-        Mockito.framework().clearInlineMocks();
-    }
-
 }