You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by go...@apache.org on 2020/05/21 01:50:20 UTC
[incubator-tubemq] branch master updated: [TUBEMQ-138] Optimize
core module test case code (#87)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
The following commit(s) were added to refs/heads/master by this push:
new 886319e [TUBEMQ-138] Optimize core module test case code (#87)
886319e is described below
commit 886319e21730d4d9d43a4faac779d55f1529ca84
Author: viviel <37...@users.noreply.github.com>
AuthorDate: Thu May 21 09:50:14 2020 +0800
[TUBEMQ-138] Optimize core module test case code (#87)
---
.../corebase/policies/TestFlowCtrlRuleHandler.java | 18 +++++++++---------
.../tubemq/corerpc/codec/DataConverterUtilTest.java | 4 +++-
.../apache/tubemq/corerpc/codec/PbEnDecoderTest.java | 10 +++++-----
.../tubemq/corerpc/netty/NettyProtocolEncoderTest.java | 2 +-
.../tubemq/corerpc/utils/TSSLEngineUtilTest.java | 3 ++-
5 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/tubemq-core/src/test/java/org/apache/tubemq/corebase/policies/TestFlowCtrlRuleHandler.java b/tubemq-core/src/test/java/org/apache/tubemq/corebase/policies/TestFlowCtrlRuleHandler.java
index 7da7c6b..ec14d81 100644
--- a/tubemq-core/src/test/java/org/apache/tubemq/corebase/policies/TestFlowCtrlRuleHandler.java
+++ b/tubemq-core/src/test/java/org/apache/tubemq/corebase/policies/TestFlowCtrlRuleHandler.java
@@ -18,7 +18,8 @@
package org.apache.tubemq.corebase.policies;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+
import java.util.Calendar;
import java.util.TimeZone;
import org.junit.Test;
@@ -27,14 +28,13 @@ public class TestFlowCtrlRuleHandler {
private static String mockFlowCtrlInfo() {
// 0: current limit, 1: frequency limit, 2: SSD transfer 3: request frequency control
- String str = "[{\"type\":0,\"rule\":[{\"start\":\"08:00\",\"end\":\"17:59\",\"dltInM\":1024,"
+ return "[{\"type\":0,\"rule\":[{\"start\":\"08:00\",\"end\":\"17:59\",\"dltInM\":1024,"
+ "\"limitInM\":20,\"freqInMs\":1000},{\"start\":\"18:00\",\"end\":\"22:00\","
+ "\"dltInM\":1024,\"limitInM\":20,\"freqInMs\":5000}]},{\"type\":2,\"rule\""
+ ":[{\"start\":\"12:00\",\"end\":\"23:59\",\"dltStInM\":20480,\"dltEdInM\":2048}]}"
+ ",{\"type\":1,\"rule\":[{\"zeroCnt\":3,\"freqInMs\":300},{\"zeroCnt\":8,\"freqInMs\""
+ ":1000}]},{\"type\":3,\"rule\":[{\"normFreqInMs\":0,\"filterFreqInMs\":100,"
+ "\"minDataFilterFreqInMs\":400}]}]";
- return str;
}
@Test
@@ -51,16 +51,16 @@ public class TestFlowCtrlRuleHandler {
// current data limit test
FlowCtrlResult result = handler.getCurDataLimit(2000);
if (curTime >= 800 && curTime <= 1759) {
- assertTrue(result.dataLtInSize == 20 * 1024 * 1024L);
- assertTrue(result.freqLtInMs == 1000L);
+ assertEquals(result.dataLtInSize, 20 * 1024 * 1024L);
+ assertEquals(1000L, result.freqLtInMs);
} else if (curTime >= 1800 && curTime < 2200) {
- assertTrue(result.dataLtInSize == 20 * 1024 * 1024L);
- assertTrue(result.freqLtInMs == 5000L);
+ assertEquals(result.dataLtInSize, 20 * 1024 * 1024L);
+ assertEquals(5000L, result.freqLtInMs);
} else {
- assertEquals("result should be null", result, null);
+ assertNull("result should be null", result);
}
result = handler.getCurDataLimit(1000);
- assertEquals("result should be null", result, null);
+ assertNull("result should be null", result);
// request frequency control
FlowCtrlItem item = handler.getFilterCtrlItem();
diff --git a/tubemq-core/src/test/java/org/apache/tubemq/corerpc/codec/DataConverterUtilTest.java b/tubemq-core/src/test/java/org/apache/tubemq/corerpc/codec/DataConverterUtilTest.java
index 28d07e2..723dcb5 100644
--- a/tubemq-core/src/test/java/org/apache/tubemq/corerpc/codec/DataConverterUtilTest.java
+++ b/tubemq-core/src/test/java/org/apache/tubemq/corerpc/codec/DataConverterUtilTest.java
@@ -18,6 +18,8 @@
package org.apache.tubemq.corerpc.codec;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -57,7 +59,7 @@ public class DataConverterUtilTest {
strInfoList.clear();
strInfoList.add("001@group#0:localhost:1200#tube:0");
List<SubscribeInfo> subscribeInfoList = DataConverterUtil.convertSubInfo(strInfoList);
- assertEquals("subscribe should be equal", subscribeInfoEqual(subscribeInfo, subscribeInfoList.get(0)), true);
+ assertTrue("subscribe should be equal", subscribeInfoEqual(subscribeInfo, subscribeInfoList.get(0)));
// topic convert
TopicInfo topic = new TopicInfo(broker, "tube", 10, 5, true, true);
diff --git a/tubemq-core/src/test/java/org/apache/tubemq/corerpc/codec/PbEnDecoderTest.java b/tubemq-core/src/test/java/org/apache/tubemq/corerpc/codec/PbEnDecoderTest.java
index 7795ab1..0c9d680 100644
--- a/tubemq-core/src/test/java/org/apache/tubemq/corerpc/codec/PbEnDecoderTest.java
+++ b/tubemq-core/src/test/java/org/apache/tubemq/corerpc/codec/PbEnDecoderTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tubemq.corerpc.codec;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import com.googlecode.protobuf.format.JsonFormat;
import org.apache.tubemq.corebase.protobuf.generated.ClientMaster;
import org.apache.tubemq.corerpc.RpcConstants;
@@ -42,10 +42,10 @@ public class PbEnDecoderTest {
ClientMaster.RegisterRequestP2M decodeObject = (ClientMaster.RegisterRequestP2M)
PbEnDecoder.pbDecode(true, RpcConstants.RPC_MSG_MASTER_PRODUCER_REGISTER, data);
- assertTrue(decodeObject.getClientId().equals(object.getClientId()));
- assertTrue(decodeObject.getBrokerCheckSum() == object.getBrokerCheckSum());
- assertTrue(decodeObject.getHostName().equals(object.getHostName()));
- assertTrue(jsonOject.equals(jsonFormat.printToString(decodeObject)));
+ assertEquals(decodeObject.getClientId(), object.getClientId());
+ assertEquals(decodeObject.getBrokerCheckSum(), object.getBrokerCheckSum());
+ assertEquals(decodeObject.getHostName(), object.getHostName());
+ assertEquals(jsonOject, jsonFormat.printToString(decodeObject));
}
}
diff --git a/tubemq-core/src/test/java/org/apache/tubemq/corerpc/netty/NettyProtocolEncoderTest.java b/tubemq-core/src/test/java/org/apache/tubemq/corerpc/netty/NettyProtocolEncoderTest.java
index 21f4b71..1cc48e8 100644
--- a/tubemq-core/src/test/java/org/apache/tubemq/corerpc/netty/NettyProtocolEncoderTest.java
+++ b/tubemq-core/src/test/java/org/apache/tubemq/corerpc/netty/NettyProtocolEncoderTest.java
@@ -49,7 +49,7 @@ public class NettyProtocolEncoderTest {
// read data.
int i = buf.readInt();
i = buf.readInt();
- Assert.assertTrue(i == 123);
+ Assert.assertEquals(123, i);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/tubemq-core/src/test/java/org/apache/tubemq/corerpc/utils/TSSLEngineUtilTest.java b/tubemq-core/src/test/java/org/apache/tubemq/corerpc/utils/TSSLEngineUtilTest.java
index 853ff9f..4633458 100644
--- a/tubemq-core/src/test/java/org/apache/tubemq/corerpc/utils/TSSLEngineUtilTest.java
+++ b/tubemq-core/src/test/java/org/apache/tubemq/corerpc/utils/TSSLEngineUtilTest.java
@@ -43,7 +43,8 @@ public class TSSLEngineUtilTest {
} catch (Throwable e) {
e.printStackTrace();
}
+ Assert.assertNotNull(sslEngine);
boolean needClientAuth = sslEngine.getNeedClientAuth();
- Assert.assertTrue(!needClientAuth);
+ Assert.assertFalse(needClientAuth);
}
}