提交 94f3b5a4 编写于 作者: W what-a-good-jungle 提交者: von gosling

[ISSUE #353]Optimzation For Unit Test (#356)

上级 650f46be
...@@ -84,14 +84,17 @@ public class ParserTest { ...@@ -84,14 +84,17 @@ public class ParserTest {
@Test @Test
public void testParse_floatOverFlow() { public void testParse_floatOverFlow() {
try { try {
String str = "1"; StringBuffer sb = new StringBuffer(210000);
for (int i = 0; i < 2048; i++) { sb.append("1");
str += "111111111111111111111111111111111111111111111111111"; for (int i = 0; i < 2048; i ++) {
sb.append("111111111111111111111111111111111111111111111111111");
} }
str += "."; sb.append(".");
for (int i = 0; i < 2048; i++) { for (int i = 0; i < 2048; i ++) {
str += "111111111111111111111111111111111111111111111111111"; sb.append("111111111111111111111111111111111111111111111111111");
} }
String str = sb.toString();
SelectorParser.parse("a > " + str); SelectorParser.parse("a > " + str);
......
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
</executions> </executions>
<configuration> <configuration>
<rules> <rules>
<banCircularDependencies /> <banCircularDependencies/>
</rules> </rules>
<fail>true</fail> <fail>true</fail>
</configuration> </configuration>
...@@ -315,6 +315,7 @@ ...@@ -315,6 +315,7 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version> <version>2.19.1</version>
<configuration> <configuration>
<skipAfterFailureCount>1</skipAfterFailureCount>
<forkCount>1</forkCount> <forkCount>1</forkCount>
<reuseForks>true</reuseForks> <reuseForks>true</reuseForks>
</configuration> </configuration>
...@@ -333,6 +334,7 @@ ...@@ -333,6 +334,7 @@
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version> <version>2.19.1</version>
<configuration> <configuration>
<skipAfterFailureCount>1</skipAfterFailureCount>
<excludes> <excludes>
<exclude>**/NormalMsgDelayIT.java</exclude> <exclude>**/NormalMsgDelayIT.java</exclude>
</excludes> </excludes>
......
...@@ -247,7 +247,7 @@ public class DefaultMessageStore implements MessageStore { ...@@ -247,7 +247,7 @@ public class DefaultMessageStore implements MessageStore {
try { try {
Thread.sleep(1000 * 3); Thread.sleep(1000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
log.error("shutdown Exception, ", e); log.error("shutdown Exception, ", e);
} }
......
...@@ -212,8 +212,6 @@ public class ConsumeQueueTest { ...@@ -212,8 +212,6 @@ public class ConsumeQueueTest {
try { try {
try { try {
putMsg(master); putMsg(master);
// wait build consume queue
Thread.sleep(1000);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
assertThat(Boolean.FALSE).isTrue(); assertThat(Boolean.FALSE).isTrue();
......
...@@ -26,10 +26,11 @@ import org.apache.rocketmq.client.exception.MQClientException; ...@@ -26,10 +26,11 @@ import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.client.producer.DefaultMQProducer; import org.apache.rocketmq.client.producer.DefaultMQProducer;
import org.apache.rocketmq.client.producer.MessageQueueSelector; import org.apache.rocketmq.client.producer.MessageQueueSelector;
import org.apache.rocketmq.client.producer.SendCallback; import org.apache.rocketmq.client.producer.SendCallback;
import org.apache.rocketmq.client.producer.SendResult;
import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.common.message.Message;
import org.apache.rocketmq.common.message.MessageQueue; import org.apache.rocketmq.common.message.MessageQueue;
import org.apache.rocketmq.test.clientinterface.AbstractMQProducer; import org.apache.rocketmq.test.clientinterface.AbstractMQProducer;
import org.apache.rocketmq.test.sendresult.SendResult; import org.apache.rocketmq.test.sendresult.ResultWrapper;
import org.apache.rocketmq.test.util.RandomUtil; import org.apache.rocketmq.test.util.RandomUtil;
import org.apache.rocketmq.test.util.TestUtil; import org.apache.rocketmq.test.util.TestUtil;
...@@ -39,20 +40,19 @@ public class RMQAsyncSendProducer extends AbstractMQProducer { ...@@ -39,20 +40,19 @@ public class RMQAsyncSendProducer extends AbstractMQProducer {
private String nsAddr = null; private String nsAddr = null;
private DefaultMQProducer producer = null; private DefaultMQProducer producer = null;
private SendCallback sendCallback = null; private SendCallback sendCallback = null;
private List<org.apache.rocketmq.client.producer.SendResult> successSendResult = Collections private List<SendResult> successSendResult = Collections.synchronizedList(new ArrayList<SendResult>());
.synchronizedList(new ArrayList<org.apache.rocketmq.client.producer.SendResult>()); private AtomicInteger exceptionMsgCount = new AtomicInteger(0);
private AtomicInteger exceptionMsgCount = new AtomicInteger(
0);
private int msgSize = 0; private int msgSize = 0;
public RMQAsyncSendProducer(String nsAddr, String topic) { public RMQAsyncSendProducer(String nsAddr, String topic) {
super(topic); super(topic);
this.nsAddr = nsAddr; this.nsAddr = nsAddr;
sendCallback = new SendCallback() { sendCallback = new SendCallback() {
public void onSuccess(org.apache.rocketmq.client.producer.SendResult sendResult) { @Override
public void onSuccess(SendResult sendResult) {
successSendResult.add(sendResult); successSendResult.add(sendResult);
} }
@Override
public void onException(Throwable throwable) { public void onException(Throwable throwable) {
exceptionMsgCount.getAndIncrement(); exceptionMsgCount.getAndIncrement();
} }
...@@ -66,7 +66,7 @@ public class RMQAsyncSendProducer extends AbstractMQProducer { ...@@ -66,7 +66,7 @@ public class RMQAsyncSendProducer extends AbstractMQProducer {
return successSendResult.size(); return successSendResult.size();
} }
public List<org.apache.rocketmq.client.producer.SendResult> getSuccessSendResult() { public List<SendResult> getSuccessSendResult() {
return successSendResult; return successSendResult;
} }
...@@ -94,10 +94,12 @@ public class RMQAsyncSendProducer extends AbstractMQProducer { ...@@ -94,10 +94,12 @@ public class RMQAsyncSendProducer extends AbstractMQProducer {
} }
} }
public SendResult send(Object msg, Object arg) { @Override
public ResultWrapper send(Object msg, Object arg) {
return null; return null;
} }
@Override
public void shutdown() { public void shutdown() {
producer.shutdown(); producer.shutdown();
} }
......
...@@ -26,7 +26,7 @@ import org.apache.rocketmq.client.producer.SendStatus; ...@@ -26,7 +26,7 @@ import org.apache.rocketmq.client.producer.SendStatus;
import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.common.message.Message;
import org.apache.rocketmq.common.message.MessageQueue; import org.apache.rocketmq.common.message.MessageQueue;
import org.apache.rocketmq.test.clientinterface.AbstractMQProducer; import org.apache.rocketmq.test.clientinterface.AbstractMQProducer;
import org.apache.rocketmq.test.sendresult.SendResult; import org.apache.rocketmq.test.sendresult.ResultWrapper;
public class RMQNormalProducer extends AbstractMQProducer { public class RMQNormalProducer extends AbstractMQProducer {
private static Logger logger = Logger.getLogger(RMQNormalProducer.class); private static Logger logger = Logger.getLogger(RMQNormalProducer.class);
...@@ -91,7 +91,7 @@ public class RMQNormalProducer extends AbstractMQProducer { ...@@ -91,7 +91,7 @@ public class RMQNormalProducer extends AbstractMQProducer {
} }
} }
public SendResult send(Object msg, Object orderKey) { public ResultWrapper send(Object msg, Object orderKey) {
org.apache.rocketmq.client.producer.SendResult metaqResult = null; org.apache.rocketmq.client.producer.SendResult metaqResult = null;
Message message = (Message) msg; Message message = (Message) msg;
try { try {
...@@ -132,7 +132,7 @@ public class RMQNormalProducer extends AbstractMQProducer { ...@@ -132,7 +132,7 @@ public class RMQNormalProducer extends AbstractMQProducer {
} }
} }
public SendResult sendMQ(Message msg, MessageQueue mq) { public ResultWrapper sendMQ(Message msg, MessageQueue mq) {
org.apache.rocketmq.client.producer.SendResult metaqResult = null; org.apache.rocketmq.client.producer.SendResult metaqResult = null;
try { try {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
......
...@@ -21,14 +21,14 @@ import java.util.Date; ...@@ -21,14 +21,14 @@ import java.util.Date;
import java.util.List; import java.util.List;
import org.apache.rocketmq.common.message.MessageQueue; import org.apache.rocketmq.common.message.MessageQueue;
import org.apache.rocketmq.test.client.rmq.RMQNormalProducer; import org.apache.rocketmq.test.client.rmq.RMQNormalProducer;
import org.apache.rocketmq.test.sendresult.SendResult; import org.apache.rocketmq.test.sendresult.ResultWrapper;
import org.apache.rocketmq.test.util.RandomUtil; import org.apache.rocketmq.test.util.RandomUtil;
import org.apache.rocketmq.test.util.TestUtil; import org.apache.rocketmq.test.util.TestUtil;
public abstract class AbstractMQProducer extends MQCollector implements MQProducer { public abstract class AbstractMQProducer extends MQCollector implements MQProducer {
protected String topic = null; protected String topic = null;
protected SendResult sendResult = new SendResult(); protected ResultWrapper sendResult = new ResultWrapper();
protected boolean startSuccess = false; protected boolean startSuccess = false;
protected String producerGroupName = null; protected String producerGroupName = null;
protected String producerInstanceName = null; protected String producerInstanceName = null;
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
package org.apache.rocketmq.test.clientinterface; package org.apache.rocketmq.test.clientinterface;
import org.apache.rocketmq.test.sendresult.SendResult; import org.apache.rocketmq.test.sendresult.ResultWrapper;
public interface MQProducer { public interface MQProducer {
SendResult send(Object msg, Object arg); ResultWrapper send(Object msg, Object arg);
void setDebug(); void setDebug();
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
package org.apache.rocketmq.test.sendresult; package org.apache.rocketmq.test.sendresult;
public class SendResult { public class ResultWrapper {
private boolean sendResult = false; private boolean sendResult = false;
private String msgId = null; private String msgId = null;
private Exception sendException = null; private Exception sendException = null;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册