[incubator-servicecomb-java-chassis] 04/05: [SCB-718]modify test logic

[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 61038d221e52dc108f81f34b0a84ddc24d0be9d5
Author: laijianbin <73...@qq.com>
AuthorDate: Mon Oct 22 14:43:20 2018 +0800

    [SCB-718]modify test logic
    
    Test init auto discovery faile and successe case, At first time, init auto discovery result is faile
---
 .../serviceregistry/client/TestIpPortManager.java      | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/TestIpPortManager.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/TestIpPortManager.java
index 42f48a6..d619b83 100644
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/TestIpPortManager.java
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/TestIpPortManager.java
@@ -121,36 +121,32 @@ public class TestIpPortManager {
       }
     };
 
-    manager.initAutoDiscovery();
-    manager.setAutoDiscoveryInited(true);
+    manager.initAutoDiscovery();  //init result is false at first time
     IpPort address4 = manager.getNextAvailableAddress(address3);
     if (address1.getPort() == 9980) {
       Assert.assertEquals("127.0.0.1", address4.getHostOrIp());
-      Assert.assertEquals(9982, address4.getPort());
+      Assert.assertEquals(9980, address4.getPort());
     } else {
       address4 = manager.getNextAvailableAddress(address1);
       Assert.assertEquals("127.0.0.1", address4.getHostOrIp());
-      Assert.assertEquals(9982, address4.getPort());
+      Assert.assertEquals(9980, address4.getPort());
     }
 
     IpPort address5 = manager.getNextAvailableAddress(address4);
     Assert.assertEquals("127.0.0.1", address5.getHostOrIp());
-    Assert.assertEquals(9980, address5.getPort());
+    Assert.assertEquals(9981, address5.getPort());
 
-    manager.initAutoDiscovery();
-    manager.setAutoDiscoveryInited(false);
+    manager.setAutoDiscoveryInited(true);
     IpPort address6 = manager.getNextAvailableAddress(address3);
     if (address1.getPort() == 9980) {
       Assert.assertEquals("127.0.0.1", address6.getHostOrIp());
-      Assert.assertEquals(9980, address6.getPort());
+      Assert.assertEquals(9982, address6.getPort());
     } else {
       address6 = manager.getNextAvailableAddress(address1);
       Assert.assertEquals("127.0.0.1", address6.getHostOrIp());
-      Assert.assertEquals(9980, address6.getPort());
+      Assert.assertEquals(9982, address6.getPort());
     }
-
   }
-
   @Test
   public void testCreateServiceRegistryCacheWithInstanceCache() {