This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new cd9737c0a82 Avoid using MockitoJunitRunner.Silent in tests (#19710)
cd9737c0a82 is described below
commit cd9737c0a8231b581b70cf9c4c3c8b8f56e558cd
Author: 吴伟杰 <[email protected]>
AuthorDate: Sat Jul 30 16:28:18 2022 +0800
Avoid using MockitoJunitRunner.Silent in tests (#19710)
---
src/resources/checkstyle.xml | 10 +++++++++-
src/resources/checkstyle_ci.xml | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/resources/checkstyle.xml b/src/resources/checkstyle.xml
index adf805d2fb3..33588ed9f7e 100644
--- a/src/resources/checkstyle.xml
+++ b/src/resources/checkstyle.xml
@@ -119,7 +119,9 @@
<module name="AvoidStaticImport">
<property name="excludes"
value="org.junit.Assert.*,org.hamcrest.Matchers.*,org.hamcrest.CoreMatchers.*,org.mockito.Mockito.*,org.mockito.ArgumentMatchers.*"
/>
</module>
- <module name="IllegalImport" />
+ <module name="IllegalImport">
+ <property name="illegalClasses"
value="org.mockito.junit.MockitoJUnitRunner.Silent" />
+ </module>
<module name="RedundantImport" />
<module name="UnusedImports" />
<module name="CustomImportOrder" />
@@ -231,6 +233,12 @@
<property name="excludedClasses" value="\.Bootstrap" />
</module>
+ <module name="Regexp">
+ <property name="illegalPattern" value="true" />
+ <property name="format" value="MockitoJUnitRunner\.Silent" />
+ <property name="message" value="MockitoJUnitRunner.Silent is not
allowed in tests" />
+ </module>
+
<!-- Javadoc Comments -->
<module name="AtclauseOrder">
<property name="tagOrder" value="@param, @return, @throws,
@deprecated" />
diff --git a/src/resources/checkstyle_ci.xml b/src/resources/checkstyle_ci.xml
index 73eecf241be..cbcf26558fc 100644
--- a/src/resources/checkstyle_ci.xml
+++ b/src/resources/checkstyle_ci.xml
@@ -114,7 +114,9 @@
<module name="AvoidStaticImport">
<property name="excludes"
value="org.junit.Assert.*,org.hamcrest.Matchers.*,org.hamcrest.CoreMatchers.*,org.mockito.Mockito.*,org.mockito.ArgumentMatchers.*"
/>
</module>
- <module name="IllegalImport" />
+ <module name="IllegalImport">
+ <property name="illegalClasses"
value="org.mockito.junit.MockitoJUnitRunner.Silent" />
+ </module>
<module name="RedundantImport" />
<module name="UnusedImports" />
<module name="CustomImportOrder" />
@@ -216,6 +218,12 @@
<property name="excludedClasses" value="\.Bootstrap" />
</module>
+ <module name="Regexp">
+ <property name="illegalPattern" value="true" />
+ <property name="format" value="MockitoJUnitRunner\.Silent" />
+ <property name="message" value="MockitoJUnitRunner.Silent is not
allowed in tests" />
+ </module>
+
<!-- Javadoc Comments -->
<module name="AtclauseOrder">
<property name="tagOrder" value="@param, @return, @throws,
@deprecated" />
