This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 6bcf082868f Revert "Avoid using MockitoJunitRunner.Silent in tests
(#19710)" (#24583)
6bcf082868f is described below
commit 6bcf082868fef73fb6611f30b30f40b5b2701210
Author: 吴伟杰 <[email protected]>
AuthorDate: Tue Mar 14 11:09:04 2023 +0800
Revert "Avoid using MockitoJunitRunner.Silent in tests (#19710)" (#24583)
This reverts commit cd9737c0a8231b581b70cf9c4c3c8b8f56e558cd.
---
src/resources/checkstyle.xml | 10 +---------
src/resources/checkstyle_ci.xml | 10 +---------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/resources/checkstyle.xml b/src/resources/checkstyle.xml
index 243a9a53cd6..915578d4fe8 100644
--- a/src/resources/checkstyle.xml
+++ b/src/resources/checkstyle.xml
@@ -119,9 +119,7 @@
<module name="AvoidStaticImport">
<property name="excludes"
value="org.junit.jupiter.api.Assertions.*,org.junit.jupiter.api.Assumptions.*,org.junit.Assert.*,org.hamcrest.Matchers.*,org.hamcrest.CoreMatchers.*,org.hamcrest.MatcherAssert.*,org.mockito.Mockito.*,org.mockito.ArgumentMatchers.*"
/>
</module>
- <module name="IllegalImport">
- <property name="illegalClasses"
value="org.mockito.junit.MockitoJUnitRunner.Silent" />
- </module>
+ <module name="IllegalImport" />
<module name="RedundantImport" />
<module name="UnusedImports" />
<module name="CustomImportOrder" />
@@ -233,12 +231,6 @@
<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 28ffd3373c7..cfdcfe21a7c 100644
--- a/src/resources/checkstyle_ci.xml
+++ b/src/resources/checkstyle_ci.xml
@@ -114,9 +114,7 @@
<module name="AvoidStaticImport">
<property name="excludes"
value="org.junit.jupiter.api.Assertions.*,org.junit.jupiter.api.Assumptions.*,org.junit.Assert.*,org.hamcrest.Matchers.*,org.hamcrest.CoreMatchers.*,org.hamcrest.MatcherAssert.*,org.mockito.Mockito.*,org.mockito.ArgumentMatchers.*"
/>
</module>
- <module name="IllegalImport">
- <property name="illegalClasses"
value="org.mockito.junit.MockitoJUnitRunner.Silent" />
- </module>
+ <module name="IllegalImport" />
<module name="RedundantImport" />
<module name="UnusedImports" />
<module name="CustomImportOrder" />
@@ -218,12 +216,6 @@
<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" />
