增加testNetworkInterface测试用例

回退flushBuffer方法抛异常处理
attributes属性调整为LinkedHashMap

Author: chengyouling

foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java

@@ -20,10 +20,13 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.function.Consumer;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 import mockit.Deencapsulation;
 
@@ -136,6 +139,28 @@ public void testGetRealListenAddress() {
     checkException(v -> NetUtils.getRealListenAddress("http:1", "1.1.1.1:8080"));
   }
 
+  @Test
+  public void testNetworkInterface() {
+    Map<String, InetAddress> org = Deencapsulation.getField(NetUtils.class, "allInterfaceAddresses");
+
+    Map<String, InetAddress> newValue = new HashMap<>();
+    InetAddress addr = Mockito.mock(InetAddress.class);
+    newValue.put("eth100", addr);
+    Deencapsulation.setField(NetUtils.class, "allInterfaceAddresses", newValue);
+
+    Assertions.assertEquals(addr, NetUtils.getInterfaceAddress("eth100"));
+    Assertions.assertEquals(addr, NetUtils.ensureGetInterfaceAddress("eth100"));
+
+    try {
+      NetUtils.ensureGetInterfaceAddress("xxx");
+      Assertions.fail("must throw exception");
+    } catch (IllegalArgumentException e) {
+      Assertions.assertEquals("Can not find address for interface name: xxx", e.getMessage());
+    }
+
+    Deencapsulation.setField(NetUtils.class, "allInterfaceAddresses", org);
+  }
+
   @Test
   public void testCanTcpListenNo() throws IOException {
     InetAddress address = InetAddress.getByName("127.0.0.1");

foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletResponse.java

@@ -85,7 +85,7 @@ public int getBufferSize() {
 
   @Override
   public void flushBuffer() throws IOException {
-    // for vert.x do noting
+    throw new Error("not supported method");
   }
 
   @Override

foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestAbstractHttpServletResponse.java

@@ -91,7 +91,8 @@ public void testGetBufferSize() {
 
   @Test
   public void testFlushBuffer() {
-    Assertions.assertDoesNotThrow(() -> response.flushBuffer());
+    Error error = Assertions.assertThrows(Error.class, () -> response.flushBuffer());
+    checkError(error);
   }
 
   @Test

providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java

@@ -20,7 +20,7 @@
 import java.io.OutputStream;
 import java.lang.reflect.Type;
 import java.net.URI;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -76,7 +76,7 @@ public class CseClientHttpRequest implements ClientHttpRequest {
 
   private Type responseType;
 
-  private final Map<String, Object> attributes = new HashMap<>();
+  private final Map<String, Object> attributes = new LinkedHashMap<>();
 
   public CseClientHttpRequest() {
   }