Merge pull request #41 from mockito/fix-40

Start MockitoSession only for test method and BeforeMethod

Author: slawekjaranowski

README.md

@@ -63,6 +63,7 @@ By default `MockitoSession` is started with `STRICT_STUBS`.
 You can change this behavior by adding `@MockitoSettings` to your test class.
 
 ```java
+import org.mockito.quality.Strictness;
 import org.mockito.testng.MockitoTestNGListener;
 import org.mockito.testng.MockitoSettings;
 import org.testng.annotations.Listeners;
@@ -74,6 +75,11 @@ public class MyTest {
 }
 ```
 
+## Notices
+
+ - `MockitoSession` is started before each `test method` or before method annotated with `@BeforeMethod`,
+   another annotations `@BeforeXXX` aren't supported #40
+   
 ## Developing
 
 - open in IDEA to develop or run ```./gradlew idea``` and then open in IDEA

src/main/java/org/mockito/testng/MockitoTestNGListener.java

@@ -19,7 +19,6 @@
 import org.mockito.quality.Strictness;
 import org.testng.IInvokedMethod;
 import org.testng.IInvokedMethodListener;
-import org.testng.ITestNGMethod;
 import org.testng.ITestResult;
 import org.testng.annotations.Listeners;
 
@@ -30,8 +29,9 @@
  *
  * <ul>
  *     <li>
- *         Before any TestNG method, either a <em>configuration method</em> (&#064;BeforeMethod, &#064;BeforeClass, etc)
- *         or a <em>test</em> method MockitoSession is started by:
+ *         Before any <em>test</em> method or a <em>configuration method</em> <em>&#064;BeforeMethod</em>
+ *         MockitoSession is started by:
+ *
  *         <pre class="code"><code class="java">
  *         Mockito.mockitoSession()
  *          .initMocks(testInstance)
@@ -125,16 +125,11 @@ public void afterInvocation(IInvokedMethod method, ITestResult testResult) {
     }
 
     private boolean shouldBeRunBeforeInvocation(IInvokedMethod method, ITestResult testResult) {
-        return !isAfterConfigurationMethod(method) && hasMockitoTestNGListener(testResult);
+        return (method.isTestMethod() || isBeforeMethod(method)) && hasMockitoTestNGListener(testResult);
     }
 
-    private boolean isAfterConfigurationMethod(IInvokedMethod method) {
-        ITestNGMethod testMethod = method.getTestMethod();
-        return testMethod.isAfterClassConfiguration()
-                || testMethod.isAfterMethodConfiguration()
-                || testMethod.isAfterGroupsConfiguration()
-                || testMethod.isAfterTestConfiguration()
-                || testMethod.isAfterSuiteConfiguration();
+    private boolean isBeforeMethod(IInvokedMethod method) {
+        return method.getTestMethod().isBeforeMethodConfiguration();
     }
 
     private boolean shouldBeRunAfterInvocation(IInvokedMethod method, ITestResult testResult) {

src/test/java/org/mockitousage/testng/EnsureMocksAreInitializedBeforeBeforeClassMethodTest.java src/test/java/org/mockitousage/testng/EnsureMocksAreNotInitializedBeforeBeforeClassMethodTest.java

@@ -1,30 +1,37 @@
 /*
- * Copyright (c) 2017 Mockito contributors
+ * Copyright (c) 2021 Mockito contributors
  * This program is made available under the terms of the MIT License.
  */
 package org.mockitousage.testng;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Observer;
+
 import org.mockito.Mock;
 import org.mockito.testng.MockitoTestNGListener;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
-import java.util.Observer;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 @Listeners(MockitoTestNGListener.class)
-public class EnsureMocksAreInitializedBeforeBeforeClassMethodTest {
+public class EnsureMocksAreNotInitializedBeforeBeforeClassMethodTest {
 
-    @Mock Observer observer;
+    @Mock
+    Observer observer;
 
     @BeforeClass
-    private void make_sure_mock_is_initialized() {
+    private void make_sure_mock_is_not_initialized() {
+        assertThat(observer).isNull();
+    }
+
+    @Test
+    public void dummy_test1() {
         assertThat(observer).isNotNull();
     }
 
     @Test
-    public void dummy_test_see_BeforeClass_code() throws Exception {
+    public void dummy_test2() {
+        assertThat(observer).isNotNull();
     }
 }

src/test/java/org/mockitousage/testng/EnsureMocksAreNotInitializedBeforeBeforeGroupsMethodTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockitousage.testng;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Observer;
+
+import org.mockito.Mock;
+import org.mockito.testng.MockitoTestNGListener;
+import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+@Listeners(MockitoTestNGListener.class)
+public class EnsureMocksAreNotInitializedBeforeBeforeGroupsMethodTest {
+
+    @Mock
+    Observer observer;
+
+    @BeforeGroups
+    private void make_sure_mock_is_not_initialized() {
+        assertThat(observer).isNull();
+    }
+
+    @Test
+    public void dummy_test1() {
+        assertThat(observer).isNotNull();
+    }
+
+    @Test
+    public void dummy_test2() {
+        assertThat(observer).isNotNull();
+    }
+}

src/test/java/org/mockitousage/testng/EnsureMocksAreNotInitializedBeforeBeforeSuiteMethodTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockitousage.testng;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Observer;
+
+import org.mockito.Mock;
+import org.mockito.testng.MockitoTestNGListener;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+@Listeners(MockitoTestNGListener.class)
+public class EnsureMocksAreNotInitializedBeforeBeforeSuiteMethodTest {
+
+    @Mock
+    Observer observer;
+
+    @BeforeSuite
+    private void make_sure_mock_is_not_initialized() {
+        assertThat(observer).isNull();
+    }
+
+    @Test
+    public void dummy_test1() {
+        assertThat(observer).isNotNull();
+    }
+
+    @Test
+    public void dummy_test2() {
+        assertThat(observer).isNotNull();
+    }
+}

src/test/java/org/mockitousage/testng/EnsureMocksAreNotInitializedBeforeBeforeTestMethodTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockitousage.testng;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Observer;
+
+import org.mockito.Mock;
+import org.mockito.testng.MockitoTestNGListener;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+@Listeners(MockitoTestNGListener.class)
+public class EnsureMocksAreNotInitializedBeforeBeforeTestMethodTest {
+
+    @Mock
+    Observer observer;
+
+    @BeforeTest
+    private void make_sure_mock_is_not_initialized() {
+        assertThat(observer).isNull();
+    }
+
+    @Test
+    public void dummy_test1() {
+        assertThat(observer).isNotNull();
+    }
+
+    @Test
+    public void dummy_test2() {
+        assertThat(observer).isNotNull();
+    }
+}

src/test/java/org/mockitousage/testng/failuretests/HasUnusedStubs.java

@@ -13,7 +13,7 @@
 @Test(description = "Always failing, shouldn't be listed in 'mockito-testng.xml'")
 public class HasUnusedStubs {
     @Mock
-    List mock;
+    List<String> mock;
     @Test public void test() {
         when(mock.add("a")).thenReturn(true);
     }

version.properties

@@ -1 +1 @@
-version=0.2.*
+version=0.3.*