You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/07/16 06:25:35 UTC
[incubator-servicecomb-java-chassis] 05/11: [SCB-706]fix ut failed
and add new one
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit e6edbff8813aac52786ced63fd248614c73d270a
Author: liubao <ba...@huawei.com>
AuthorDate: Thu Jul 12 10:28:51 2018 +0800
[SCB-706]fix ut failed and add new one
---
.../loadbalance/TestLoadbalanceHandler.java | 34 ++++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java
index dc2c234..2302d82 100644
--- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java
+++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java
@@ -17,6 +17,7 @@
package org.apache.servicecomb.loadbalance;
+import java.net.SocketException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -206,7 +207,7 @@ public class TestLoadbalanceHandler {
}
@Test
- public void send_failed(@Injectable LoadBalancer loadBalancer) {
+ public void send_failed2(@Injectable LoadBalancer loadBalancer) {
MicroserviceInstance instance1 = new MicroserviceInstance();
instance1.setInstanceId("1234");
CacheEndpoint cacheEndpoint = new CacheEndpoint("rest://localhost:8080", instance1);
@@ -227,13 +228,42 @@ public class TestLoadbalanceHandler {
result.value = (Throwable) resp.getResult();
}, loadBalancer);
- Assert.assertEquals(1,
+ // InvocationException is not taken as a failure
+ Assert.assertEquals(0,
loadBalancer.getLoadBalancerStats().getSingleServerStat(server).getSuccessiveConnectionFailureCount());
Assert.assertEquals("InvocationException: code=400;msg=send failed",
result.value.getMessage());
}
@Test
+ public void send_failed(@Injectable LoadBalancer loadBalancer) {
+ MicroserviceInstance instance1 = new MicroserviceInstance();
+ instance1.setInstanceId("1234");
+ CacheEndpoint cacheEndpoint = new CacheEndpoint("rest://localhost:8080", instance1);
+ ServiceCombServer server = new ServiceCombServer(restTransport, cacheEndpoint);
+ LoadBalancerStats stats = new LoadBalancerStats("test");
+ new Expectations(loadBalancer) {
+ {
+ loadBalancer.chooseServer(invocation);
+ result = server;
+ loadBalancer.getLoadBalancerStats();
+ result = stats;
+ }
+ };
+ sendResponse = Response.consumerFailResp(new SocketException());
+
+ Holder<Throwable> result = new Holder<>();
+ Deencapsulation.invoke(handler, "send", invocation, (AsyncResponse) resp -> {
+ result.value = (Throwable) resp.getResult();
+ }, loadBalancer);
+
+ Assert.assertEquals(1,
+ loadBalancer.getLoadBalancerStats().getSingleServerStat(server).getSuccessiveConnectionFailureCount());
+ Assert.assertEquals("InvocationException: code=490;msg=CommonExceptionData [message=Cse Internal Bad Request]",
+ result.value.getMessage());
+ }
+
+ @Test
public void send_success(@Injectable LoadBalancer loadBalancer) {
MicroserviceInstance instance1 = new MicroserviceInstance();
instance1.setInstanceId("1234");