[SCB-667] fix test case and small mistake

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>
apache · Jun 14, 2018 · e981fcc · e981fcc
1 parent 7a947a4
commit e981fcc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
@@ -277,7 +277,7 @@ public void ensureStatusUp() {
     SCBStatus currentStatus = getStatus();
     if (!SCBStatus.UP.equals(currentStatus)) {
       throw new IllegalStateException(
-          "System is starting and not ready for remote calls or shutting down in progress, STATUS = " + currentStatus);
+          "The request is rejected, as the service cannot process the request due to STATUS = " + currentStatus);
     }
   }
 

diff --git a/core/src/test/java/org/apache/servicecomb/core/TestInvocationFactory.java b/core/src/test/java/org/apache/servicecomb/core/TestInvocationFactory.java
@@ -36,6 +36,7 @@ public static void setUp() {
     ServiceRegistry serviceRegistry = ServiceRegistryFactory.createLocal();
     serviceRegistry.init();
     RegistryUtils.setServiceRegistry(serviceRegistry);
+    SCBEngine.getInstance().setStatus(SCBStatus.UP);
   }
 
   @Test

diff --git a/core/src/test/java/org/apache/servicecomb/core/TestSCBEngine.java b/core/src/test/java/org/apache/servicecomb/core/TestSCBEngine.java
@@ -106,7 +106,7 @@ public void createReferenceConfigForInvoke_down(@Mocked ConsumerProviderManager
 
     expectedException.expect(IllegalStateException.class);
     expectedException.expectMessage(
-        Matchers.is("System is starting and not ready for remote calls or shutting down in progress, STATUS = DOWN"));
+        Matchers.is("The request is rejected, as the service cannot process the request due to STATUS = DOWN"));
     engine.createReferenceConfigForInvoke(null, null, null);
   }
 
@@ -128,7 +128,7 @@ public void getReferenceConfigForInvoke_down(@Mocked ConsumerProviderManager con
 
     expectedException.expect(IllegalStateException.class);
     expectedException.expectMessage(
-        Matchers.is("System is starting and not ready for remote calls or shutting down in progress, STATUS = DOWN"));
+        Matchers.is("The request is rejected, as the service cannot process the request due to STATUS = DOWN"));
     engine.getReferenceConfigForInvoke(null);
   }
 }
diff --git a/core/src/test/java/org/apache/servicecomb/core/provider/consumer/TestInvokerUtils.java b/core/src/test/java/org/apache/servicecomb/core/provider/consumer/TestInvokerUtils.java
@@ -126,7 +126,7 @@ public void testSyncInvoke_4param_NotReady() {
 
     expectedException.expect(IllegalStateException.class);
     expectedException.expectMessage(
-        Matchers.is("System is starting and not ready for remote calls or shutting down in progress, STATUS = DOWN"));
+        Matchers.is("The request is rejected, as the service cannot process the request due to STATUS = DOWN"));
     InvokerUtils.syncInvoke("ms", "schemaId", "opName", null);
   }
 
@@ -136,7 +136,7 @@ public void testSyncInvoke_6param_NotReady() {
 
     expectedException.expect(IllegalStateException.class);
     expectedException.expectMessage(
-        Matchers.is("System is starting and not ready for remote calls or shutting down in progress, STATUS = DOWN"));
+        Matchers.is("The request is rejected, as the service cannot process the request due to STATUS = DOWN"));
 
     InvokerUtils.syncInvoke("ms", "latest", "rest", "schemaId", "opName", null);
   }

diff --git a/...t-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerInvoke.java b/...t-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerInvoke.java
@@ -158,7 +158,9 @@ private void sendResponse(Map<String, String> context, Response response) {
           msgId);
       LOGGER.error(msg, e);
     } finally {
-      invocation.onFinish(response);
+      if (invocation != null) {
+        invocation.onFinish(response);
+      }
     }
   }
 
@@ -173,7 +175,7 @@ public void execute() {
       invocation.onStart();
       operationMeta.getExecutor().execute(() -> runInExecutor());
     } catch (IllegalStateException e) {
-      sendResponse(invocation.getContext(), Response.providerFailResp(e));
+      sendResponse(header.getContext(), Response.providerFailResp(e));
     }
   }
 }
diff --git a/...ghway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayServerInvoke.java b/...ghway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayServerInvoke.java
@@ -19,6 +19,8 @@
 
 import javax.xml.ws.Holder;
 
+import org.apache.servicecomb.core.SCBEngine;
+import org.apache.servicecomb.core.SCBStatus;
 import org.apache.servicecomb.core.definition.OperationMeta;
 import org.apache.servicecomb.core.definition.SchemaMeta;
 import org.apache.servicecomb.core.event.InvocationFinishEvent;
@@ -65,11 +67,13 @@ public int add(int x, int y) {
   @BeforeClass
   public static void classSetup() {
     EventManager.eventBus = new EventBus();
+    SCBEngine.getInstance().setStatus(SCBStatus.UP);
   }
 
   @AfterClass
   public static void classTeardown() {
     EventManager.eventBus = new EventBus();
+    SCBEngine.getInstance().setStatus(SCBStatus.DOWN);
   }
 
   @Before