From 62963b5c623561791b0d1c4836d7339ee93b22a7 Mon Sep 17 00:00:00 2001 From: vongosling Date: Tue, 17 Jan 2017 13:09:02 +0800 Subject: [PATCH 01/27] Integrate with Coveralls --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index ca7ea1da3d..617ac9ce06 100644 --- a/pom.xml +++ b/pom.xml @@ -317,6 +317,11 @@ ${project.build.sourceEncoding} + + org.eluder.coveralls + coveralls-maven-plugin + 4.3.0 + From 0623b3c6392e717af6879cd3bf78fc2ca40308f4 Mon Sep 17 00:00:00 2001 From: vongosling Date: Tue, 17 Jan 2017 13:57:33 +0800 Subject: [PATCH 02/27] Integrate travis-ci with coveralls --- .travis.yml | 7 +++++++ README.md | 2 +- pom.xml | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b2168ad382..a9927e2768 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,3 +3,10 @@ jdk: - oraclejdk8 - oraclejdk7 - openjdk7 + +script: + - travis_retry mvn --batch-mode clean apache-rat:check + - travis_wait 60 mvn --batch-mode clean package findbugs:check + +after_success: + - mvn clean cobertura:cobertura coveralls:report diff --git a/README.md b/README.md index a0259f0b74..32c86fe3b6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## RocketMQ [![Build Status](https://travis-ci.org/apache/incubator-rocketmq.svg?branch=master)](https://travis-ci.org/apache/incubator-rocketmq) +## RocketMQ [![Build Status](https://travis-ci.org/apache/incubator-rocketmq.svg?branch=master)](https://travis-ci.org/apache/incubator-rocketmq) [![Coverage Status](https://coveralls.io/repos/github/apache/incubator-rocketmq/badge.svg?branch=master)](https://coveralls.io/github/apache/incubator-rocketmq?branch=master) [![Maven Central](https://img.shields.io/badge/maven--center-stable--version-green.svg)](http://search.maven.org/#search%7Cga%7C1%7Corg.apache.rocketmq) [![GitHub release](https://img.shields.io/badge/release-download-orange.svg)](https://github.org/apache/rocketmqreleases) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) diff --git a/pom.xml b/pom.xml index 617ac9ce06..afd3d847b0 100644 --- a/pom.xml +++ b/pom.xml @@ -322,6 +322,21 @@ coveralls-maven-plugin 4.3.0 + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + xml + + true + + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.4 + From df9d621baac504ae2d7288a19a3907a3c02cd485 Mon Sep 17 00:00:00 2001 From: vongosling Date: Tue, 17 Jan 2017 14:22:24 +0800 Subject: [PATCH 03/27] Remove script command in travis config file --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9927e2768..45b7d5d79a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ jdk: - oraclejdk7 - openjdk7 -script: - - travis_retry mvn --batch-mode clean apache-rat:check - - travis_wait 60 mvn --batch-mode clean package findbugs:check +#script: +# - travis_retry mvn --batch-mode clean apache-rat:check +# - travis_wait 60 mvn --batch-mode clean package findbugs:check after_success: - - mvn clean cobertura:cobertura coveralls:report + - mvn clean apache-rat:check cobertura:cobertura coveralls:report From 2892a7759f3f867cdca7214399ff121eded78970 Mon Sep 17 00:00:00 2001 From: vongosling Date: Tue, 17 Jan 2017 15:18:11 +0800 Subject: [PATCH 04/27] IntegrateASF sonar --- pom.xml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index afd3d847b0..f189bb422c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ rocketmq-all 4.0.0-SNAPSHOT pom - rocketmq-all ${project.version} + Apache RocketMQ git s${project.version} http://rocketmq.incubator.apache.org/ @@ -42,7 +42,8 @@ https://git-wip-us.apache.org/repos/asf/incubator-rocketmq.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rocketmq.git - scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rocketmq.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rocketmq.git + @@ -157,6 +158,11 @@ 1.7 1.7 + + + https://builds.apache.org/analysis + + file:**/generated-sources/** @@ -337,6 +343,11 @@ findbugs-maven-plugin 3.0.4 + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.0.2 + From 1c529533e12882c112f3a3f3a3500c65c531da50 Mon Sep 17 00:00:00 2001 From: vongosling Date: Tue, 17 Jan 2017 18:41:06 +0800 Subject: [PATCH 05/27] Testing RocketMQ Project on Multiple Operating Systems --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 45b7d5d79a..001931016c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +os: + - linux + - osx language: java jdk: - oraclejdk8 From 7f33508fbd5fe3cfb3fe74d696db489a04297f37 Mon Sep 17 00:00:00 2001 From: yukon Date: Wed, 18 Jan 2017 00:27:56 +0800 Subject: [PATCH 06/27] Use xcode8 for osx test --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 001931016c..f82c45a7b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,10 @@ jdk: - oraclejdk8 - oraclejdk7 - openjdk7 +matrix: + include: + - os: osx + osx_image: xcode8 #script: # - travis_retry mvn --batch-mode clean apache-rat:check From 2cee029201a9f157208b8136693285668bfdb737 Mon Sep 17 00:00:00 2001 From: vongosling Date: Wed, 18 Jan 2017 11:02:03 +0800 Subject: [PATCH 07/27] polish osx platform for travis --- .travis.yml | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index f82c45a7b6..c41d858fa3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,35 @@ -os: - - linux - - osx +notifications: + email: + - dev@rocketmq.incubator.apache.org + on_success: change + on_failure: always language: java -jdk: - - oraclejdk8 - - oraclejdk7 - - openjdk7 matrix: include: - - os: osx - osx_image: xcode8 + # On OSX, run with default JDK only. + - os: osx + # On Linux, run with specific JDKs only. + - os: linux + env: CUSTOM_JDK="oraclejdk8" + - os: linux + env: CUSTOM_JDK="oraclejdk7" + - os: linux + env: CUSTOM_JDK="openjdk7" + +before_install: + - echo 'MAVEN_OPTS="$MAVEN_OPTS -Xmx1024m -XX:MaxPermSize=512m -XX:+BytecodeVerificationLocal"' >> ~/.mavenrc + - cat ~/.mavenrc + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then jdk_switcher use "$CUSTOM_JDK"; fi +# +#os: +# - linux +# - osx +#jdk: +# - oraclejdk8 +# - oraclejdk7 +# - openjdk7 + #script: # - travis_retry mvn --batch-mode clean apache-rat:check From 3daf24e8266e0e0d334b389f0ab452566acd6b12 Mon Sep 17 00:00:00 2001 From: vongosling Date: Wed, 18 Jan 2017 11:06:38 +0800 Subject: [PATCH 08/27] Bugfix for valid yaml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c41d858fa3..4d33a4ec40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ notifications: email: - - dev@rocketmq.incubator.apache.org - on_success: change - on_failure: always + - dev@rocketmq.incubator.apache.org + on_success: change + on_failure: always language: java matrix: include: From cc069a131ca2f1c962051cd772466cda71e9737a Mon Sep 17 00:00:00 2001 From: vongosling Date: Wed, 18 Jan 2017 12:40:59 +0800 Subject: [PATCH 09/27] Polish travis config --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d33a4ec40..c3c525defc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,23 @@ notifications: email: - - dev@rocketmq.incubator.apache.org + recipients: + - dev@rocketmq.incubator.apache.org on_success: change on_failure: always -language: java + matrix: include: # On OSX, run with default JDK only. + - language: java - os: osx # On Linux, run with specific JDKs only. + - language: java - os: linux env: CUSTOM_JDK="oraclejdk8" + - language: java - os: linux env: CUSTOM_JDK="oraclejdk7" + - language: java - os: linux env: CUSTOM_JDK="openjdk7" From 54967c31cfc0af7883b46a1f71086772e9256f7c Mon Sep 17 00:00:00 2001 From: vongosling Date: Wed, 18 Jan 2017 14:36:22 +0800 Subject: [PATCH 10/27] Polish coveralls,jacoco,sonar and travis-ci integration --- .travis.yml | 17 +++++++---------- pom.xml | 43 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3c525defc..2afd6bd902 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,20 +4,18 @@ notifications: - dev@rocketmq.incubator.apache.org on_success: change on_failure: always - + +language: java + matrix: include: # On OSX, run with default JDK only. - - language: java - os: osx # On Linux, run with specific JDKs only. - - language: java - os: linux env: CUSTOM_JDK="oraclejdk8" - - language: java - os: linux env: CUSTOM_JDK="oraclejdk7" - - language: java - os: linux env: CUSTOM_JDK="openjdk7" @@ -26,7 +24,7 @@ before_install: - cat ~/.mavenrc - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then jdk_switcher use "$CUSTOM_JDK"; fi -# + #os: # - linux # - osx @@ -36,9 +34,8 @@ before_install: # - openjdk7 -#script: -# - travis_retry mvn --batch-mode clean apache-rat:check -# - travis_wait 60 mvn --batch-mode clean package findbugs:check +script: + - travis_retry mvn -B clean apache-rat:check package jacoo:report coveralls:report after_success: - - mvn clean apache-rat:check cobertura:cobertura coveralls:report + - mvn sonar:sonar diff --git a/pom.xml b/pom.xml index f189bb422c..e9ab2ea4c0 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ rocketmq-all 4.0.0-SNAPSHOT pom - Apache RocketMQ git s${project.version} + Apache RocketMQ ${project.version} http://rocketmq.incubator.apache.org/ @@ -152,6 +152,8 @@ UTF-8 + UTF-8 + false true @@ -159,6 +161,14 @@ 1.7 1.7 + + jacoco + reuseReports + ${project.basedir}/../target/jacoco.exec + ${project.basedir}/../target/jacoco-it.exec + java https://builds.apache.org/analysis @@ -329,14 +339,33 @@ 4.3.0 - org.codehaus.mojo - cobertura-maven-plugin - 2.7 + org.jacoco + jacoco-maven-plugin + 0.7.6.201602180812 - xml - - true + true + + + agent-for-ut + + prepare-agent + + + + agent-for-it + + prepare-agent-integration + + + + report + prepare-package + + report + + + org.codehaus.mojo From 02f8b14c0b1b292d240c339fe3fdaa1071b72f27 Mon Sep 17 00:00:00 2001 From: vongosling Date: Wed, 18 Jan 2017 14:40:19 +0800 Subject: [PATCH 11/27] Fix typo error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2afd6bd902..8701b488b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ before_install: script: - - travis_retry mvn -B clean apache-rat:check package jacoo:report coveralls:report + - travis_retry mvn -B clean apache-rat:check package jacoco:report coveralls:report after_success: - mvn sonar:sonar From 3e3988d612ce128e560719230988fd06aaad3012 Mon Sep 17 00:00:00 2001 From: vongosling Date: Wed, 18 Jan 2017 23:10:33 +0800 Subject: [PATCH 12/27] Polish travis-ci for jacoco --- pom.xml | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index e9ab2ea4c0..2966541a60 100644 --- a/pom.xml +++ b/pom.xml @@ -154,21 +154,16 @@ UTF-8 UTF-8 - + false true - + 1.7 1.7 - + + -Xms512m -Xmx1024m jacoco - reuseReports - ${project.basedir}/../target/jacoco.exec - ${project.basedir}/../target/jacoco-it.exec - java https://builds.apache.org/analysis @@ -245,12 +240,21 @@ maven-surefire-plugin 2.19.1 - -Xms512m -Xmx1024m + 1 + true **/*Test.java + + maven-failsafe-plugin + 2.19.1 + + 1 + true + + maven-javadoc-plugin 2.10.4 @@ -341,30 +345,38 @@ org.jacoco jacoco-maven-plugin - 0.7.6.201602180812 - - true - + 0.7.8 - agent-for-ut + default-prepare-agent prepare-agent - agent-for-it + default-prepare-agent-integration prepare-agent-integration - report - prepare-package + default-report report + + default-report-integration + + report-integration + + + + default-check + + check + + From 5cb7e382b7c1aae651971cd6e93926448df7efc2 Mon Sep 17 00:00:00 2001 From: vongosling Date: Wed, 18 Jan 2017 23:44:29 +0800 Subject: [PATCH 13/27] Polish travis script --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8701b488b9..9394f0a065 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ language: java matrix: include: # On OSX, run with default JDK only. - - os: osx + # - os: osx # On Linux, run with specific JDKs only. - os: linux env: CUSTOM_JDK="oraclejdk8" @@ -35,7 +35,8 @@ before_install: script: - - travis_retry mvn -B clean apache-rat:check package jacoco:report coveralls:report + - travis_retry mvn -B clean apache-rat:check + - travis_retry mvn package jacoco:report coveralls:report after_success: - mvn sonar:sonar From 4587775c5169d8f7e4a50305cce4786f2823d5bf Mon Sep 17 00:00:00 2001 From: vongosling Date: Wed, 18 Jan 2017 23:53:07 +0800 Subject: [PATCH 14/27] Remove check goal in jacaco plugin --- .travis.yml | 2 +- pom.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9394f0a065..dd57ba3030 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ before_install: script: - travis_retry mvn -B clean apache-rat:check - - travis_retry mvn package jacoco:report coveralls:report + - travis_retry mvn -B package jacoco:report coveralls:report after_success: - mvn sonar:sonar diff --git a/pom.xml b/pom.xml index 2966541a60..8ec8170b84 100644 --- a/pom.xml +++ b/pom.xml @@ -371,12 +371,6 @@ report-integration - - default-check - - check - - From edde487ed932b7e5b6700b203a897ed7c08c8373 Mon Sep 17 00:00:00 2001 From: yukon Date: Tue, 17 Jan 2017 12:53:23 +0800 Subject: [PATCH 15/27] [ROCKETMQ-52] Add unit tests for Validators and ThreadLocalIndex --- client/pom.xml | 4 ++ .../apache/rocketmq/client/Validators.java | 8 +-- .../client/common/ThreadLocalIndex.java | 4 -- .../impl/producer/TopicPublishInfo.java | 2 +- .../latency/LatencyFaultToleranceImpl.java | 2 +- .../rocketmq/client/ValidatorsTest.java | 52 ++++++++++++++++++- .../client/common/ThreadLocalIndexTest.java | 33 ++++++++++++ 7 files changed, 94 insertions(+), 11 deletions(-) create mode 100644 client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java diff --git a/client/pom.xml b/client/pom.xml index 713523d692..3a0f6ae02b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -38,5 +38,9 @@ org.slf4j slf4j-api + + org.apache.commons + commons-lang3 + diff --git a/client/src/main/java/org/apache/rocketmq/client/Validators.java b/client/src/main/java/org/apache/rocketmq/client/Validators.java index 7ea1bf91dd..899efa684d 100644 --- a/client/src/main/java/org/apache/rocketmq/client/Validators.java +++ b/client/src/main/java/org/apache/rocketmq/client/Validators.java @@ -118,23 +118,23 @@ public class Validators { */ public static void checkTopic(String topic) throws MQClientException { if (UtilAll.isBlank(topic)) { - throw new MQClientException("the specified topic is blank", null); + throw new MQClientException("The specified topic is blank", null); } if (!regularExpressionMatcher(topic, PATTERN)) { throw new MQClientException(String.format( - "the specified topic[%s] contains illegal characters, allowing only %s", topic, + "The specified topic[%s] contains illegal characters, allowing only %s", topic, VALID_PATTERN_STR), null); } if (topic.length() > CHARACTER_MAX_LENGTH) { - throw new MQClientException("the specified topic is longer than topic max length 255.", null); + throw new MQClientException("The specified topic is longer than topic max length 255.", null); } //whether the same with system reserved keyword if (topic.equals(MixAll.DEFAULT_TOPIC)) { throw new MQClientException( - String.format("the topic[%s] is conflict with default topic.", topic), null); + String.format("The topic[%s] is conflict with default topic.", topic), null); } } } diff --git a/client/src/main/java/org/apache/rocketmq/client/common/ThreadLocalIndex.java b/client/src/main/java/org/apache/rocketmq/client/common/ThreadLocalIndex.java index a30b5daba5..ab223c3eca 100644 --- a/client/src/main/java/org/apache/rocketmq/client/common/ThreadLocalIndex.java +++ b/client/src/main/java/org/apache/rocketmq/client/common/ThreadLocalIndex.java @@ -23,10 +23,6 @@ public class ThreadLocalIndex { private final ThreadLocal threadLocalIndex = new ThreadLocal(); private final Random random = new Random(); - public ThreadLocalIndex(int value) { - - } - public int getAndIncrement() { Integer index = this.threadLocalIndex.get(); if (null == index) { diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/producer/TopicPublishInfo.java b/client/src/main/java/org/apache/rocketmq/client/impl/producer/TopicPublishInfo.java index 52c5cfba02..deb02cff28 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/producer/TopicPublishInfo.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/producer/TopicPublishInfo.java @@ -27,7 +27,7 @@ public class TopicPublishInfo { private boolean orderTopic = false; private boolean haveTopicRouterInfo = false; private List messageQueueList = new ArrayList(); - private volatile ThreadLocalIndex sendWhichQueue = new ThreadLocalIndex(0); + private volatile ThreadLocalIndex sendWhichQueue = new ThreadLocalIndex(); private TopicRouteData topicRouteData; public boolean isOrderTopic() { diff --git a/client/src/main/java/org/apache/rocketmq/client/latency/LatencyFaultToleranceImpl.java b/client/src/main/java/org/apache/rocketmq/client/latency/LatencyFaultToleranceImpl.java index 5309bc9a55..72d43476f8 100644 --- a/client/src/main/java/org/apache/rocketmq/client/latency/LatencyFaultToleranceImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/latency/LatencyFaultToleranceImpl.java @@ -27,7 +27,7 @@ import org.apache.rocketmq.client.common.ThreadLocalIndex; public class LatencyFaultToleranceImpl implements LatencyFaultTolerance { private final ConcurrentHashMap faultItemTable = new ConcurrentHashMap(16); - private final ThreadLocalIndex whichItemWorst = new ThreadLocalIndex(0); + private final ThreadLocalIndex whichItemWorst = new ThreadLocalIndex(); @Override public void updateFaultItem(final String name, final long currentLatency, final long notAvailableDuration) { diff --git a/client/src/test/java/org/apache/rocketmq/client/ValidatorsTest.java b/client/src/test/java/org/apache/rocketmq/client/ValidatorsTest.java index 6775404ccd..2db648d862 100644 --- a/client/src/test/java/org/apache/rocketmq/client/ValidatorsTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/ValidatorsTest.java @@ -17,17 +17,67 @@ package org.apache.rocketmq.client; +import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.exception.MQClientException; +import org.apache.rocketmq.common.MixAll; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.failBecauseExceptionWasNotThrown; + public class ValidatorsTest { @Test - public void topicValidatorTest() throws MQClientException { + public void testCheckTopic_Success() throws MQClientException { Validators.checkTopic("Hello"); Validators.checkTopic("%RETRY%Hello"); Validators.checkTopic("_%RETRY%Hello"); Validators.checkTopic("-%RETRY%Hello"); Validators.checkTopic("223-%RETRY%Hello"); } + + @Test + public void testCheckTopic_HasIllegalCharacters() { + String illegalTopic = "TOPIC&*^"; + try { + Validators.checkTopic(illegalTopic); + failBecauseExceptionWasNotThrown(MQClientException.class); + } catch (MQClientException e) { + assertThat(e).hasMessageStartingWith(String.format("The specified topic[%s] contains illegal characters, allowing only %s", illegalTopic, Validators.VALID_PATTERN_STR)); + } + } + + @Test + public void testCheckTopic_UseDefaultTopic() { + String defaultTopic = MixAll.DEFAULT_TOPIC; + try { + Validators.checkTopic(defaultTopic); + failBecauseExceptionWasNotThrown(MQClientException.class); + } catch (MQClientException e) { + assertThat(e).hasMessageStartingWith(String.format("The topic[%s] is conflict with default topic.", defaultTopic)); + } + } + + @Test + public void testCheckTopic_BlankTopic() { + String blankTopic = ""; + try { + Validators.checkTopic(blankTopic); + failBecauseExceptionWasNotThrown(MQClientException.class); + } catch (MQClientException e) { + assertThat(e).hasMessageStartingWith("The specified topic is blank"); + } + } + + @Test + public void testCheckTopic_TooLongTopic() { + String tooLongTopic = StringUtils.rightPad("TooLongTopic", Validators.CHARACTER_MAX_LENGTH + 1, "_"); + assertThat(tooLongTopic.length()).isGreaterThan(Validators.CHARACTER_MAX_LENGTH); + try { + Validators.checkTopic(tooLongTopic); + failBecauseExceptionWasNotThrown(MQClientException.class); + } catch (MQClientException e) { + assertThat(e).hasMessageStartingWith("The specified topic is longer than topic max length 255."); + } + } } diff --git a/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java b/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java new file mode 100644 index 0000000000..b937e45799 --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.client.common; + +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class ThreadLocalIndexTest { + + @Test + public void getAndIncrement() throws Exception { + ThreadLocalIndex localIndex = new ThreadLocalIndex(); + int initialVal = localIndex.getAndIncrement(); + + assertThat(localIndex.getAndIncrement()).isEqualTo(initialVal + 1); + } + +} \ No newline at end of file From c99510f57550d8fdbf36de691074187da0e8e153 Mon Sep 17 00:00:00 2001 From: yukon Date: Tue, 17 Jan 2017 13:28:56 +0800 Subject: [PATCH 16/27] [ROCKETMQ-52] Add unit tests for MessageQueueSelector --- .../client/common/ThreadLocalIndexTest.java | 2 +- .../SelectMessageQueueByHashTest.java | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 client/src/test/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByHashTest.java diff --git a/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java b/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java index b937e45799..350cde7668 100644 --- a/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ThreadLocalIndexTest { @Test - public void getAndIncrement() throws Exception { + public void testGetAndIncrement() throws Exception { ThreadLocalIndex localIndex = new ThreadLocalIndex(); int initialVal = localIndex.getAndIncrement(); diff --git a/client/src/test/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByHashTest.java b/client/src/test/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByHashTest.java new file mode 100644 index 0000000000..64ef21de7f --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByHashTest.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.client.producer.selector; + +import java.util.ArrayList; +import java.util.List; +import org.apache.rocketmq.common.message.Message; +import org.apache.rocketmq.common.message.MessageQueue; +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SelectMessageQueueByHashTest { + + private String topic = "FooBar"; + + @Test + public void testSelect() throws Exception { + SelectMessageQueueByHash selector = new SelectMessageQueueByHash(); + + Message message = new Message(topic, new byte[] {}); + + List messageQueues = new ArrayList<>(); + for (int i = 0; i < 10; i++) { + MessageQueue messageQueue = new MessageQueue(topic, "DefaultBroker", i); + messageQueues.add(messageQueue); + } + + String orderId = "123"; + String anotherOrderId = "234"; + MessageQueue selected = selector.select(messageQueues, message, orderId); + assertThat(selector.select(messageQueues, message, anotherOrderId)).isNotEqualTo(selected); + } + +} \ No newline at end of file From 127b163dddae5bce3a33fa66d5b1f1167290a240 Mon Sep 17 00:00:00 2001 From: yukon Date: Tue, 17 Jan 2017 15:15:16 +0800 Subject: [PATCH 17/27] [ROCKETMQ-52] Add unit tests for LocalFileOffsetStore --- .../store/LocalFileOffsetStoreTest.java | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java new file mode 100644 index 0000000000..58d99d60d6 --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java @@ -0,0 +1,74 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.client.consumer.store; + +import java.util.Collections; +import java.util.HashSet; +import org.apache.rocketmq.client.ClientConfig; +import org.apache.rocketmq.client.impl.factory.MQClientInstance; +import org.apache.rocketmq.common.message.MessageQueue; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.Mockito; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + +public class LocalFileOffsetStoreTest { + + @Mock + private static MQClientInstance mQClientFactory; + private static String group = "FooBarGroup"; + private static String topic = "FooBar"; + private static String brokerName = "DefaultBrokerName"; + + @BeforeClass + public static void init() { + System.setProperty("rocketmq.client.localOffsetStoreDir", System.getProperty("java.io.tmpdir") + ".rocketmq_offsets"); + mQClientFactory = Mockito.mock(MQClientInstance.class); + String clientId = new ClientConfig().buildMQClientId() + "#TestNamespace" + System.currentTimeMillis(); + when(mQClientFactory.getClientId()).thenReturn(clientId); + } + + @Test + public void testUpdateOffset() throws Exception { + OffsetStore offsetStore = new LocalFileOffsetStore(mQClientFactory, group); + MessageQueue messageQueue = new MessageQueue(topic, brokerName, 1); + offsetStore.updateOffset(messageQueue, 1024, false); + + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_MEMORY)).isEqualTo(1024); + + offsetStore.updateOffset(messageQueue, 1023, false); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_MEMORY)).isEqualTo(1023); + + offsetStore.updateOffset(messageQueue, 1022, true); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_MEMORY)).isEqualTo(1023); + } + + @Test + public void testReadOffset_FromStore() throws Exception { + OffsetStore offsetStore = new LocalFileOffsetStore(mQClientFactory, group); + MessageQueue messageQueue = new MessageQueue(topic, brokerName, 2); + + offsetStore.updateOffset(messageQueue, 1024, false); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(-1); + + offsetStore.persistAll(new HashSet<>(Collections.singletonList(messageQueue))); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(1024); + } +} \ No newline at end of file From 98e4631a070417794fe75639b24319447a001d85 Mon Sep 17 00:00:00 2001 From: yukon Date: Tue, 17 Jan 2017 16:15:11 +0800 Subject: [PATCH 18/27] [ROCKETMQ-52] Add unit tests for RemoteBrokerOffsetStore --- .../store/RemoteBrokerOffsetStoreTest.java | 141 ++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java new file mode 100644 index 0000000000..9a6a4b5550 --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java @@ -0,0 +1,141 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.client.consumer.store; + +import java.util.Collections; +import java.util.HashSet; +import org.apache.rocketmq.client.ClientConfig; +import org.apache.rocketmq.client.exception.MQBrokerException; +import org.apache.rocketmq.client.impl.FindBrokerResult; +import org.apache.rocketmq.client.impl.MQClientAPIImpl; +import org.apache.rocketmq.client.impl.factory.MQClientInstance; +import org.apache.rocketmq.common.message.MessageQueue; +import org.apache.rocketmq.common.protocol.header.QueryConsumerOffsetRequestHeader; +import org.apache.rocketmq.common.protocol.header.UpdateConsumerOffsetRequestHeader; +import org.apache.rocketmq.remoting.exception.RemotingException; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class RemoteBrokerOffsetStoreTest { + + @Mock + private static MQClientInstance mQClientFactory; + @Mock + private static MQClientAPIImpl mqClientAPI; + private static String group = "FooBarGroup"; + private static String topic = "FooBar"; + private static String brokerName = "DefaultBrokerName"; + + @BeforeClass + public static void init() { + System.setProperty("rocketmq.client.localOffsetStoreDir", System.getProperty("java.io.tmpdir") + ".rocketmq_offsets"); + mQClientFactory = mock(MQClientInstance.class); + String clientId = new ClientConfig().buildMQClientId() + "#TestNamespace" + System.currentTimeMillis(); + when(mQClientFactory.getClientId()).thenReturn(clientId); + when(mQClientFactory.findBrokerAddressInAdmin(brokerName)).thenReturn(new FindBrokerResult("127.0.0.1", false)); + + mqClientAPI = mock(MQClientAPIImpl.class); + when(mQClientFactory.getMQClientAPIImpl()).thenReturn(mqClientAPI); + } + + @Test + public void testUpdateOffset() throws Exception { + OffsetStore offsetStore = new RemoteBrokerOffsetStore(mQClientFactory, group); + MessageQueue messageQueue = new MessageQueue(topic, brokerName, 1); + + offsetStore.updateOffset(messageQueue, 1024, false); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_MEMORY)).isEqualTo(1024); + + offsetStore.updateOffset(messageQueue, 1023, false); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_MEMORY)).isEqualTo(1023); + + offsetStore.updateOffset(messageQueue, 1022, true); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_MEMORY)).isEqualTo(1023); + } + + @Test + public void testReadOffset_WithException() throws Exception { + OffsetStore offsetStore = new RemoteBrokerOffsetStore(mQClientFactory, group); + MessageQueue messageQueue = new MessageQueue(topic, brokerName, 2); + + offsetStore.updateOffset(messageQueue, 1024, false); + + doThrow(new MQBrokerException(-1, "")) + .when(mqClientAPI).queryConsumerOffset(anyString(), any(QueryConsumerOffsetRequestHeader.class), anyLong()); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(-1); + + doThrow(new RemotingException("", null)) + .when(mqClientAPI).queryConsumerOffset(anyString(), any(QueryConsumerOffsetRequestHeader.class), anyLong()); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(-2); + } + + @Test + public void testReadOffset_Success() throws Exception { + OffsetStore offsetStore = new RemoteBrokerOffsetStore(mQClientFactory, group); + final MessageQueue messageQueue = new MessageQueue(topic, brokerName, 3); + + doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock mock) throws Throwable { + UpdateConsumerOffsetRequestHeader updateRequestHeader = mock.getArgument(1); + when(mqClientAPI.queryConsumerOffset(anyString(), any(QueryConsumerOffsetRequestHeader.class), anyLong())).thenReturn(updateRequestHeader.getCommitOffset()); + return null; + } + }).when(mqClientAPI).updateConsumerOffsetOneway(any(String.class), any(UpdateConsumerOffsetRequestHeader.class), any(Long.class)); + + offsetStore.updateOffset(messageQueue, 1024, false); + offsetStore.persist(messageQueue); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(1024); + + offsetStore.updateOffset(messageQueue, 1023, false); + offsetStore.persist(messageQueue); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(1023); + + offsetStore.updateOffset(messageQueue, 1022, true); + offsetStore.persist(messageQueue); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(1023); + + offsetStore.updateOffset(messageQueue, 1025, false); + offsetStore.persistAll(new HashSet<>(Collections.singletonList(messageQueue))); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(1025); + } + + + + @Test + public void testRemoveOffset() throws Exception { + OffsetStore offsetStore = new RemoteBrokerOffsetStore(mQClientFactory, group); + final MessageQueue messageQueue = new MessageQueue(topic, brokerName, 4); + + offsetStore.updateOffset(messageQueue, 1024, false); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_MEMORY)).isEqualTo(1024); + + offsetStore.removeOffset(messageQueue); + assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_MEMORY)).isEqualTo(-1); + } +} \ No newline at end of file From ba79706f8cf8c0d236a1da870cf0d0d53e9ad57d Mon Sep 17 00:00:00 2001 From: yukon Date: Tue, 17 Jan 2017 17:22:15 +0800 Subject: [PATCH 19/27] [ROCKETMQ-52] Add unit tests for MQClientInstance --- .../impl/factory/MQClientInstanceTest.java | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java diff --git a/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java b/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java new file mode 100644 index 0000000000..956cdd9065 --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java @@ -0,0 +1,123 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.client.impl.factory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import org.apache.rocketmq.client.ClientConfig; +import org.apache.rocketmq.client.admin.MQAdminExtInner; +import org.apache.rocketmq.client.exception.MQBrokerException; +import org.apache.rocketmq.client.impl.MQClientAPIImpl; +import org.apache.rocketmq.client.impl.MQClientManager; +import org.apache.rocketmq.client.impl.consumer.MQConsumerInner; +import org.apache.rocketmq.client.impl.producer.DefaultMQProducerImpl; +import org.apache.rocketmq.client.impl.producer.TopicPublishInfo; +import org.apache.rocketmq.common.protocol.route.BrokerData; +import org.apache.rocketmq.common.protocol.route.QueueData; +import org.apache.rocketmq.common.protocol.route.TopicRouteData; +import org.apache.rocketmq.remoting.exception.RemotingException; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + +@RunWith(MockitoJUnitRunner.class) +public class MQClientInstanceTest { + + @Mock + private static MQClientAPIImpl mqClientAPI; + @InjectMocks + private static MQClientInstance mqClientInstance = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig());; + + private String topic = "FooBar"; + private String group = "FooBarGroup"; + + @Test + public void testTopicRouteData2TopicPublishInfo() { + TopicRouteData topicRouteData = new TopicRouteData(); + + topicRouteData.setFilterServerTable(new HashMap>()); + List brokerDataList = new ArrayList<>(); + BrokerData brokerData = new BrokerData(); + brokerData.setBrokerName("BrokerA"); + brokerData.setCluster("DefaultCluster"); + HashMap brokerAddrs = new HashMap<>(); + brokerAddrs.put(0L, "127.0.0.1"); + brokerData.setBrokerAddrs(brokerAddrs); + brokerDataList.add(brokerData); + topicRouteData.setBrokerDatas(brokerDataList); + + List queueDataList = new ArrayList<>(); + QueueData queueData = new QueueData(); + queueData.setBrokerName("BrokerA"); + queueData.setPerm(2); + queueData.setReadQueueNums(3); + queueData.setWriteQueueNums(4); + queueData.setTopicSynFlag(0); + queueDataList.add(queueData); + topicRouteData.setQueueDatas(queueDataList); + + TopicPublishInfo topicPublishInfo = MQClientInstance.topicRouteData2TopicPublishInfo(topic, topicRouteData); + + assertThat(topicPublishInfo.isHaveTopicRouterInfo()).isFalse(); + assertThat(topicPublishInfo.getMessageQueueList().size()).isEqualTo(4); + } + + @Test + public void testRegisterProducer() { + boolean flag = mqClientInstance.registerProducer(group, mock(DefaultMQProducerImpl.class)); + assertThat(flag).isTrue(); + + flag = mqClientInstance.registerProducer(group, mock(DefaultMQProducerImpl.class)); + assertThat(flag).isFalse(); + + mqClientInstance.unregisterProducer(group); + flag = mqClientInstance.registerProducer(group, mock(DefaultMQProducerImpl.class)); + assertThat(flag).isTrue(); + } + + @Test + public void testRegisterConsumer() throws RemotingException, InterruptedException, MQBrokerException { + boolean flag = mqClientInstance.registerConsumer(group, mock(MQConsumerInner.class)); + assertThat(flag).isTrue(); + + flag = mqClientInstance.registerConsumer(group, mock(MQConsumerInner.class)); + assertThat(flag).isFalse(); + + mqClientInstance.unregisterConsumer(group); + flag = mqClientInstance.registerConsumer(group, mock(MQConsumerInner.class)); + assertThat(flag).isTrue(); + } + + @Test + public void testRegisterAdminExt() { + boolean flag = mqClientInstance.registerAdminExt(group, mock(MQAdminExtInner.class)); + assertThat(flag).isTrue(); + + flag = mqClientInstance.registerAdminExt(group, mock(MQAdminExtInner.class)); + assertThat(flag).isFalse(); + + mqClientInstance.unregisterAdminExt(group); + flag = mqClientInstance.registerAdminExt(group, mock(MQAdminExtInner.class)); + assertThat(flag).isTrue(); + } +} \ No newline at end of file From 032bb2b32e6fd288063b70690d318628db1a6abb Mon Sep 17 00:00:00 2001 From: yukon Date: Tue, 17 Jan 2017 20:46:16 +0800 Subject: [PATCH 20/27] [ROCKETMQ-52] Add unit tests for MQClientAPIImpl --- .../client/common/ThreadLocalIndexTest.java | 1 - .../store/LocalFileOffsetStoreTest.java | 1 - .../store/RemoteBrokerOffsetStoreTest.java | 1 - .../client/impl/MQClientAPIImplTest.java | 236 ++++++++++++++++++ .../impl/factory/MQClientInstanceTest.java | 7 +- .../remoting/protocol/RemotingCommand.java | 4 +- 6 files changed, 238 insertions(+), 12 deletions(-) create mode 100644 client/src/test/java/org/apache/rocketmq/client/impl/MQClientAPIImplTest.java diff --git a/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java b/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java index 350cde7668..1be93ce0f3 100644 --- a/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/common/ThreadLocalIndexTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; public class ThreadLocalIndexTest { - @Test public void testGetAndIncrement() throws Exception { ThreadLocalIndex localIndex = new ThreadLocalIndex(); diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java index 58d99d60d6..0a54855baf 100644 --- a/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java @@ -30,7 +30,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; public class LocalFileOffsetStoreTest { - @Mock private static MQClientInstance mQClientFactory; private static String group = "FooBarGroup"; diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java index 9a6a4b5550..7ecb0225c4 100644 --- a/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java @@ -43,7 +43,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class RemoteBrokerOffsetStoreTest { - @Mock private static MQClientInstance mQClientFactory; @Mock diff --git a/client/src/test/java/org/apache/rocketmq/client/impl/MQClientAPIImplTest.java b/client/src/test/java/org/apache/rocketmq/client/impl/MQClientAPIImplTest.java new file mode 100644 index 0000000000..cbcf560127 --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/impl/MQClientAPIImplTest.java @@ -0,0 +1,236 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.client.impl; + +import java.lang.reflect.Field; +import org.apache.rocketmq.client.ClientConfig; +import org.apache.rocketmq.client.exception.MQBrokerException; +import org.apache.rocketmq.client.hook.SendMessageContext; +import org.apache.rocketmq.client.impl.producer.DefaultMQProducerImpl; +import org.apache.rocketmq.client.producer.DefaultMQProducer; +import org.apache.rocketmq.client.producer.SendCallback; +import org.apache.rocketmq.client.producer.SendResult; +import org.apache.rocketmq.client.producer.SendStatus; +import org.apache.rocketmq.common.message.Message; +import org.apache.rocketmq.common.message.MessageConst; +import org.apache.rocketmq.common.protocol.ResponseCode; +import org.apache.rocketmq.common.protocol.header.SendMessageRequestHeader; +import org.apache.rocketmq.common.protocol.header.SendMessageResponseHeader; +import org.apache.rocketmq.remoting.InvokeCallback; +import org.apache.rocketmq.remoting.RemotingClient; +import org.apache.rocketmq.remoting.exception.RemotingException; +import org.apache.rocketmq.remoting.exception.RemotingTimeoutException; +import org.apache.rocketmq.remoting.netty.NettyClientConfig; +import org.apache.rocketmq.remoting.netty.NettyRemotingClient; +import org.apache.rocketmq.remoting.netty.ResponseFuture; +import org.apache.rocketmq.remoting.protocol.RemotingCommand; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.failBecauseExceptionWasNotThrown; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; + +public class MQClientAPIImplTest { + private static MQClientAPIImpl mqClientAPI = new MQClientAPIImpl(new NettyClientConfig(), null, null, new ClientConfig()); + @Mock + private static RemotingClient remotingClient; + @Mock + private static DefaultMQProducerImpl defaultMQProducerImpl; + + private String brokerAddr = "127.0.0.1"; + private String brokerName = "DefaultBroker"; + private static String group = "FooBarGroup"; + private static String topic = "FooBar"; + private Message msg = new Message("FooBar", new byte[] {}); + + @BeforeClass + public static void init() throws Exception { + remotingClient = mock(NettyRemotingClient.class); + defaultMQProducerImpl = mock(DefaultMQProducerImpl.class); + Field field = MQClientAPIImpl.class.getDeclaredField("remotingClient"); + field.setAccessible(true); + field.set(mqClientAPI, remotingClient); + } + + @Test + public void testSendMessageOneWay_Success() throws RemotingException, InterruptedException, MQBrokerException { + doNothing().when(remotingClient).invokeOneway(anyString(), any(RemotingCommand.class), anyLong()); + SendResult sendResult = mqClientAPI.sendMessage(brokerAddr, brokerName, msg, new SendMessageRequestHeader(), + 3 * 1000, CommunicationMode.ONEWAY, new SendMessageContext(), defaultMQProducerImpl); + assertThat(sendResult).isNull(); + } + + @Test + public void testSendMessageOneWay_WithException() throws RemotingException, InterruptedException, MQBrokerException { + doThrow(new RemotingTimeoutException("Remoting Exception in Test")).when(remotingClient).invokeOneway(anyString(), any(RemotingCommand.class), anyLong()); + try { + mqClientAPI.sendMessage(brokerAddr, brokerName, msg, new SendMessageRequestHeader(), + 3 * 1000, CommunicationMode.ONEWAY, new SendMessageContext(), defaultMQProducerImpl); + failBecauseExceptionWasNotThrown(RemotingException.class); + } catch (RemotingException e) { + assertThat(e).hasMessage("Remoting Exception in Test"); + } + + doThrow(new InterruptedException("Interrupted Exception in Test")).when(remotingClient).invokeOneway(anyString(), any(RemotingCommand.class), anyLong()); + try { + mqClientAPI.sendMessage(brokerAddr, brokerName, msg, new SendMessageRequestHeader(), + 3 * 1000, CommunicationMode.ONEWAY, new SendMessageContext(), defaultMQProducerImpl); + failBecauseExceptionWasNotThrown(InterruptedException.class); + } catch (InterruptedException e) { + assertThat(e).hasMessage("Interrupted Exception in Test"); + } + } + + @Test + public void testSendMessageSync_Success() throws InterruptedException, RemotingException, MQBrokerException { + doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock mock) throws Throwable { + RemotingCommand request = mock.getArgument(1); + return createSuccessResponse(request); + } + }).when(remotingClient).invokeSync(anyString(), any(RemotingCommand.class), anyLong()); + + SendMessageRequestHeader requestHeader = createSendMessageRequestHeader(); + + SendResult sendResult = mqClientAPI.sendMessage(brokerAddr, brokerName, msg, requestHeader, + 3 * 1000, CommunicationMode.SYNC, new SendMessageContext(), defaultMQProducerImpl); + + assertThat(sendResult.getSendStatus()).isEqualTo(SendStatus.SEND_OK); + assertThat(sendResult.getOffsetMsgId()).isEqualTo("123"); + assertThat(sendResult.getQueueOffset()).isEqualTo(123L); + assertThat(sendResult.getMessageQueue().getQueueId()).isEqualTo(1); + } + + @Test + public void testSendMessageSync_WithException() throws InterruptedException, RemotingException, MQBrokerException { + doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock mock) throws Throwable { + RemotingCommand request = mock.getArgument(1); + RemotingCommand response = RemotingCommand.createResponseCommand(SendMessageResponseHeader.class); + response.setCode(ResponseCode.SYSTEM_ERROR); + response.setOpaque(request.getOpaque()); + response.setRemark("Broker is broken."); + return response; + } + }).when(remotingClient).invokeSync(anyString(), any(RemotingCommand.class), anyLong()); + + SendMessageRequestHeader requestHeader = createSendMessageRequestHeader(); + + try { + mqClientAPI.sendMessage(brokerAddr, brokerName, msg, requestHeader, + 3 * 1000, CommunicationMode.SYNC, new SendMessageContext(), defaultMQProducerImpl); + failBecauseExceptionWasNotThrown(MQBrokerException.class); + } catch (MQBrokerException e) { + assertThat(e).hasMessageContaining("Broker is broken."); + } + } + + @Test + public void testSendMessageAsync_Success() throws RemotingException, InterruptedException, MQBrokerException { + doNothing().when(remotingClient).invokeAsync(anyString(), any(RemotingCommand.class), anyLong(), any(InvokeCallback.class)); + SendResult sendResult = mqClientAPI.sendMessage(brokerAddr, brokerName, msg, new SendMessageRequestHeader(), + 3 * 1000, CommunicationMode.ASYNC, new SendMessageContext(), defaultMQProducerImpl); + assertThat(sendResult).isNull(); + + doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock mock) throws Throwable { + InvokeCallback callback = mock.getArgument(3); + RemotingCommand request = mock.getArgument(1); + ResponseFuture responseFuture = new ResponseFuture(request.getOpaque(), 3 * 1000, null, null); + responseFuture.setResponseCommand(createSuccessResponse(request)); + callback.operationComplete(responseFuture); + return null; + } + }).when(remotingClient).invokeAsync(anyString(), any(RemotingCommand.class), anyLong(), any(InvokeCallback.class)); + SendMessageContext sendMessageContext = new SendMessageContext(); + sendMessageContext.setProducer(new DefaultMQProducerImpl(new DefaultMQProducer())); + mqClientAPI.sendMessage(brokerAddr, brokerName, msg, new SendMessageRequestHeader(), 3 * 1000, CommunicationMode.ASYNC, + new SendCallback() { + @Override public void onSuccess(SendResult sendResult) { + assertThat(sendResult.getSendStatus()).isEqualTo(SendStatus.SEND_OK); + assertThat(sendResult.getOffsetMsgId()).isEqualTo("123"); + assertThat(sendResult.getQueueOffset()).isEqualTo(123L); + assertThat(sendResult.getMessageQueue().getQueueId()).isEqualTo(1); + } + + @Override public void onException(Throwable e) { + } + }, + null, null, 0, sendMessageContext, defaultMQProducerImpl); + } + + @Test + public void testSendMessageAsync_WithException() throws RemotingException, InterruptedException, MQBrokerException { + doThrow(new RemotingTimeoutException("Remoting Exception in Test")).when(remotingClient) + .invokeAsync(anyString(), any(RemotingCommand.class), anyLong(), any(InvokeCallback.class)); + try { + mqClientAPI.sendMessage(brokerAddr, brokerName, msg, new SendMessageRequestHeader(), + 3 * 1000, CommunicationMode.ASYNC, new SendMessageContext(), defaultMQProducerImpl); + failBecauseExceptionWasNotThrown(RemotingException.class); + } catch (RemotingException e) { + assertThat(e).hasMessage("Remoting Exception in Test"); + } + + doThrow(new InterruptedException("Interrupted Exception in Test")).when(remotingClient) + .invokeAsync(anyString(), any(RemotingCommand.class), anyLong(), any(InvokeCallback.class)); + try { + mqClientAPI.sendMessage(brokerAddr, brokerName, msg, new SendMessageRequestHeader(), + 3 * 1000, CommunicationMode.ASYNC, new SendMessageContext(), defaultMQProducerImpl); + failBecauseExceptionWasNotThrown(InterruptedException.class); + } catch (InterruptedException e) { + assertThat(e).hasMessage("Interrupted Exception in Test"); + } + } + + private RemotingCommand createSuccessResponse(RemotingCommand request) { + RemotingCommand response = RemotingCommand.createResponseCommand(SendMessageResponseHeader.class); + response.setCode(ResponseCode.SUCCESS); + response.setOpaque(request.getOpaque()); + + SendMessageResponseHeader responseHeader = (SendMessageResponseHeader) response.readCustomHeader(); + responseHeader.setMsgId("123"); + responseHeader.setQueueId(1); + responseHeader.setQueueOffset(123L); + + response.addExtField(MessageConst.PROPERTY_MSG_REGION, "RegionHZ"); + response.addExtField(MessageConst.PROPERTY_TRACE_SWITCH, "true"); + response.addExtField("queueId", String.valueOf(responseHeader.getQueueId())); + response.addExtField("msgId", responseHeader.getMsgId()); + response.addExtField("queueOffset", String.valueOf(responseHeader.getQueueOffset())); + return response; + } + + private SendMessageRequestHeader createSendMessageRequestHeader() { + SendMessageRequestHeader requestHeader = new SendMessageRequestHeader(); + requestHeader.setBornTimestamp(System.currentTimeMillis()); + requestHeader.setTopic(topic); + requestHeader.setProducerGroup(group); + requestHeader.setQueueId(1); + requestHeader.setMaxReconsumeTimes(10); + return requestHeader; + } +} \ No newline at end of file diff --git a/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java b/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java index 956cdd9065..b7b07c6af9 100644 --- a/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.rocketmq.client.ClientConfig; import org.apache.rocketmq.client.admin.MQAdminExtInner; import org.apache.rocketmq.client.exception.MQBrokerException; -import org.apache.rocketmq.client.impl.MQClientAPIImpl; import org.apache.rocketmq.client.impl.MQClientManager; import org.apache.rocketmq.client.impl.consumer.MQConsumerInner; import org.apache.rocketmq.client.impl.producer.DefaultMQProducerImpl; @@ -34,7 +33,6 @@ import org.apache.rocketmq.remoting.exception.RemotingException; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; -import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -42,11 +40,8 @@ import static org.mockito.Mockito.mock; @RunWith(MockitoJUnitRunner.class) public class MQClientInstanceTest { - - @Mock - private static MQClientAPIImpl mqClientAPI; @InjectMocks - private static MQClientInstance mqClientInstance = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig());; + private MQClientInstance mqClientInstance = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig());; private String topic = "FooBar"; private String group = "FooBarGroup"; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java index 46ca8dd118..99c13fbb77 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java @@ -114,9 +114,7 @@ public class RemotingCommand { } public static RemotingCommand createResponseCommand(Class classHeader) { - RemotingCommand cmd = createResponseCommand(RemotingSysResponseCode.SYSTEM_ERROR, "not set any response code", classHeader); - - return cmd; + return createResponseCommand(RemotingSysResponseCode.SYSTEM_ERROR, "not set any response code", classHeader); } /** From bbcb69ec8de00c54b9fdc1678a628751912316de Mon Sep 17 00:00:00 2001 From: yukon Date: Tue, 17 Jan 2017 21:37:26 +0800 Subject: [PATCH 21/27] [ROCKETMQ-52] Use MockitoJUnitRunner with Mock --- .../store/LocalFileOffsetStoreTest.java | 19 +++++++-------- .../store/RemoteBrokerOffsetStoreTest.java | 23 +++++++++---------- .../client/impl/MQClientAPIImplTest.java | 19 ++++++++------- .../impl/factory/MQClientInstanceTest.java | 3 --- 4 files changed, 30 insertions(+), 34 deletions(-) diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java index 0a54855baf..0b522e60e2 100644 --- a/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java @@ -21,25 +21,26 @@ import java.util.HashSet; import org.apache.rocketmq.client.ClientConfig; import org.apache.rocketmq.client.impl.factory.MQClientInstance; import org.apache.rocketmq.common.message.MessageQueue; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnitRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class LocalFileOffsetStoreTest { @Mock - private static MQClientInstance mQClientFactory; - private static String group = "FooBarGroup"; - private static String topic = "FooBar"; - private static String brokerName = "DefaultBrokerName"; + private MQClientInstance mQClientFactory; + private String group = "FooBarGroup"; + private String topic = "FooBar"; + private String brokerName = "DefaultBrokerName"; - @BeforeClass - public static void init() { + @Before + public void init() { System.setProperty("rocketmq.client.localOffsetStoreDir", System.getProperty("java.io.tmpdir") + ".rocketmq_offsets"); - mQClientFactory = Mockito.mock(MQClientInstance.class); String clientId = new ClientConfig().buildMQClientId() + "#TestNamespace" + System.currentTimeMillis(); when(mQClientFactory.getClientId()).thenReturn(clientId); } diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java index 7ecb0225c4..a13930fdea 100644 --- a/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java @@ -27,10 +27,12 @@ import org.apache.rocketmq.common.message.MessageQueue; import org.apache.rocketmq.common.protocol.header.QueryConsumerOffsetRequestHeader; import org.apache.rocketmq.common.protocol.header.UpdateConsumerOffsetRequestHeader; import org.apache.rocketmq.remoting.exception.RemotingException; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; +import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import static org.assertj.core.api.Assertions.assertThat; @@ -39,27 +41,24 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class RemoteBrokerOffsetStoreTest { @Mock - private static MQClientInstance mQClientFactory; + private MQClientInstance mQClientFactory; @Mock - private static MQClientAPIImpl mqClientAPI; - private static String group = "FooBarGroup"; - private static String topic = "FooBar"; - private static String brokerName = "DefaultBrokerName"; + private MQClientAPIImpl mqClientAPI; + private String group = "FooBarGroup"; + private String topic = "FooBar"; + private String brokerName = "DefaultBrokerName"; - @BeforeClass - public static void init() { + @Before + public void init() { System.setProperty("rocketmq.client.localOffsetStoreDir", System.getProperty("java.io.tmpdir") + ".rocketmq_offsets"); - mQClientFactory = mock(MQClientInstance.class); String clientId = new ClientConfig().buildMQClientId() + "#TestNamespace" + System.currentTimeMillis(); when(mQClientFactory.getClientId()).thenReturn(clientId); when(mQClientFactory.findBrokerAddressInAdmin(brokerName)).thenReturn(new FindBrokerResult("127.0.0.1", false)); - - mqClientAPI = mock(MQClientAPIImpl.class); when(mQClientFactory.getMQClientAPIImpl()).thenReturn(mqClientAPI); } diff --git a/client/src/test/java/org/apache/rocketmq/client/impl/MQClientAPIImplTest.java b/client/src/test/java/org/apache/rocketmq/client/impl/MQClientAPIImplTest.java index cbcf560127..3553738f38 100644 --- a/client/src/test/java/org/apache/rocketmq/client/impl/MQClientAPIImplTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/impl/MQClientAPIImplTest.java @@ -35,13 +35,14 @@ import org.apache.rocketmq.remoting.RemotingClient; import org.apache.rocketmq.remoting.exception.RemotingException; import org.apache.rocketmq.remoting.exception.RemotingTimeoutException; import org.apache.rocketmq.remoting.netty.NettyClientConfig; -import org.apache.rocketmq.remoting.netty.NettyRemotingClient; import org.apache.rocketmq.remoting.netty.ResponseFuture; import org.apache.rocketmq.remoting.protocol.RemotingCommand; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; +import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import static org.assertj.core.api.Assertions.assertThat; @@ -52,14 +53,14 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; +@RunWith(MockitoJUnitRunner.class) public class MQClientAPIImplTest { - private static MQClientAPIImpl mqClientAPI = new MQClientAPIImpl(new NettyClientConfig(), null, null, new ClientConfig()); + private MQClientAPIImpl mqClientAPI = new MQClientAPIImpl(new NettyClientConfig(), null, null, new ClientConfig()); @Mock - private static RemotingClient remotingClient; + private RemotingClient remotingClient; @Mock - private static DefaultMQProducerImpl defaultMQProducerImpl; + private DefaultMQProducerImpl defaultMQProducerImpl; private String brokerAddr = "127.0.0.1"; private String brokerName = "DefaultBroker"; @@ -67,10 +68,8 @@ public class MQClientAPIImplTest { private static String topic = "FooBar"; private Message msg = new Message("FooBar", new byte[] {}); - @BeforeClass - public static void init() throws Exception { - remotingClient = mock(NettyRemotingClient.class); - defaultMQProducerImpl = mock(DefaultMQProducerImpl.class); + @Before + public void init() throws Exception { Field field = MQClientAPIImpl.class.getDeclaredField("remotingClient"); field.setAccessible(true); field.set(mqClientAPI, remotingClient); diff --git a/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java b/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java index b7b07c6af9..c32cdab65c 100644 --- a/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java @@ -32,7 +32,6 @@ import org.apache.rocketmq.common.protocol.route.TopicRouteData; import org.apache.rocketmq.remoting.exception.RemotingException; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.InjectMocks; import org.mockito.junit.MockitoJUnitRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -40,9 +39,7 @@ import static org.mockito.Mockito.mock; @RunWith(MockitoJUnitRunner.class) public class MQClientInstanceTest { - @InjectMocks private MQClientInstance mqClientInstance = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig());; - private String topic = "FooBar"; private String group = "FooBarGroup"; From e06a26cef72948603b54299f8a234faf468fc2c0 Mon Sep 17 00:00:00 2001 From: yukon Date: Tue, 17 Jan 2017 22:03:07 +0800 Subject: [PATCH 22/27] [ROCKETMQ-52] Add unit tests for LatencyFaultTolerance --- .../LatencyFaultToleranceImplTest.java | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 client/src/test/java/org/apache/rocketmq/client/latency/LatencyFaultToleranceImplTest.java diff --git a/client/src/test/java/org/apache/rocketmq/client/latency/LatencyFaultToleranceImplTest.java b/client/src/test/java/org/apache/rocketmq/client/latency/LatencyFaultToleranceImplTest.java new file mode 100644 index 0000000000..86690e40be --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/latency/LatencyFaultToleranceImplTest.java @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.client.latency; + +import java.util.concurrent.TimeUnit; +import org.junit.Before; +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class LatencyFaultToleranceImplTest { + private LatencyFaultTolerance latencyFaultTolerance; + private String brokerName = "BrokerA"; + private String anotherBrokerName = "BrokerB"; + + @Before + public void init() { + latencyFaultTolerance = new LatencyFaultToleranceImpl(); + } + + @Test + public void testUpdateFaultItem() throws Exception { + latencyFaultTolerance.updateFaultItem(brokerName, 3000, 3000); + assertThat(latencyFaultTolerance.isAvailable(brokerName)).isFalse(); + assertThat(latencyFaultTolerance.isAvailable(anotherBrokerName)).isTrue(); + } + + @Test + public void testIsAvailable() throws Exception { + latencyFaultTolerance.updateFaultItem(brokerName, 3000, 50); + assertThat(latencyFaultTolerance.isAvailable(brokerName)).isFalse(); + + TimeUnit.MILLISECONDS.sleep(70); + assertThat(latencyFaultTolerance.isAvailable(brokerName)).isTrue(); + } + + @Test + public void testRemove() throws Exception { + latencyFaultTolerance.updateFaultItem(brokerName, 3000, 3000); + assertThat(latencyFaultTolerance.isAvailable(brokerName)).isFalse(); + latencyFaultTolerance.remove(brokerName); + assertThat(latencyFaultTolerance.isAvailable(brokerName)).isTrue(); + } + + @Test + public void testPickOneAtLeast() throws Exception { + latencyFaultTolerance.updateFaultItem(brokerName, 1000, 3000); + assertThat(latencyFaultTolerance.pickOneAtLeast()).isEqualTo(brokerName); + + latencyFaultTolerance.updateFaultItem(anotherBrokerName, 1001, 3000); + assertThat(latencyFaultTolerance.pickOneAtLeast()).isEqualTo(brokerName); + } +} \ No newline at end of file From 6511bc327126fd419801741f18a3c99f87063fe9 Mon Sep 17 00:00:00 2001 From: yukon Date: Wed, 18 Jan 2017 16:59:48 +0800 Subject: [PATCH 23/27] [ROCKETMQ-52] Add unit tests for DefaultMQProducer --- .../store/LocalFileOffsetStoreTest.java | 3 +- .../impl/factory/MQClientInstanceTest.java | 6 +- .../impl/producer/DefaultMQProducerTest.java | 250 ++++++++++++++++++ 3 files changed, 255 insertions(+), 4 deletions(-) create mode 100644 client/src/test/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerTest.java diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java index 0b522e60e2..bf0adcb435 100644 --- a/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java @@ -16,6 +16,7 @@ */ package org.apache.rocketmq.client.consumer.store; +import java.io.File; import java.util.Collections; import java.util.HashSet; import org.apache.rocketmq.client.ClientConfig; @@ -40,7 +41,7 @@ public class LocalFileOffsetStoreTest { @Before public void init() { - System.setProperty("rocketmq.client.localOffsetStoreDir", System.getProperty("java.io.tmpdir") + ".rocketmq_offsets"); + System.setProperty("rocketmq.client.localOffsetStoreDir", System.getProperty("java.io.tmpdir") + File.separator + ".rocketmq_offsets"); String clientId = new ClientConfig().buildMQClientId() + "#TestNamespace" + System.currentTimeMillis(); when(mQClientFactory.getClientId()).thenReturn(clientId); } diff --git a/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java b/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java index c32cdab65c..eedf0b183e 100644 --- a/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; @RunWith(MockitoJUnitRunner.class) public class MQClientInstanceTest { - private MQClientInstance mqClientInstance = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig());; + private MQClientInstance mqClientInstance = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig()); private String topic = "FooBar"; private String group = "FooBarGroup"; @@ -53,7 +53,7 @@ public class MQClientInstanceTest { brokerData.setBrokerName("BrokerA"); brokerData.setCluster("DefaultCluster"); HashMap brokerAddrs = new HashMap<>(); - brokerAddrs.put(0L, "127.0.0.1"); + brokerAddrs.put(0L, "127.0.0.1:10911"); brokerData.setBrokerAddrs(brokerAddrs); brokerDataList.add(brokerData); topicRouteData.setBrokerDatas(brokerDataList); @@ -61,7 +61,7 @@ public class MQClientInstanceTest { List queueDataList = new ArrayList<>(); QueueData queueData = new QueueData(); queueData.setBrokerName("BrokerA"); - queueData.setPerm(2); + queueData.setPerm(6); queueData.setReadQueueNums(3); queueData.setWriteQueueNums(4); queueData.setTopicSynFlag(0); diff --git a/client/src/test/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerTest.java b/client/src/test/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerTest.java new file mode 100644 index 0000000000..5946ea8385 --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerTest.java @@ -0,0 +1,250 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.client.impl.producer; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import org.apache.rocketmq.client.ClientConfig; +import org.apache.rocketmq.client.exception.MQBrokerException; +import org.apache.rocketmq.client.exception.MQClientException; +import org.apache.rocketmq.client.hook.SendMessageContext; +import org.apache.rocketmq.client.hook.SendMessageHook; +import org.apache.rocketmq.client.impl.CommunicationMode; +import org.apache.rocketmq.client.impl.MQClientAPIImpl; +import org.apache.rocketmq.client.impl.MQClientManager; +import org.apache.rocketmq.client.impl.factory.MQClientInstance; +import org.apache.rocketmq.client.producer.DefaultMQProducer; +import org.apache.rocketmq.client.producer.SendCallback; +import org.apache.rocketmq.client.producer.SendResult; +import org.apache.rocketmq.client.producer.SendStatus; +import org.apache.rocketmq.common.message.Message; +import org.apache.rocketmq.common.protocol.header.SendMessageRequestHeader; +import org.apache.rocketmq.common.protocol.route.BrokerData; +import org.apache.rocketmq.common.protocol.route.QueueData; +import org.apache.rocketmq.common.protocol.route.TopicRouteData; +import org.apache.rocketmq.remoting.exception.RemotingException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.MockitoJUnitRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.failBecauseExceptionWasNotThrown; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.when; + +@RunWith(MockitoJUnitRunner.class) +public class DefaultMQProducerTest { + @Spy + private MQClientInstance mQClientFactory = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig()); + @Mock + private MQClientAPIImpl mQClientAPIImpl; + + private DefaultMQProducer producer; + private Message message; + private Message zeroMsg; + private String topic = "FooBar"; + private String producerGroupPrefix = "FooBar_PID"; + + @Before + public void init() throws Exception { + String producerGroupTemp = producerGroupPrefix + System.currentTimeMillis(); + producer = new DefaultMQProducer(producerGroupTemp); + producer.setNamesrvAddr("127.0.0.1:9876"); + message = new Message(topic, new byte[] {'a'}); + zeroMsg = new Message(topic, new byte[] {}); + + producer.start(); + + Field field = DefaultMQProducerImpl.class.getDeclaredField("mQClientFactory"); + field.setAccessible(true); + field.set(producer.getDefaultMQProducerImpl(), mQClientFactory); + + field = MQClientInstance.class.getDeclaredField("mQClientAPIImpl"); + field.setAccessible(true); + field.set(mQClientFactory, mQClientAPIImpl); + + producer.getDefaultMQProducerImpl().getmQClientFactory().registerProducer(producerGroupTemp, producer.getDefaultMQProducerImpl()); + + when(mQClientAPIImpl.sendMessage(anyString(), anyString(), any(Message.class), any(SendMessageRequestHeader.class), anyLong(), any(CommunicationMode.class), + nullable(SendMessageContext.class), any(DefaultMQProducerImpl.class))).thenCallRealMethod(); + when(mQClientAPIImpl.sendMessage(anyString(), anyString(), any(Message.class), any(SendMessageRequestHeader.class), anyLong(), any(CommunicationMode.class), + nullable(SendCallback.class), nullable(TopicPublishInfo.class), nullable(MQClientInstance.class), anyInt(), nullable(SendMessageContext.class), any(DefaultMQProducerImpl.class))) + .thenReturn(createSendResult(SendStatus.SEND_OK)); + } + + @After + public void terminate() { + producer.shutdown(); + } + + @Test + public void testSendMessage_ZeroMessage() throws InterruptedException, RemotingException, MQBrokerException { + try { + producer.send(zeroMsg); + failBecauseExceptionWasNotThrown(MQClientException.class); + } catch (MQClientException e) { + assertThat(e).hasMessageContaining("message body length is zero"); + } + } + + @Test + public void testSendMessage_NoNameSrv() throws RemotingException, InterruptedException, MQBrokerException { + when(mQClientAPIImpl.getNameServerAddressList()).thenReturn(new ArrayList()); + try { + producer.send(message); + failBecauseExceptionWasNotThrown(MQClientException.class); + } catch (MQClientException e) { + assertThat(e).hasMessageContaining("No name server address"); + } + } + + @Test + public void testSendMessage_NoRoute() throws RemotingException, InterruptedException, MQBrokerException { + when(mQClientAPIImpl.getNameServerAddressList()).thenReturn(Collections.singletonList("127.0.0.1:9876")); + try { + producer.send(message); + failBecauseExceptionWasNotThrown(MQClientException.class); + } catch (MQClientException e) { + assertThat(e).hasMessageContaining("No route info of this topic"); + } + } + + @Test + public void testSendMessageSync_Success() throws RemotingException, InterruptedException, MQBrokerException, MQClientException { + when(mQClientAPIImpl.getTopicRouteInfoFromNameServer(anyString(), anyLong())).thenReturn(createTopicRoute()); + SendResult sendResult = producer.send(message); + + assertThat(sendResult.getSendStatus()).isEqualTo(SendStatus.SEND_OK); + assertThat(sendResult.getOffsetMsgId()).isEqualTo("123"); + assertThat(sendResult.getQueueOffset()).isEqualTo(456L); + } + + @Test + public void testSendMessageSync_SuccessWithHook() throws Throwable { + when(mQClientAPIImpl.getTopicRouteInfoFromNameServer(anyString(), anyLong())).thenReturn(createTopicRoute()); + final Throwable[] assertionErrors = new Throwable[1]; + final CountDownLatch countDownLatch = new CountDownLatch(2); + producer.getDefaultMQProducerImpl().registerSendMessageHook(new SendMessageHook() { + @Override public String hookName() { + return "TestHook"; + } + + @Override public void sendMessageBefore(final SendMessageContext context) { + assertionErrors[0] = assertInOtherThread(new Runnable() { + @Override public void run() { + assertThat(context.getMessage()).isEqualTo(message); + assertThat(context.getProducer()).isEqualTo(producer); + assertThat(context.getCommunicationMode()).isEqualTo(CommunicationMode.SYNC); + assertThat(context.getSendResult()).isNull(); + } + }); + countDownLatch.countDown(); + } + + @Override public void sendMessageAfter(final SendMessageContext context) { + assertionErrors[0] = assertInOtherThread(new Runnable() { + @Override public void run() { + assertThat(context.getMessage()).isEqualTo(message); + assertThat(context.getProducer()).isEqualTo(producer.getDefaultMQProducerImpl()); + assertThat(context.getCommunicationMode()).isEqualTo(CommunicationMode.SYNC); + assertThat(context.getSendResult()).isNotNull(); + } + }); + countDownLatch.countDown(); + } + }); + SendResult sendResult = producer.send(message); + + assertThat(sendResult.getSendStatus()).isEqualTo(SendStatus.SEND_OK); + assertThat(sendResult.getOffsetMsgId()).isEqualTo("123"); + assertThat(sendResult.getQueueOffset()).isEqualTo(456L); + + countDownLatch.await(); + + if (assertionErrors[0] != null) { + throw assertionErrors[0]; + } + } + + private TopicRouteData createTopicRoute() { + TopicRouteData topicRouteData = new TopicRouteData(); + + topicRouteData.setFilterServerTable(new HashMap>()); + List brokerDataList = new ArrayList<>(); + BrokerData brokerData = new BrokerData(); + brokerData.setBrokerName("BrokerA"); + brokerData.setCluster("DefaultCluster"); + HashMap brokerAddrs = new HashMap<>(); + brokerAddrs.put(0L, "127.0.0.1:10911"); + brokerData.setBrokerAddrs(brokerAddrs); + brokerDataList.add(brokerData); + topicRouteData.setBrokerDatas(brokerDataList); + + List queueDataList = new ArrayList<>(); + QueueData queueData = new QueueData(); + queueData.setBrokerName("BrokerA"); + queueData.setPerm(6); + queueData.setReadQueueNums(3); + queueData.setWriteQueueNums(4); + queueData.setTopicSynFlag(0); + queueDataList.add(queueData); + topicRouteData.setQueueDatas(queueDataList); + return topicRouteData; + } + + private SendResult createSendResult(SendStatus sendStatus) { + SendResult sendResult = new SendResult(); + sendResult.setMsgId("123"); + sendResult.setOffsetMsgId("123"); + sendResult.setQueueOffset(456); + sendResult.setSendStatus(sendStatus); + sendResult.setRegionId("HZ"); + return sendResult; + } + + private Throwable assertInOtherThread(final Runnable runnable) { + final Throwable[] assertionErrors = new Throwable[1]; + Thread thread = new Thread(new Runnable() { + @Override public void run() { + try { + runnable.run(); + } catch (AssertionError e) { + assertionErrors[0] = e; + } + } + }); + thread.start(); + try { + thread.join(); + } catch (InterruptedException e) { + assertionErrors[0] = e; + } + return assertionErrors[0]; + } +} \ No newline at end of file From c549854f923d1b82ab41b7bb9d957809b0056563 Mon Sep 17 00:00:00 2001 From: yukon Date: Wed, 18 Jan 2017 17:08:26 +0800 Subject: [PATCH 24/27] [ROCKETMQ-51] Remove heavy unit tests in rocketmq-broker --- .../rocketmq/broker/BrokerTestHarness.java | 69 ---------------- .../broker/api/BrokerFastFailureTest.java | 61 -------------- .../rocketmq/broker/api/SendMessageTest.java | 79 ------------------- .../offset/ConsumerOffsetManagerTest.java | 61 -------------- .../broker/topic/TopicConfigManagerTest.java | 60 -------------- 5 files changed, 330 deletions(-) delete mode 100644 broker/src/test/java/org/apache/rocketmq/broker/BrokerTestHarness.java delete mode 100644 broker/src/test/java/org/apache/rocketmq/broker/api/BrokerFastFailureTest.java delete mode 100644 broker/src/test/java/org/apache/rocketmq/broker/api/SendMessageTest.java delete mode 100644 broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java delete mode 100644 broker/src/test/java/org/apache/rocketmq/broker/topic/TopicConfigManagerTest.java diff --git a/broker/src/test/java/org/apache/rocketmq/broker/BrokerTestHarness.java b/broker/src/test/java/org/apache/rocketmq/broker/BrokerTestHarness.java deleted file mode 100644 index f5332dc875..0000000000 --- a/broker/src/test/java/org/apache/rocketmq/broker/BrokerTestHarness.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * $Id: SendMessageTest.java 1831 2013-05-16 01:39:51Z vintagewang@apache.org $ - */ -package org.apache.rocketmq.broker; - -import java.io.File; -import java.util.Random; -import org.apache.rocketmq.common.BrokerConfig; -import org.apache.rocketmq.remoting.netty.NettyClientConfig; -import org.apache.rocketmq.remoting.netty.NettyServerConfig; -import org.apache.rocketmq.store.config.MessageStoreConfig; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class BrokerTestHarness { - - public final String BROKER_NAME = "TestBrokerName"; - protected BrokerController brokerController = null; - protected Random random = new Random(); - protected String brokerAddr = ""; - protected Logger logger = LoggerFactory.getLogger(BrokerTestHarness.class); - protected BrokerConfig brokerConfig = new BrokerConfig(); - protected NettyServerConfig nettyServerConfig = new NettyServerConfig(); - protected NettyClientConfig nettyClientConfig = new NettyClientConfig(); - protected MessageStoreConfig storeConfig = new MessageStoreConfig(); - - @Before - public void startup() throws Exception { - brokerConfig.setBrokerName(BROKER_NAME); - brokerConfig.setBrokerIP1("127.0.0.1"); - storeConfig.setStorePathRootDir(System.getProperty("user.home") + File.separator + "unitteststore"); - storeConfig.setStorePathCommitLog(System.getProperty("user.home") + File.separator + "unitteststore" + File.separator + "commitlog"); - nettyServerConfig.setListenPort(10000 + random.nextInt(1000)); - brokerAddr = brokerConfig.getBrokerIP1() + ":" + nettyServerConfig.getListenPort(); - brokerController = new BrokerController(brokerConfig, nettyServerConfig, nettyClientConfig, storeConfig); - boolean initResult = brokerController.initialize(); - Assert.assertTrue(initResult); - logger.info("Broker Start name:{} addr:{}", brokerConfig.getBrokerName(), brokerController.getBrokerAddr()); - brokerController.start(); - } - - @After - public void shutdown() throws Exception { - if (brokerController != null) { - brokerController.shutdown(); - } - //maybe need to clean the file store. But we do not suggest deleting anything. - } -} diff --git a/broker/src/test/java/org/apache/rocketmq/broker/api/BrokerFastFailureTest.java b/broker/src/test/java/org/apache/rocketmq/broker/api/BrokerFastFailureTest.java deleted file mode 100644 index bec0af5a0d..0000000000 --- a/broker/src/test/java/org/apache/rocketmq/broker/api/BrokerFastFailureTest.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.rocketmq.broker.api; - -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; -import org.apache.rocketmq.broker.BrokerTestHarness; -import org.apache.rocketmq.broker.latency.BrokerFastFailure; -import org.apache.rocketmq.broker.latency.FutureTaskExt; -import org.apache.rocketmq.remoting.netty.RequestTask; -import org.junit.Assert; -import org.junit.Test; - -public class BrokerFastFailureTest extends BrokerTestHarness { - - @Test - public void testHeadSlowTimeMills() throws InterruptedException { - BlockingQueue blockingQueue = new LinkedBlockingQueue<>(); - blockingQueue.add(new FutureTaskExt<>(new RequestTask(null, null, null), null)); - TimeUnit.MILLISECONDS.sleep(10); - Assert.assertTrue(this.brokerController.headSlowTimeMills(blockingQueue) > 0); - - blockingQueue.clear(); - blockingQueue.add(new Runnable() { - @Override public void run() { - - } - }); - Assert.assertTrue(this.brokerController.headSlowTimeMills(blockingQueue) == 0); - } - - @Test - public void testCastRunnable() { - Runnable runnable = new Runnable() { - @Override public void run() { - - } - }; - Assert.assertNull(BrokerFastFailure.castRunnable(runnable)); - - RequestTask requestTask = new RequestTask(null, null, null); - runnable = new FutureTaskExt<>(requestTask, null); - - Assert.assertEquals(requestTask, BrokerFastFailure.castRunnable(runnable)); - } -} diff --git a/broker/src/test/java/org/apache/rocketmq/broker/api/SendMessageTest.java b/broker/src/test/java/org/apache/rocketmq/broker/api/SendMessageTest.java deleted file mode 100644 index 69e01be7ab..0000000000 --- a/broker/src/test/java/org/apache/rocketmq/broker/api/SendMessageTest.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * $Id: SendMessageTest.java 1831 2013-05-16 01:39:51Z vintagewang@apache.org $ - */ -package org.apache.rocketmq.broker.api; - -import org.apache.rocketmq.broker.BrokerTestHarness; -import org.apache.rocketmq.client.ClientConfig; -import org.apache.rocketmq.client.hook.SendMessageContext; -import org.apache.rocketmq.client.impl.CommunicationMode; -import org.apache.rocketmq.client.impl.MQClientAPIImpl; -import org.apache.rocketmq.client.producer.SendResult; -import org.apache.rocketmq.client.producer.SendStatus; -import org.apache.rocketmq.common.MixAll; -import org.apache.rocketmq.common.message.Message; -import org.apache.rocketmq.common.message.MessageDecoder; -import org.apache.rocketmq.common.protocol.header.SendMessageRequestHeader; -import org.apache.rocketmq.remoting.netty.NettyClientConfig; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -public class SendMessageTest extends BrokerTestHarness { - - MQClientAPIImpl client = new MQClientAPIImpl(new NettyClientConfig(), null, null, new ClientConfig()); - String topic = "UnitTestTopic"; - - @Before - @Override - public void startup() throws Exception { - super.startup(); - client.start(); - - } - - @After - @Override - public void shutdown() throws Exception { - client.shutdown(); - super.shutdown(); - } - - @Test - public void testSendSingle() throws Exception { - Message msg = new Message(topic, "TAG1 TAG2", "100200300", "body".getBytes()); - SendMessageRequestHeader requestHeader = new SendMessageRequestHeader(); - requestHeader.setProducerGroup("abc"); - requestHeader.setTopic(msg.getTopic()); - requestHeader.setDefaultTopic(MixAll.DEFAULT_TOPIC); - requestHeader.setDefaultTopicQueueNums(4); - requestHeader.setQueueId(0); - requestHeader.setSysFlag(0); - requestHeader.setBornTimestamp(System.currentTimeMillis()); - requestHeader.setFlag(msg.getFlag()); - requestHeader.setProperties(MessageDecoder.messageProperties2String(msg.getProperties())); - - SendResult result = client.sendMessage(brokerAddr, BROKER_NAME, msg, requestHeader, 1000 * 5, - CommunicationMode.SYNC, new SendMessageContext(), null); - assertEquals(result.getSendStatus(), SendStatus.SEND_OK); - } -} diff --git a/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java b/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java deleted file mode 100644 index 76b1b7fb55..0000000000 --- a/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * $Id: ConsumerOffsetManagerTest.java 1831 2013-05-16 01:39:51Z vintagewang@apache.org $ - */ -package org.apache.rocketmq.broker.offset; - -import org.apache.rocketmq.broker.BrokerTestHarness; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -public class ConsumerOffsetManagerTest extends BrokerTestHarness { - - @Test - public void testFlushConsumerOffset() throws Exception { - ConsumerOffsetManager consumerOffsetManager = new ConsumerOffsetManager(brokerController); - for (int i = 0; i < 10; i++) { - String group = "UNIT_TEST_GROUP_" + i; - for (int id = 0; id < 10; id++) { - consumerOffsetManager.commitOffset(null, group, "TOPIC_A", id, id + 100); - consumerOffsetManager.commitOffset(null, group, "TOPIC_B", id, id + 100); - consumerOffsetManager.commitOffset(null, group, "TOPIC_C", id, id + 100); - } - } - consumerOffsetManager.persist(); - consumerOffsetManager.getOffsetTable().clear(); - for (int i = 0; i < 10; i++) { - String group = "UNIT_TEST_GROUP_" + i; - for (int id = 0; id < 10; id++) { - assertEquals(consumerOffsetManager.queryOffset(group, "TOPIC_A", id), -1); - assertEquals(consumerOffsetManager.queryOffset(group, "TOPIC_B", id), -1); - assertEquals(consumerOffsetManager.queryOffset(group, "TOPIC_B", id), -1); - } - } - consumerOffsetManager.load(); - for (int i = 0; i < 10; i++) { - String group = "UNIT_TEST_GROUP_" + i; - for (int id = 0; id < 10; id++) { - assertEquals(consumerOffsetManager.queryOffset(group, "TOPIC_A", id), id + 100); - assertEquals(consumerOffsetManager.queryOffset(group, "TOPIC_B", id), id + 100); - assertEquals(consumerOffsetManager.queryOffset(group, "TOPIC_B", id), id + 100); - } - } - } -} diff --git a/broker/src/test/java/org/apache/rocketmq/broker/topic/TopicConfigManagerTest.java b/broker/src/test/java/org/apache/rocketmq/broker/topic/TopicConfigManagerTest.java deleted file mode 100644 index e309be7290..0000000000 --- a/broker/src/test/java/org/apache/rocketmq/broker/topic/TopicConfigManagerTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * $Id: TopicConfigManagerTest.java 1831 2013-05-16 01:39:51Z vintagewang@apache.org $ - */ -package org.apache.rocketmq.broker.topic; - -import org.apache.rocketmq.broker.BrokerTestHarness; -import org.apache.rocketmq.common.MixAll; -import org.apache.rocketmq.common.TopicConfig; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -public class TopicConfigManagerTest extends BrokerTestHarness { - @Test - public void testFlushTopicConfig() throws Exception { - TopicConfigManager topicConfigManager = new TopicConfigManager(brokerController); - - for (int i = 0; i < 10; i++) { - String topic = "UNITTEST-" + i; - TopicConfig topicConfig = topicConfigManager.createTopicInSendMessageMethod(topic, MixAll.DEFAULT_TOPIC, null, 4, 0); - assertNotNull(topicConfig); - } - topicConfigManager.persist(); - - topicConfigManager.getTopicConfigTable().clear(); - - for (int i = 0; i < 10; i++) { - String topic = "UNITTEST-" + i; - TopicConfig topicConfig = topicConfigManager.selectTopicConfig(topic); - assertNull(topicConfig); - } - topicConfigManager.load(); - for (int i = 0; i < 10; i++) { - String topic = "UNITTEST-" + i; - TopicConfig topicConfig = topicConfigManager.selectTopicConfig(topic); - assertNotNull(topicConfig); - assertEquals(topicConfig.getTopicSysFlag(), 0); - assertEquals(topicConfig.getReadQueueNums(), 4); - } - } -} From acf9bc37ea987456e997259c496905e44cd71461 Mon Sep 17 00:00:00 2001 From: yukon Date: Thu, 19 Jan 2017 10:43:39 +0800 Subject: [PATCH 25/27] [ROCKETMQ-52] Add unit tests for DefaultMQPullConsumer --- .../consumer/DefaultMQPullConsumerTest.java | 152 ++++++++++++++++++ .../producer/DefaultMQProducerTest.java | 8 +- 2 files changed, 155 insertions(+), 5 deletions(-) create mode 100644 client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumerTest.java rename client/src/test/java/org/apache/rocketmq/client/{impl => }/producer/DefaultMQProducerTest.java (97%) diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumerTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumerTest.java new file mode 100644 index 0000000000..6dc4ed8d33 --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumerTest.java @@ -0,0 +1,152 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.client.consumer; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import org.apache.rocketmq.client.ClientConfig; +import org.apache.rocketmq.client.impl.CommunicationMode; +import org.apache.rocketmq.client.impl.FindBrokerResult; +import org.apache.rocketmq.client.impl.MQClientAPIImpl; +import org.apache.rocketmq.client.impl.MQClientManager; +import org.apache.rocketmq.client.impl.consumer.PullAPIWrapper; +import org.apache.rocketmq.client.impl.consumer.PullResultExt; +import org.apache.rocketmq.client.impl.factory.MQClientInstance; +import org.apache.rocketmq.common.message.MessageExt; +import org.apache.rocketmq.common.message.MessageQueue; +import org.apache.rocketmq.common.protocol.header.PullMessageRequestHeader; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.stubbing.Answer; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.when; + +@RunWith(MockitoJUnitRunner.class) +public class DefaultMQPullConsumerTest { + @Spy + private MQClientInstance mQClientFactory = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig()); + @Mock + private MQClientAPIImpl mQClientAPIImpl; + private DefaultMQPullConsumer pullConsumer; + private String consumerGroup = "FooBarGroup"; + private String topic = "FooBar"; + private String brokerName = "BrokerA"; + + @Before + public void init() throws Exception { + pullConsumer = new DefaultMQPullConsumer(consumerGroup); + pullConsumer.setNamesrvAddr("127.0.0.1:9876"); + pullConsumer.start(); + PullAPIWrapper pullAPIWrapper = pullConsumer.getDefaultMQPullConsumerImpl().getPullAPIWrapper(); + Field field = PullAPIWrapper.class.getDeclaredField("mQClientFactory"); + field.setAccessible(true); + field.set(pullAPIWrapper, mQClientFactory); + + field = MQClientInstance.class.getDeclaredField("mQClientAPIImpl"); + field.setAccessible(true); + field.set(mQClientFactory, mQClientAPIImpl); + + when(mQClientFactory.findBrokerAddressInSubscribe(anyString(), anyLong(), anyBoolean())).thenReturn(new FindBrokerResult("127.0.0.1:10911", false)); + } + + @After + public void terminate() { + pullConsumer.shutdown(); + } + + @Test + public void testPullMessage_Success() throws Exception { + doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock mock) throws Throwable { + PullMessageRequestHeader requestHeader = mock.getArgument(1); + return createPullResult(requestHeader, PullStatus.FOUND, Collections.singletonList(new MessageExt())); + } + }).when(mQClientAPIImpl).pullMessage(anyString(), any(PullMessageRequestHeader.class), anyLong(), any(CommunicationMode.class), nullable(PullCallback.class)); + + MessageQueue messageQueue = new MessageQueue(topic, brokerName, 0); + PullResult pullResult = pullConsumer.pull(messageQueue, "*", 1024, 3); + assertThat(pullResult).isNotNull(); + assertThat(pullResult.getPullStatus()).isEqualTo(PullStatus.FOUND); + assertThat(pullResult.getNextBeginOffset()).isEqualTo(1024 + 1); + assertThat(pullResult.getMinOffset()).isEqualTo(123); + assertThat(pullResult.getMaxOffset()).isEqualTo(2048); + assertThat(pullResult.getMsgFoundList()).isEqualTo(new ArrayList<>()); + } + + @Test + public void testPullMessage_NotFound() throws Exception{ + doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock mock) throws Throwable { + PullMessageRequestHeader requestHeader = mock.getArgument(1); + return createPullResult(requestHeader, PullStatus.NO_NEW_MSG, new ArrayList()); + } + }).when(mQClientAPIImpl).pullMessage(anyString(), any(PullMessageRequestHeader.class), anyLong(), any(CommunicationMode.class), nullable(PullCallback.class)); + + MessageQueue messageQueue = new MessageQueue(topic, brokerName, 0); + PullResult pullResult = pullConsumer.pull(messageQueue, "*", 1024, 3); + assertThat(pullResult.getPullStatus()).isEqualTo(PullStatus.NO_NEW_MSG); + } + + @Test + public void testPullMessageAsync_Success() throws Exception { + doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock mock) throws Throwable { + PullMessageRequestHeader requestHeader = mock.getArgument(1); + PullResult pullResult = createPullResult(requestHeader, PullStatus.FOUND, Collections.singletonList(new MessageExt())); + + PullCallback pullCallback = mock.getArgument(4); + pullCallback.onSuccess(pullResult); + return null; + } + }).when(mQClientAPIImpl).pullMessage(anyString(), any(PullMessageRequestHeader.class), anyLong(), any(CommunicationMode.class), nullable(PullCallback.class)); + + MessageQueue messageQueue = new MessageQueue(topic, brokerName, 0); + pullConsumer.pull(messageQueue, "*", 1024, 3, new PullCallback() { + @Override public void onSuccess(PullResult pullResult) { + assertThat(pullResult).isNotNull(); + assertThat(pullResult.getPullStatus()).isEqualTo(PullStatus.FOUND); + assertThat(pullResult.getNextBeginOffset()).isEqualTo(1024 + 1); + assertThat(pullResult.getMinOffset()).isEqualTo(123); + assertThat(pullResult.getMaxOffset()).isEqualTo(2048); + assertThat(pullResult.getMsgFoundList()).isEqualTo(new ArrayList<>()); + } + + @Override public void onException(Throwable e) { + + } + }); + } + + private PullResultExt createPullResult(PullMessageRequestHeader requestHeader, PullStatus pullStatus, List messageExtList) { + return new PullResultExt(pullStatus, requestHeader.getQueueOffset() + messageExtList.size(), 123, 2048, messageExtList, 0, new byte[] {}); + } +} \ No newline at end of file diff --git a/client/src/test/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerTest.java b/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java similarity index 97% rename from client/src/test/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerTest.java rename to client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java index 5946ea8385..bbaff003ee 100644 --- a/client/src/test/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.rocketmq.client.impl.producer; +package org.apache.rocketmq.client.producer; import java.lang.reflect.Field; import java.util.ArrayList; @@ -31,10 +31,8 @@ import org.apache.rocketmq.client.impl.CommunicationMode; import org.apache.rocketmq.client.impl.MQClientAPIImpl; import org.apache.rocketmq.client.impl.MQClientManager; import org.apache.rocketmq.client.impl.factory.MQClientInstance; -import org.apache.rocketmq.client.producer.DefaultMQProducer; -import org.apache.rocketmq.client.producer.SendCallback; -import org.apache.rocketmq.client.producer.SendResult; -import org.apache.rocketmq.client.producer.SendStatus; +import org.apache.rocketmq.client.impl.producer.DefaultMQProducerImpl; +import org.apache.rocketmq.client.impl.producer.TopicPublishInfo; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.common.protocol.header.SendMessageRequestHeader; import org.apache.rocketmq.common.protocol.route.BrokerData; From 9d8bd5902a1639080ec50fcf918750f1c7d240f0 Mon Sep 17 00:00:00 2001 From: yukon Date: Thu, 19 Jan 2017 15:19:34 +0800 Subject: [PATCH 26/27] [ROCKETMQ-52] Add unit tests for DefaultMQPushConsumer --- .../consumer/DefaultMQPullConsumerTest.java | 2 +- .../consumer/DefaultMQPushConsumerTest.java | 180 ++++++++++++++++++ .../producer/DefaultMQProducerTest.java | 2 +- 3 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumerTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumerTest.java index 6dc4ed8d33..6672b1e88d 100644 --- a/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumerTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumerTest.java @@ -146,7 +146,7 @@ public class DefaultMQPullConsumerTest { }); } - private PullResultExt createPullResult(PullMessageRequestHeader requestHeader, PullStatus pullStatus, List messageExtList) { + private PullResultExt createPullResult(PullMessageRequestHeader requestHeader, PullStatus pullStatus, List messageExtList) throws Exception { return new PullResultExt(pullStatus, requestHeader.getQueueOffset() + messageExtList.size(), 123, 2048, messageExtList, 0, new byte[] {}); } } \ No newline at end of file diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java new file mode 100644 index 0000000000..7f5c87417b --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java @@ -0,0 +1,180 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.client.consumer; + +import java.io.ByteArrayOutputStream; +import java.lang.reflect.Field; +import java.net.InetSocketAddress; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import org.apache.rocketmq.client.ClientConfig; +import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; +import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; +import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; +import org.apache.rocketmq.client.exception.MQBrokerException; +import org.apache.rocketmq.client.impl.CommunicationMode; +import org.apache.rocketmq.client.impl.FindBrokerResult; +import org.apache.rocketmq.client.impl.MQClientAPIImpl; +import org.apache.rocketmq.client.impl.MQClientManager; +import org.apache.rocketmq.client.impl.consumer.ConsumeMessageConcurrentlyService; +import org.apache.rocketmq.client.impl.consumer.DefaultMQPushConsumerImpl; +import org.apache.rocketmq.client.impl.consumer.ProcessQueue; +import org.apache.rocketmq.client.impl.consumer.PullAPIWrapper; +import org.apache.rocketmq.client.impl.consumer.PullMessageService; +import org.apache.rocketmq.client.impl.consumer.PullRequest; +import org.apache.rocketmq.client.impl.consumer.PullResultExt; +import org.apache.rocketmq.client.impl.factory.MQClientInstance; +import org.apache.rocketmq.common.message.MessageClientExt; +import org.apache.rocketmq.common.message.MessageDecoder; +import org.apache.rocketmq.common.message.MessageExt; +import org.apache.rocketmq.common.message.MessageQueue; +import org.apache.rocketmq.common.protocol.header.PullMessageRequestHeader; +import org.apache.rocketmq.remoting.exception.RemotingException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.stubbing.Answer; + +import static org.apache.rocketmq.client.producer.DefaultMQProducerTest.createTopicRoute; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +@RunWith(MockitoJUnitRunner.class) +public class DefaultMQPushConsumerTest { + private String consumerGroup; + private String topic = "FooBar"; + private String brokerName = "BrokerA"; + @Spy + private MQClientInstance mQClientFactory = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig()); + @Mock + private MQClientAPIImpl mQClientAPIImpl; + private PullAPIWrapper pullAPIWrapper; + private DefaultMQPushConsumer pushConsumer; + + @Before + public void init() throws Exception { + consumerGroup = "FooBarGroup" + System.currentTimeMillis(); + pullAPIWrapper = spy(new PullAPIWrapper(mQClientFactory, consumerGroup, false)); + pushConsumer = new DefaultMQPushConsumer(consumerGroup); + pushConsumer.setNamesrvAddr("127.0.0.1:9876"); + pushConsumer.setPullInterval(60 * 1000); + + pushConsumer.registerMessageListener(new MessageListenerConcurrently() { + @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, + ConsumeConcurrentlyContext context) { + return null; + } + }); + pushConsumer.subscribe(topic, "*"); + pushConsumer.start(); + + DefaultMQPushConsumerImpl pushConsumerImpl = pushConsumer.getDefaultMQPushConsumerImpl(); + Field field = DefaultMQPushConsumerImpl.class.getDeclaredField("mQClientFactory"); + field.setAccessible(true); + field.set(pushConsumerImpl, mQClientFactory); + + field = MQClientInstance.class.getDeclaredField("mQClientAPIImpl"); + field.setAccessible(true); + field.set(mQClientFactory, mQClientAPIImpl); + + field = DefaultMQPushConsumerImpl.class.getDeclaredField("pullAPIWrapper"); + field.setAccessible(true); + field.set(pushConsumerImpl, pullAPIWrapper); + + when(mQClientFactory.findBrokerAddressInSubscribe(anyString(), anyLong(), anyBoolean())).thenReturn(new FindBrokerResult("127.0.0.1:10911", false)); + mQClientFactory.registerConsumer(consumerGroup, pushConsumerImpl); + mQClientFactory.start(); + when(mQClientAPIImpl.getTopicRouteInfoFromNameServer(anyString(), anyLong())).thenReturn(createTopicRoute()); + } + + @After + public void terminate() { + pushConsumer.shutdown(); + } + + @Test + public void testPullMessage_Success() throws InterruptedException, RemotingException, MQBrokerException { + final CountDownLatch countDownLatch = new CountDownLatch(1); + final MessageExt[] messageExts = new MessageExt[1]; + pushConsumer.getDefaultMQPushConsumerImpl().setConsumeMessageService(new ConsumeMessageConcurrentlyService(pushConsumer.getDefaultMQPushConsumerImpl(), new MessageListenerConcurrently() { + @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, + ConsumeConcurrentlyContext context) { + messageExts[0] = msgs.get(0); + countDownLatch.countDown(); + return null; + } + })); + doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock mock) throws Throwable { + PullMessageRequestHeader requestHeader = mock.getArgument(1); + MessageClientExt messageClientExt = new MessageClientExt(); + messageClientExt.setTopic(topic); + messageClientExt.setQueueId(0); + messageClientExt.setMsgId("123"); + messageClientExt.setBody(new byte[] {'a'}); + messageClientExt.setOffsetMsgId("234"); + messageClientExt.setBornHost(new InetSocketAddress(8080)); + messageClientExt.setStoreHost(new InetSocketAddress(8080)); + PullResult pullResult = createPullResult(requestHeader, PullStatus.FOUND, Collections.singletonList(messageClientExt)); + ((PullCallback)mock.getArgument(4)).onSuccess(pullResult); + return null; + } + }).when(mQClientAPIImpl).pullMessage(anyString(), any(PullMessageRequestHeader.class), anyLong(), any(CommunicationMode.class), nullable(PullCallback.class)); + + PullMessageService pullMessageService = mQClientFactory.getPullMessageService(); + pullMessageService.executePullRequestImmediately(createPullRequest()); + countDownLatch.await(); + assertThat(messageExts[0].getTopic()).isEqualTo(topic); + assertThat(messageExts[0].getBody()).isEqualTo(new byte[] {'a'}); + } + + private PullRequest createPullRequest() { + PullRequest pullRequest = new PullRequest(); + pullRequest.setConsumerGroup(consumerGroup); + pullRequest.setNextOffset(1024); + + MessageQueue messageQueue = new MessageQueue(); + messageQueue.setBrokerName(brokerName); + messageQueue.setQueueId(0); + messageQueue.setTopic(topic); + pullRequest.setMessageQueue(messageQueue); + pullRequest.setProcessQueue(new ProcessQueue()); + + return pullRequest; + } + + private PullResultExt createPullResult(PullMessageRequestHeader requestHeader, PullStatus pullStatus, List messageExtList) throws Exception { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + for (MessageExt messageExt : messageExtList) { + outputStream.write(MessageDecoder.encode(messageExt, false)); + } + return new PullResultExt(pullStatus, requestHeader.getQueueOffset() + messageExtList.size(), 123, 2048, messageExtList, 0, outputStream.toByteArray()); + } +} \ No newline at end of file diff --git a/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java b/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java index bbaff003ee..eddd3806c8 100644 --- a/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java @@ -190,7 +190,7 @@ public class DefaultMQProducerTest { } } - private TopicRouteData createTopicRoute() { + public static TopicRouteData createTopicRoute() { TopicRouteData topicRouteData = new TopicRouteData(); topicRouteData.setFilterServerTable(new HashMap>()); From 4291348ef7ce4f0cd7ff596e5b0c15908e41cf08 Mon Sep 17 00:00:00 2001 From: yukon Date: Thu, 19 Jan 2017 15:39:43 +0800 Subject: [PATCH 27/27] [ROCKETMQ-52] Remove unnecessary stubbing --- .../rocketmq/client/consumer/DefaultMQPushConsumerTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java index 7f5c87417b..ce8b4d3d1f 100644 --- a/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java @@ -55,7 +55,6 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; -import static org.apache.rocketmq.client.producer.DefaultMQProducerTest.createTopicRoute; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -111,7 +110,6 @@ public class DefaultMQPushConsumerTest { when(mQClientFactory.findBrokerAddressInSubscribe(anyString(), anyLong(), anyBoolean())).thenReturn(new FindBrokerResult("127.0.0.1:10911", false)); mQClientFactory.registerConsumer(consumerGroup, pushConsumerImpl); mQClientFactory.start(); - when(mQClientAPIImpl.getTopicRouteInfoFromNameServer(anyString(), anyLong())).thenReturn(createTopicRoute()); } @After