Merge remote-tracking branch 'origin/dev' into dev

Author: chengyitian

test/com/xxdb/DBConnectionTest.java

@@ -16,8 +16,7 @@
 import java.io.*;
 import java.lang.reflect.*;
 import java.math.BigDecimal;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.net.*;
 import java.sql.*;
 import java.text.SimpleDateFormat;
 import java.time.*;
@@ -144,6 +143,128 @@ public void Test_Connect_5() throws IOException {
         boolean re = conn.connect(HOST,PORT,"","",ipports);
         Assert.assertEquals(true,re);
     }
+    @Test
+    public void Test_Connect_connectTimeout_negative() throws IOException {
+        DBConnection conn = new DBConnection();
+        conn.connect(HOST,PORT,-1,100);
+        //期望报错
+    }
+    @Test
+    public void Test_Connect_readTimeout_negative() throws IOException {
+        DBConnection conn = new DBConnection();
+        conn.connect(HOST,PORT,200,-100);
+        //期望报错
+    }
+    @Test
+    public void Test_Connect_connectTimeout_success() throws IOException {
+        DBConnection conn = new DBConnection();
+        boolean re = conn.connect(HOST,PORT,100,100);
+        Assert.assertEquals(true,re);
+
+        boolean re1 = conn.connect(HOST,PORT,0,100);
+        Assert.assertEquals(true,re1);
+    }
+
+    @Test
+    public void Test_Connect_connectTimeout_success_1() throws IOException {
+        DBConnection conn = new DBConnection();
+        boolean re = conn.connect(HOST,PORT,100,100,true);
+        Assert.assertEquals(true,re);
+
+        boolean re1 = conn.connect(HOST,PORT,0,100,true);
+        Assert.assertEquals(true,re1);
+    }
+
+    @Test
+    public void Test_Connect_connectTimeout_success_2() throws IOException {
+        DBConnection conn = new DBConnection();
+        boolean re = conn.connect(HOST,PORT,100,100,true,10);
+        Assert.assertEquals(true,re);
+
+        boolean re1 = conn.connect(HOST,PORT,0,100,true,10);
+        Assert.assertEquals(true,re1);
+    }
+    @Test
+    public void Test_Connect_connectTimeout_fail() throws IOException {
+        DBConnection conn = new DBConnection();
+        long startTime = System.currentTimeMillis();
+        boolean re = conn.connect(HOST,111,1000,100);
+        long elapsedTime = System.currentTimeMillis() - startTime;
+        System.out.println("Timeout after " + elapsedTime + " ms");
+        Assert.assertEquals(false,re);
+        Assert.assertEquals(true,elapsedTime>1000 && elapsedTime<1050);
+
+        long startTime1 = System.currentTimeMillis();
+        boolean re1 = conn.connect(HOST,111,2000,100);
+        long elapsedTime1 = System.currentTimeMillis() - startTime1;
+        System.out.println("Timeout after " + elapsedTime1 + " ms");
+        Assert.assertEquals(false,re1);
+        Assert.assertEquals(true,elapsedTime1>2000 && elapsedTime1<2050);
+
+        long startTime2 = System.currentTimeMillis();
+        boolean re2 = conn.connect(HOST,111,5,100);
+        long elapsedTime2 = System.currentTimeMillis() - startTime2;
+        System.out.println("Timeout after " + elapsedTime2 + " ms");
+        Assert.assertEquals(false,re2);
+        Assert.assertEquals(true,elapsedTime2>5 && elapsedTime2<50);
+    }
+
+    @Test
+    public void Test_Connect_readTimeout_fail() throws IOException, InterruptedException {
+        DBConnection conn = new DBConnection();
+        conn.connect(HOST,PORT,8000,2000);
+        String re = null;
+        long startTime = System.currentTimeMillis();
+        try{
+            conn.run("do{\n" +
+                    "print(\"ddd\")\n" +
+                    "}\n" +
+                    "while (true);");
+        }catch(Exception e){
+            re = e.getMessage();
+        }
+        long elapsedTime = System.currentTimeMillis() - startTime;
+        System.out.println("Timeout after " + elapsedTime + " ms");
+        Assert.assertEquals(true,elapsedTime>2000 && elapsedTime<2050);
+        Assert.assertEquals("Failed to read response header from the socket with IO error Read timed out",re);
+        conn.connect(HOST,PORT,8000,4000);
+        String re1 = null;
+        long startTime1 = System.currentTimeMillis();
+        try{
+            conn.run("do{\n" +
+                    "print(\"ddd\")\n" +
+                    "}\n" +
+                    "while (true);");
+        }catch(Exception e){
+            re1 = e.getMessage();
+        }
+        long elapsedTime2 = System.currentTimeMillis() - startTime1;
+        System.out.println("Timeout after " + elapsedTime2 + " ms");
+        Assert.assertEquals(true,elapsedTime2>4000 && elapsedTime2<4050);
+        Assert.assertEquals("Failed to read response header from the socket with IO error Read timed out",re1);
+    }
+
+    @Test
+    public void Test_Connect_readTimeout_fail_1() throws IOException, InterruptedException {
+        DBConnection conn = new DBConnection();
+        conn.connect(HOST,PORT,8000,2000,true,7);
+        String re = null;
+        long startTime = System.currentTimeMillis();
+        try{
+            conn.run("do{\n" +
+                    "print(\"ddd\")\n" +
+                    "}\n" +
+                    "while (true);");
+        }catch(Exception e){
+            re = e.getMessage();
+        }
+        long elapsedTime = System.currentTimeMillis() - startTime;
+        System.out.println("Timeout after " + elapsedTime + " ms");
+        //Assert.assertEquals(true,elapsedTime>2000 && elapsedTime<2050);
+        //Assert.assertEquals("Failed to read response header from the socket with IO error Read timed out",re);
+        System.out.println(re);
+    }
+
     @Test
     public void test_Connect_tryReconnectNums_Filed_enableHighAvailability_false_enableLoadBalance_false() throws IOException {
         int port=7102;