[incubator-servicecomb-java-chassis] 02/02: [SCB-297] The local cache is not update when the server reboots between different application

[li...@apache.org]

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 8e84b30ad678eed7616d2fc38540feaf66d579f2
Author: laijianbin <la...@huawei.com>
AuthorDate: Thu Jan 25 16:49:12 2018 +0800

    [SCB-297] The local cache is not update when the server reboots between different application
---
 .../consumer/TestMicroserviceVersions.java         | 56 ++++++++++++++++------
 1 file changed, 41 insertions(+), 15 deletions(-)

diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersions.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersions.java
index 1920bc3..be1e8c7 100644
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersions.java
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersions.java
@@ -290,27 +290,53 @@ public class TestMicroserviceVersions {
     };
 
     microserviceVersions.safeSetInstances(null, null);
-    
+
     Assert.assertEquals(1, pendingPullCount.get());
   }
-  
+
+  public void checkIsEventAccept(MicroserviceKey key, boolean expected) {
+
+    MicroserviceInstanceChangedEvent changeEvent = new MicroserviceInstanceChangedEvent();
+    changeEvent.setKey(key);
+    boolean isEventAccept = microserviceVersions.isEventAccept(changeEvent);
+    Assert.assertEquals(expected, isEventAccept);
+  }
+
   @Test
-  public void  testIsEventAccept(){
+  public void testIsEventAccept() {
     MicroserviceKey key = new MicroserviceKey();
+
     key.setAppId(appId);
     key.setServiceName(microserviceName);
-    MicroserviceInstanceChangedEvent changeEvent = new MicroserviceInstanceChangedEvent();
-    changeEvent.setKey(key);
-    boolean isEventAccept = microserviceVersions.isEventAccept(changeEvent);
-    Assert.assertEquals(true, isEventAccept);
-    
-    microserviceVersions = new MicroserviceVersions(appManager, appId, appId+Const.APP_SERVICE_SEPARATOR+microserviceName);
+    checkIsEventAccept(key, true);
+
+    key.setServiceName("falseMicroserviceName");
+    checkIsEventAccept(key, false);
+
+    key.setAppId("falseAppId");
+    checkIsEventAccept(key, false);
+
+    key.setServiceName(microserviceName);
+    checkIsEventAccept(key, false);
+
+
     key.setAppId(appId);
-    key.setServiceName(appId+Const.APP_SERVICE_SEPARATOR+microserviceName);
-    changeEvent.setKey(key);
-    boolean isEventAcceptWhenAccrossApp = microserviceVersions.isEventAccept(changeEvent);
-    Assert.assertEquals(true, isEventAcceptWhenAccrossApp);
-    
-  }
+    key.setServiceName(appId + Const.APP_SERVICE_SEPARATOR + microserviceName);
+
+    microserviceVersions =
+        new MicroserviceVersions(appManager, appId, appId + Const.APP_SERVICE_SEPARATOR + microserviceName);
+    checkIsEventAccept(key, true);
 
+    microserviceVersions =
+        new MicroserviceVersions(appManager, "falseAppId", appId + Const.APP_SERVICE_SEPARATOR + microserviceName);
+    checkIsEventAccept(key, false);
+
+    microserviceVersions = new MicroserviceVersions(appManager, "falseAppId",
+        "false" + appId + Const.APP_SERVICE_SEPARATOR + microserviceName);
+    checkIsEventAccept(key, false);
+
+    microserviceVersions =
+        new MicroserviceVersions(appManager, appId, "false" + appId + Const.APP_SERVICE_SEPARATOR + microserviceName);
+    checkIsEventAccept(key, false);
+  }
 }

-- 
To stop receiving notification emails like this one, please contact
liubao@apache.org.