Skip to content

Commit a4c266f

Browse files
authored
Merge pull request #70 from picimako/131
v1.3.1
2 parents f7d8e7a + d66628e commit a4c266f

File tree

5 files changed

+17
-9
lines changed

5 files changed

+17
-9
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
## [Unreleased]
66

7+
## [1.3.1]
8+
### Changed
9+
- [69](https://github.com/picimako/mockitools/issues/69): Temporarily remove the inspection introduced in [55](https://github.com/picimako/mockitools/issues/55) to further investigate its viability.
10+
711
## [1.3.0]
812
### Added
913
- The inspection reporting spy creation on a mock object now also recognizes passed in mock objects when they are created

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ tasks {
9595
//See https://app.slack.com/client/T5P9YATH9/C5U8BM1MK/thread/C5U8BM1MK-1639934273.054400
9696
isScanForTestClasses = false
9797
include("**/*Test.class")
98+
exclude("**/MockFieldInitializationInspectionTest.class")
9899
}
99100

100101
// runPluginVerifier {

docs/mock_creation.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,13 +485,15 @@ Mockito.mock(MockType.class, withSettings().defaultAnswer(Answers.RETURNS_MOCKS)
485485

486486
![](https://img.shields.io/badge/inspection-orange) ![](https://img.shields.io/badge/since-1.3.0-blue) [![](https://img.shields.io/badge/implementation-MockFieldInitializationInspection-blue)](../src/main/java/com/picimako/mockitools/inspection/mocking/MockFieldInitializationInspection.java)
487487

488+
NOTE: this inspection has been temporarily removed in Mockitools v1.3.1 for further investigation of its viability.
489+
488490
Since `@Mock` and `@InjectMocks` annotated fields are initialized automagically by Mockito via `MockitoJUnitRunner`, `MockitoJUnit.rule()` or
489491
`MockitoAnnotations.initMocks()/openMocks()`, there is no need to explicitly initialize them.
490492

491493
This inspection reports `@Mock` and `@InjectMocks` fields that have an initializer specified.
492494

493495
```java
494-
class CaptorTest {
496+
class MockTest {
495497
@Mock
496498
public MockObject mock = Mockito.mock();
497499
}
@@ -500,7 +502,7 @@ class CaptorTest {
500502
You can also apply a quick fix (*Remove initializer*) on it, so that the initializer may be removed. The code will then become:
501503

502504
```java
503-
class CaptorTest {
505+
class MockTest {
504506
@Mock
505507
public MockObject mock;
506508
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pluginGroup = com.picimako.mockitools
44
pluginName = Mockitools
5-
pluginVersion = 1.3.0
5+
pluginVersion = 1.3.1
66

77
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
88
pluginSinceBuild = 233.11799.241

src/main/resources/META-INF/plugin.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<id>mockitools</id>
44
<name>Mockitools</name>
55
<vendor url="https://github.com/picimako/mockitools">Tamás Balog</vendor>
6-
<version>1.3.0</version>
6+
<version>1.3.1</version>
77
<resource-bundle>messages.MockitoolsBundle</resource-bundle>
88

99
<description>Provides integration for the Mockito framework for Java.</description>
@@ -47,11 +47,12 @@
4747
id="mockitools.extraInterfaces" language="JAVA"
4848
displayName="@Mock#extraInterfaces and MockSettings.extraInterfaces() validations" groupPath="Java"
4949
groupName="Mockito" enabledByDefault="true" level="ERROR"/>
50-
<localInspection
51-
implementationClass="com.picimako.mockitools.inspection.mocking.MockFieldInitializationInspection"
52-
id="mockitools.mockFieldInitialization" language="JAVA"
53-
displayName="@Mock or @InjectMocks field is explicitly initialized" groupPath="Java"
54-
groupName="Mockito" enabledByDefault="true" level="WARNING"/>
50+
<!-- Disabled due to https://github.com/picimako/mockitools/issues/69 -->
51+
<!-- <localInspection-->
52+
<!-- implementationClass="com.picimako.mockitools.inspection.mocking.MockFieldInitializationInspection"-->
53+
<!-- id="mockitools.mockFieldInitialization" language="JAVA"-->
54+
<!-- displayName="@Mock or @InjectMocks field is explicitly initialized" groupPath="Java"-->
55+
<!-- groupName="Mockito" enabledByDefault="true" level="WARNING"/>-->
5556
<localInspection
5657
implementationClass="com.picimako.mockitools.inspection.mocking.MockTypeInspection"
5758
id="mockitools.mockType" language="JAVA"

0 commit comments

Comments
 (0)