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 2022/10/31 11:25:28 UTC

[servicecomb-java-chassis] 02/03: fix random unit test fail in jdk 17

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/servicecomb-java-chassis.git

commit 08c0fe89acb4464f19d0292b9f40e2356b644472
Author: liubao <bi...@qq.com>
AuthorDate: Sun Oct 30 22:59:19 2022 +0800

    fix random unit test fail in jdk 17
---
 .../http/client/common/AbstractAddressManagerTest.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/clients/http-client-common/src/test/java/org/apache/servicecomb/http/client/common/AbstractAddressManagerTest.java b/clients/http-client-common/src/test/java/org/apache/servicecomb/http/client/common/AbstractAddressManagerTest.java
index d51083720..080e86f16 100644
--- a/clients/http-client-common/src/test/java/org/apache/servicecomb/http/client/common/AbstractAddressManagerTest.java
+++ b/clients/http-client-common/src/test/java/org/apache/servicecomb/http/client/common/AbstractAddressManagerTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import org.mockito.Mockito;
 
 public class AbstractAddressManagerTest {
 
@@ -82,7 +81,12 @@ public class AbstractAddressManagerTest {
     zoneAndRegion.put("sameZone", addressAZ);
     zoneAndRegion.put("sameRegion", addressRG);
     RefreshEndpointEvent event = new RefreshEndpointEvent(zoneAndRegion, "TEST");
-    AbstractAddressManager addressManager = Mockito.spy(new AbstractAddressManager(addresses));
+    AbstractAddressManager addressManager = new AbstractAddressManager(addresses) {
+      @Override
+      protected boolean telnetTest(String address) {
+        return true;
+      }
+    };
 
     addressManager.refreshEndpoint(event, "TEST");
 
@@ -115,8 +119,6 @@ public class AbstractAddressManagerTest {
         .build();
     cache.put("http://127.0.0.3:30100", true);
 
-    // mock the address telnetTest is access
-    Mockito.when(addressManager.telnetTest("http://127.0.0.3:30100")).thenReturn(true);
     addressManager.setAddressIsolationStatus(cache);
     Cache<String, Boolean> result = addressManager.getAddressIsolationStatus();
     Assertions.assertEquals(true, result.get("http://127.0.0.3:30100", () -> false));
@@ -130,7 +132,7 @@ public class AbstractAddressManagerTest {
 
 
   @Test
-  public void testMiltiThread() throws Exception {
+  public void testMultipleThread() throws Exception {
 
     AbstractAddressManager addressManager = new AbstractAddressManager(addresses);
     String address = "http://127.0.0.3:30100";