This is an automated email from the ASF dual-hosted git repository.
lizhanhui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 53e084752 [ISSUE #5204] Enable checkstyle for test code (all module)
(#5297)
53e084752 is described below
commit 53e0847528a83dda76cfc69db5bb86001d171079
Author: Nowinkey <[email protected]>
AuthorDate: Fri Oct 14 10:58:48 2022 +0800
[ISSUE #5204] Enable checkstyle for test code (all module) (#5297)
* delete the checkstyle plugin for child modules
* [ISSUE #5204] Enable checkstyle for test code (all module)
* Exclude generated files
Co-authored-by: Zhanhui Li <[email protected]>
---
acl/pom.xml | 24 ---------------------
broker/pom.xml | 21 ------------------
client/pom.xml | 24 ---------------------
common/pom.xml | 24 ---------------------
.../rocketmq/container/BrokerContainerTest.java | 14 ++++++++++--
controller/pom.xml | 24 ---------------------
logging/pom.xml | 25 ----------------------
.../processor/ClusterTestRequestProcessorTest.java | 2 +-
...r_NewTest.java => RouteInfoManagerNewTest.java} | 5 +----
pom.xml | 3 ++-
proxy/pom.xml | 24 ---------------------
remoting/pom.xml | 24 ---------------------
store/pom.xml | 24 ---------------------
test/pom.xml | 20 -----------------
tools/pom.xml | 24 ---------------------
15 files changed, 16 insertions(+), 266 deletions(-)
diff --git a/acl/pom.xml b/acl/pom.xml
index 47c953471..90ce2c8be 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -81,28 +81,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/broker/pom.xml b/broker/pom.xml
index 9a9abad14..aa4a7cc6a 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -94,27 +94,6 @@
<reuseForks>false</reuseForks>
</configuration>
</plugin>
-
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/client/pom.xml b/client/pom.xml
index 6ef7f703b..601e2e51c 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -59,28 +59,4 @@
<artifactId>guava</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/common/pom.xml b/common/pom.xml
index fac02c785..196b7fa2d 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -66,28 +66,4 @@
<artifactId>commons-codec</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git
a/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java
b/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java
index 5fc88dded..eb40085f5 100644
---
a/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java
+++
b/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java
@@ -27,7 +27,11 @@ import java.util.Set;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.broker.out.BrokerOuterAPI;
-import org.apache.rocketmq.common.*;
+import org.apache.rocketmq.common.UtilAll;
+import org.apache.rocketmq.common.BrokerConfig;
+import org.apache.rocketmq.common.BrokerIdentity;
+import org.apache.rocketmq.common.TopicConfig;
+import org.apache.rocketmq.common.DataVersion;
import org.apache.rocketmq.common.constant.PermName;
import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
import org.apache.rocketmq.remoting.netty.NettyClientConfig;
@@ -45,7 +49,13 @@ import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyBoolean;
public class BrokerContainerTest {
private static final List<File> TMP_FILE_LIST = new ArrayList<>();
diff --git a/controller/pom.xml b/controller/pom.xml
index 2eaa30516..1f7698add 100644
--- a/controller/pom.xml
+++ b/controller/pom.xml
@@ -59,28 +59,4 @@
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
diff --git a/logging/pom.xml b/logging/pom.xml
index 3cca56856..4d879cf1e 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -45,29 +45,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git
a/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessorTest.java
b/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessorTest.java
index c8bf05760..0ed452d3a 100644
---
a/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessorTest.java
+++
b/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessorTest.java
@@ -82,7 +82,7 @@ public class ClusterTestRequestProcessorTest {
TopicRouteData topicRouteData = new TopicRouteData();
List<BrokerData> brokerDatas = new ArrayList<>();
HashMap<Long, String> brokerAddrs = new HashMap<>();
- brokerAddrs.put(1234l, "127.0.0.1:10911");
+ brokerAddrs.put(1234L, "127.0.0.1:10911");
BrokerData brokerData = new BrokerData();
brokerData.setCluster("default-cluster");
brokerData.setBrokerName("default-broker");
diff --git
a/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager_NewTest.java
b/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerNewTest.java
similarity index 99%
rename from
namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager_NewTest.java
rename to
namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerNewTest.java
index e098f0ef9..b0d4cbac4 100644
---
a/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager_NewTest.java
+++
b/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerNewTest.java
@@ -17,7 +17,6 @@
package org.apache.rocketmq.namesrv.routeinfo;
-import com.alibaba.fastjson.JSON;
import com.google.common.collect.Sets;
import io.netty.channel.Channel;
import java.time.Duration;
@@ -49,7 +48,7 @@ import static org.awaitility.Awaitility.await;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
-public class RouteInfoManager_NewTest {
+public class RouteInfoManagerNewTest {
private RouteInfoManager routeInfoManager;
private static final String DEFAULT_CLUSTER = "Default_Cluster";
private static final String DEFAULT_BROKER = "Default_Broker";
@@ -189,8 +188,6 @@ public class RouteInfoManager_NewTest {
registerBrokerWithNormalTopic(BrokerBasicInfo.defaultBroker(),
"TestTopic", "TestTopic1");
-
System.out.println(JSON.toJSONString(routeInfoManager.pickupTopicRouteData("TestTopic1")));
-
assertThat(routeInfoManager.pickupTopicRouteData("TestTopic1").getBrokerDatas().get(0).getBrokerAddrs()).containsKeys(0L,
1L);
assertThat(routeInfoManager.pickupTopicRouteData("TestTopic1").getBrokerDatas().get(0).getBrokerAddrs())
.containsValues(BrokerBasicInfo.defaultBroker().brokerAddr,
BrokerBasicInfo.slaveBroker().brokerAddr);
diff --git a/pom.xml b/pom.xml
index 11cbcb17d..aab37e0ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,7 +279,8 @@
<inputEncoding>UTF-8</inputEncoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>false</includeTestSourceDirectory>
+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <excludes>**/generated*/**/*</excludes>
</configuration>
<goals>
<goal>check</goal>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 09973d154..3390a560e 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -99,28 +99,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 04bd6ea9c..a61764319 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -55,28 +55,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/store/pom.xml b/store/pom.xml
index 0ccdce2d0..d0ea8bef5 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -64,28 +64,4 @@
<artifactId>guava</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/test/pom.xml b/test/pom.xml
index a4531c492..17c51cade 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -112,26 +112,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/tools/pom.xml b/tools/pom.xml
index 473842d0d..83329ca65 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -65,28 +65,4 @@
<artifactId>guava</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
- <inputEncoding>UTF-8</inputEncoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
