Merge pull request #1789 from mockito/sf

mockitoguy · web-flow · commit 30c50fa34420 · 2019-09-30T09:50:59.000-07:00
Fixed JUnit Jupiter parallel issue
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,8 @@ include("deprecatedPluginsTest",
     "junitJupiterExtensionTest",
     "module-test",
     "memory-test",
-    "errorprone")
+    "errorprone",
+    "junitJupiterParallelTest")
 
 rootProject.name = "mockito"
 
diff --git a/subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoExtension.java b/subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoExtension.java
@@ -5,25 +5,30 @@
 package org.mockito.junit.jupiter;
 
 
-import org.junit.jupiter.api.extension.*;
+import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.create;
+import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
+
+import java.lang.reflect.Parameter;
+import java.util.LinkedHashSet;
+import java.util.Optional;
+import java.util.Set;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.extension.TestInstancePostProcessor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoSession;
+import org.mockito.internal.configuration.MockAnnotationProcessor;
 import org.mockito.internal.configuration.plugins.Plugins;
 import org.mockito.internal.session.MockitoSessionLoggerAdapter;
-import org.mockito.internal.configuration.MockAnnotationProcessor;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.quality.Strictness;
 
-import java.lang.reflect.Parameter;
-import java.util.LinkedHashSet;
-import java.util.Optional;
-import java.util.Set;
-
-import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.create;
-import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
-
 /**
  * Extension that initializes mocks and handles strict stubbings. This extension is the JUnit Jupiter equivalent
  * of our JUnit4 {@link MockitoJUnitRunner}.
@@ -188,19 +193,30 @@ private Optional<MockitoSettings> retrieveAnnotationFromTestClasses(final Extens
     }
 
     private void collectParentTestInstances(ExtensionContext context, Set<Object> testInstances) {
-        Optional<ExtensionContext> parent = context.getParent();
+        Optional<ExtensionContext> initialParent = context.getParent();
 
-        while (parent.isPresent() && parent.get() != context.getRoot()) {
-            ExtensionContext parentContext = parent.get();
+        // Ignoring first parent avoids parallel execution issues
+        // We can ignore the first parent because it has the test instance that is already in 'testInstances'
+        // See how 'testInstances' is populated
+        initialParent.ifPresent(parent -> collectParentTestInstance(parent.getParent(), context, testInstances));
+    }
 
-            Object testInstance = parentContext.getStore(MOCKITO).remove(TEST_INSTANCE);
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+    private void collectParentTestInstance(
+        Optional<ExtensionContext> parent, ExtensionContext context,
+        Set<Object> testInstances) {
 
-            if (testInstance != null) {
-                testInstances.add(testInstance);
-            }
+        parent.ifPresent(currentParent -> {
+            if (currentParent != context.getRoot()) {
+                Object testInstance = currentParent.getStore(MOCKITO).remove(TEST_INSTANCE);
 
-            parent = parentContext.getParent();
-        }
+                if (testInstance != null) {
+                    testInstances.add(testInstance);
+                }
+
+                collectParentTestInstance(currentParent.getParent(), context, testInstances);
+            }
+        });
     }
 
     /**
diff --git a/subprojects/junitJupiterParallelTest/junitJupiterParallelTest.gradle b/subprojects/junitJupiterParallelTest/junitJupiterParallelTest.gradle
@@ -0,0 +1,15 @@
+description = "Tests that require fine tuned parallel settings for JUnit Jupiter (bug #1630)"
+
+apply from: "$rootDir/gradle/dependencies.gradle"
+
+apply plugin: "java"
+
+dependencies {
+    testImplementation libraries.junitJupiterApi
+    testImplementation project(":junit-jupiter")
+    testRuntime libraries.junitJupiterEngine
+}
+
+test {
+    useJUnitPlatform()
+}
diff --git a/subprojects/junitJupiterParallelTest/src/test/java/org/mockito/ParallelBugTest.java b/subprojects/junitJupiterParallelTest/src/test/java/org/mockito/ParallelBugTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2019 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+/**
+ * See bug #1630
+ */
+@ExtendWith(MockitoExtension.class)
+class ParallelBugTest {
+
+    @Mock
+    private SomeService someService;
+
+    @InjectMocks
+    private AnotherService anotherService;
+
+    @Test
+    void test() {
+        perform();
+    }
+
+    private void perform() {
+        // when
+        anotherService.callSomeService();
+
+        // then
+        Mockito.verify(someService).doSomething();
+    }
+
+    @Test
+    void test2() {
+        perform();
+    }
+
+    @Test
+    void test3() {
+        perform();
+    }
+
+    @Test
+    void test4() {
+        perform();
+    }
+
+    @Test
+    void test5() {
+        perform();
+    }
+
+    @Test
+    void test6() {
+        perform();
+    }
+
+    @Test
+    void test7() {
+        perform();
+    }
+
+    public static class AnotherService {
+        private final SomeService someService;
+
+        public AnotherService(final SomeService someService) {
+            this.someService = someService;
+        }
+
+        void callSomeService() {
+            someService.doSomething();
+        }
+    }
+
+    static class SomeService {
+
+        void doSomething() {
+        }
+    }
+}
diff --git a/subprojects/junitJupiterParallelTest/src/test/resources/junit-platform.properties b/subprojects/junitJupiterParallelTest/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled=true
+junit.jupiter.execution.parallel.config.strategy=dynamic
+junit.jupiter.execution.parallel.mode.default=concurrent

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+junit.jupiter.execution.parallel.enabled=true`
	`2`	`+junit.jupiter.execution.parallel.config.strategy=dynamic`
	`3`	`+junit.jupiter.execution.parallel.mode.default=concurrent`