You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/01/03 13:57:50 UTC
[incubator-servicecomb-java-chassis] 02/02: SCB-156 minor improve
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit d80c07d0f2528c7f5b29f61a0362babfee67014b
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Wed Jan 3 09:46:38 2018 +0800
SCB-156 minor improve
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
.../demo/springmvc/client/SpringmvcClient.java | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java b/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java
index d4f8a2c..7a7a1aa 100644
--- a/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java
+++ b/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java
@@ -95,9 +95,10 @@ public class SpringmvcClient {
String content = restTemplate.getForObject("cse://springmvc/codeFirstSpringmvc/metricsForTest", String.class);
Map<String, String> resultMap = JsonUtils.OBJ_MAPPER.readValue(content, HashMap.class);
- TestMgr.check(String.valueOf(true), String.valueOf(resultMap.get("CPU and Memory").contains("heapUsed=")));
+ TestMgr.check(true, resultMap.get("CPU and Memory").contains("heapUsed="));
- String[] requestProviders = resultMap.get("totalRequestProvider OPERATIONAL_LEVEL").replace("{", "")
+ String[] requestProviders = resultMap.get("totalRequestProvider OPERATIONAL_LEVEL")
+ .replace("{", "")
.replace("}", "").split(",");
Map<String, Integer> requests = new HashMap<>();
for (String requestProvider : requestProviders) {
@@ -106,13 +107,11 @@ public class SpringmvcClient {
}
for (Entry<String, Integer> request : requests.entrySet()) {
- TestMgr.check(String.valueOf(true), String.valueOf(request.getValue() > 0));
+ TestMgr.check(true, request.getValue() > 0);
}
- TestMgr.check(String.valueOf(true),
- String.valueOf(resultMap.get("RequestQueueRelated").contains("springmvc.codeFirst.saySomething")));
- TestMgr.check(String.valueOf(true),
- String.valueOf(resultMap.get("RequestQueueRelated").contains("springmvc.controller.sayHi")));
+ TestMgr.check(true, resultMap.get("RequestQueueRelated").contains("springmvc.codeFirst.saySomething"));
+ TestMgr.check(true, resultMap.get("RequestQueueRelated").contains("springmvc.controller.sayHi"));
} catch (Exception e) {
TestMgr.check("true", "false");
}
@@ -122,10 +121,10 @@ public class SpringmvcClient {
RegistryMetric metric = metricsPublisher.metrics();
TestMgr
- .check(String.valueOf(true), String.valueOf(metric.getInstanceMetric().getSystemMetric().getHeapUsed() != 0));
- TestMgr.check(String.valueOf(true), String.valueOf(metric.getProducerMetrics().size() > 0));
- TestMgr.check(String.valueOf(true), String.valueOf(
- metric.getProducerMetrics().get("springmvc.codeFirst.saySomething").getProducerCall().getTotal() > 0));
+ .check(true, metric.getInstanceMetric().getSystemMetric().getHeapUsed() != 0);
+ TestMgr.check(true, metric.getProducerMetrics().size() > 0);
+ TestMgr.check(true,
+ metric.getProducerMetrics().get("springmvc.codeFirst.saySomething").getProducerCall().getTotal() > 0);
} catch (Exception e) {
TestMgr.check("true", "false");
}
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.