Skip to content

Commit 60b60b8

Browse files
author
Alberto Scotto
committed
Mockito: avoid using MockitoJUnitRunner; use MockitoRule instead
As it turns out, MockitoJUnitRunner is a pretty heavily customized JUnit runner, as it doesn't extend neither ParentRunner nor BlockJUnit4ClassRunner.
1 parent 96ff443 commit 60b60b8

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package me.alb_i986;
2+
3+
import org.junit.Rule;
4+
import org.mockito.junit.MockitoJUnit;
5+
import org.mockito.junit.MockitoRule;
6+
7+
/**
8+
* Base class for unit tests which use {@link org.mockito.Mockito}.
9+
* <p>
10+
* It provides a {@link MockitoRule}.
11+
*/
12+
public abstract class BaseMockitoTestClass {
13+
@Rule
14+
public MockitoRule mockitoRule = MockitoJUnit.rule();
15+
}

src/test/java/me/alb_i986/selenium/junit/rules/DriverServiceResourceTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
package me.alb_i986.selenium.junit.rules;
22

3+
import me.alb_i986.BaseMockitoTestClass;
34
import org.junit.Test;
4-
import org.junit.runner.RunWith;
55
import org.mockito.Mock;
6-
import org.mockito.runners.MockitoJUnitRunner;
76
import org.openqa.selenium.remote.service.DriverService;
87

98
import static org.hamcrest.Matchers.equalTo;
109
import static org.junit.Assert.assertThat;
1110
import static org.junit.Assert.fail;
1211
import static org.mockito.BDDMockito.verify;
1312

14-
@RunWith(MockitoJUnitRunner.class)
15-
public class DriverServiceResourceTest {
13+
public class DriverServiceResourceTest extends BaseMockitoTestClass {
1614

1715
@Mock private DriverService mockedService;
1816

src/test/java/me/alb_i986/selenium/junit/rules/TakeScreenshotOnFailureRuleTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
package me.alb_i986.selenium.junit.rules;
22

3+
import me.alb_i986.BaseMockitoTestClass;
34
import org.junit.Assert;
45
import org.junit.Test;
56
import org.junit.runner.Description;
6-
import org.junit.runner.RunWith;
77
import org.mockito.Mock;
8-
import org.mockito.runners.MockitoJUnitRunner;
98
import org.openqa.selenium.OutputType;
109
import org.openqa.selenium.TakesScreenshot;
1110
import org.openqa.selenium.WebDriverException;
1211

1312
import static org.mockito.BDDMockito.given;
1413
import static org.mockito.BDDMockito.verify;
1514

16-
@RunWith(MockitoJUnitRunner.class)
17-
public class TakeScreenshotOnFailureRuleTest {
15+
public class TakeScreenshotOnFailureRuleTest extends BaseMockitoTestClass {
1816

1917
@Mock private TakesScreenshot mockedDriver;
2018

src/test/java/me/alb_i986/selenium/junit/rules/WebDriverResourceTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package me.alb_i986.selenium.junit.rules;
22

3+
import me.alb_i986.BaseMockitoTestClass;
34
import me.alb_i986.selenium.DummyDriver;
45
import me.alb_i986.selenium.DummyDriverFactory;
56
import me.alb_i986.selenium.WebDriverFactory;
67
import org.junit.Test;
7-
import org.junit.runner.RunWith;
88
import org.mockito.Mock;
9-
import org.mockito.runners.MockitoJUnitRunner;
109
import org.openqa.selenium.WebDriver;
1110
import org.openqa.selenium.WebDriverException;
1211

@@ -18,8 +17,7 @@
1817
import static org.mockito.BDDMockito.given;
1918
import static org.mockito.BDDMockito.verify;
2019

21-
@RunWith(MockitoJUnitRunner.class)
22-
public class WebDriverResourceTest {
20+
public class WebDriverResourceTest extends BaseMockitoTestClass {
2321

2422
@Mock private WebDriverFactory mockedDriverFactory;
2523
@Mock private WebDriver mockedDriver;

0 commit comments

Comments
 (0)