AJ-712:add test case about SimpleDBConnectionPool_TryReconnectNums and fix broken case

Author: haotian

test/com/xxdb/DBConnectionTest.java

@@ -155,30 +155,6 @@ public void test_Connect_tryReconnectNums_Filed_enableHighAvailability_false_ena
         assertEquals("java.lang.RuntimeException: Connect to "+HOST+":"+port+" failed after "+trynums+" reconnect attemps.",R);
     }
     @Test
-    public void test_Connect_tryReconnectNums_Success_enableHighAvailability_false_enableLoadBalance_false() throws IOException {
-        class LogCapture {
-            private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            private final PrintStream originalErr = System.err;
-            public void start() {
-                System.setErr(new PrintStream(baos));
-            }
-            public void stop() {
-                System.setErr(originalErr);
-            }
-            public String getLogMessages() {
-                return baos.toString();
-            }
-        }
-        int trynums=3;
-        LogCapture logCapture = new LogCapture();
-        logCapture.start();
-        DBConnection conn =new DBConnection();
-        conn.connect(HOST,PORT,0,true,trynums);
-        logCapture.stop();
-        String s=logCapture.getLogMessages();
-        assertTrue(s.contains("Connect to "+HOST+":"+PORT+" successfully."));
-    }
-    @Test
     public void test_Connect_tryReconnectNums_Filed_enableHighAvailability_true_enableLoadBalance_false() throws IOException {
         class LogCapture {
             private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -195,48 +171,15 @@ public String getLogMessages() {
         }
         int port=7102;
         int trynums=3;
-        String[] N={};
+        String[] N={"localhost:7300"};
         DBConnection conn =new DBConnection();
         LogCapture logCapture = new LogCapture();
         logCapture.start();
         conn.connect(HOST,port,"admin","123456","",true,N,true,false,trynums);
         logCapture.stop();
         String s=logCapture.getLogMessages();
-        String searchString = "拒绝连接";
-        int actualCount = 0;
-        int fromIndex = 0;
-        while ((fromIndex = s.indexOf(searchString, fromIndex)) != -1) {
-            actualCount++;
-            fromIndex++;
-        }
-        assertEquals(trynums,actualCount);
-    }
-    @Test
-    public void test_Connect_tryReconnectNums_Success_enableHighAvailability_true_enableLoadBalance_false() throws IOException {
-        class LogCapture {
-            private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            private final PrintStream originalErr = System.err;
-            public void start() {
-                System.setErr(new PrintStream(baos));
-            }
-            public void stop() {
-                System.setErr(originalErr);
-            }
-            public String getLogMessages() {
-                return baos.toString();
-            }
-        }
-        int port=7102;
-        int trynums=3;
-        DBConnection conn =new DBConnection();
-        LogCapture logCapture = new LogCapture();
-        logCapture.start();
-        conn.connect(HOST,port,"admin","123456","",true,ipports,true,false,trynums);
-        logCapture.stop();
-        String s=logCapture.getLogMessages();
-        assertTrue(s.contains("successfully"));
-        assertFalse(s.contains("Switch to node:"));
-
+        int temp=trynums*(1+N.length);
+        assertTrue(s.contains("Connect failed after "+temp+" reconnect attemps for every node in high availability sites."));
     }
     @Test
     public void test_Connect_tryReconnectNums_Filed_enableHighAvailability_true_enableLoadBalance_true() throws IOException {
@@ -255,50 +198,18 @@ public String getLogMessages() {
         }
         int port=7102;
         int trynums=3;
-        String[] N={};
+        String[] N={"localhost:7300"};
         DBConnection conn =new DBConnection();
         LogCapture logCapture = new LogCapture();
         logCapture.start();
         conn.connect(HOST,port,"admin","123456","",true,N,true,true,trynums);
         logCapture.stop();
         String s=logCapture.getLogMessages();
-        String searchString = "拒绝连接";
-        int actualCount = 0;
-        int fromIndex = 0;
-        while ((fromIndex = s.indexOf(searchString, fromIndex)) != -1) {
-            actualCount++;
-            fromIndex++;
-        }
-        assertEquals(trynums,actualCount);
-    }
-    @Test
-    public void test_Connect_tryReconnectNums_Success_enableHighAvailability_true_enableLoadBalance_true() throws IOException {
-        class LogCapture {
-            private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            private final PrintStream originalErr = System.err;
-            public void start() {
-                System.setErr(new PrintStream(baos));
-            }
-            public void stop() {
-                System.setErr(originalErr);
-            }
-            public String getLogMessages() {
-                return baos.toString();
-            }
-        }
-        int trynums=3;
-        int port=7102;
-        DBConnection conn =new DBConnection();
-        LogCapture logCapture = new LogCapture();
-        logCapture.start();
-        conn.connect(HOST,port,"admin","123456","",true,ipports,true,true,trynums);
-        logCapture.stop();
-        String s=logCapture.getLogMessages();
+        int temp=trynums*(1+N.length);
+        assertTrue(s.contains("Connect failed after "+temp+" reconnect attemps for every node in high availability sites."));
 
-        assertTrue(s.contains("Switch to node:"));
 
     }
-
     @Test
     public void Test_Connect_initialScript() throws IOException {
         DBConnection conn = new DBConnection();

test/com/xxdb/SimpleDBConnectionPoolTest.java

@@ -8,7 +8,10 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -18,6 +21,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class SimpleDBConnectionPoolTest {
     private static SimpleDBConnectionPoolConfig config;
@@ -1202,6 +1206,87 @@ public void test_SimpleDBConnectionPool_getConnection_setLoadBalance() throws IO
         assertEquals("The loadBalance configuration of connection in connection pool can only be set in SimpleDBConnectionPoolConfig.",re);
         pool.close();
     }
+    @Test
+    public void test_SimpleDBConnectionPool_getConnection_Failed_TryReconnectNums_enableHighAvailability_false_enableLoadBalance_false(){
+        int port=7100;
+        int trynums=3;
+        config.setMinimumPoolSize(1);
+        config.setTryReconnectNums(trynums);
+        config.setPort(port);
+        String s="";
+        try
+        {
+            pool = new SimpleDBConnectionPool(config);
+        }
+        catch (Exception e)
+        {
+            s=e.toString();
+        }
+        assertEquals("java.lang.RuntimeException: Create connection pool failure, because Connect to "+HOST+":"+port+" failed after "+trynums+" reconnect attemps.",s);
+    }
+    @Test(expected =RuntimeException.class)
+    public void test_SimpleDBConnectionPool_getConnection_Failed_TryReconnectNums_enableHighAvailability_true_enableLoadBalance_false(){
+        class LogCapture {
+            private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            private final PrintStream originalErr = System.err;
+            public void start() {
+                System.setErr(new PrintStream(baos));
+            }
+            public void stop() {
+                System.setErr(originalErr);
+            }
+            public String getLogMessages() {
+                return baos.toString();
+            }
+        }
+        int port=7100;
+        int trynums=3;
+        config.setTryReconnectNums(trynums);
+        config.setMinimumPoolSize(2);
+        config.setPort(port);
+        config.setEnableHighAvailability(true);
+        config.setLoadBalance(false);
+        String []highAvailabilitySites={"localhost:7200"};
+        config.setHighAvailabilitySites(highAvailabilitySites);
+        LogCapture logCapture = new LogCapture();
+        logCapture.start();
+        pool = new SimpleDBConnectionPool(config);
+        logCapture.stop();
+        String s=logCapture.getLogMessages();
+        int temp=trynums*(1+highAvailabilitySites.length);
+        assertTrue(s.contains("Connect failed after "+temp+" reconnect attemps for every node in high availability sites."));
+    }
+    @Test(expected = RuntimeException.class)
+    public void test_SimpleDBConnectionPool_getConnection_Failed_TryReconnectNums_enableHighAvailability_true_enableLoadBalance_true(){
+        class LogCapture {
+            private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            private final PrintStream originalErr = System.err;
+            public void start() {
+                System.setErr(new PrintStream(baos));
+            }
+            public void stop() {
+                System.setErr(originalErr);
+            }
+            public String getLogMessages() {
+                return baos.toString();
+            }
+        }
+        int port=7100;
+        int trynums=3;
+        config.setTryReconnectNums(trynums);
+        config.setMinimumPoolSize(1);
+        config.setPort(port);
+        config.setEnableHighAvailability(true);
+        config.setLoadBalance(true);
+        String []highAvailabilitySites={"localhost:7200","localhost:7300"};
+        config.setHighAvailabilitySites(highAvailabilitySites);
+        LogCapture logCapture = new LogCapture();
+        logCapture.start();
+        pool = new SimpleDBConnectionPool(config);
+        String s=logCapture.getLogMessages();
+        int temp=trynums*(1+highAvailabilitySites.length);
+        assertTrue(s.contains("Connect failed after "+temp+" reconnect attemps for every node in high availability sites."));
+    }
 
     @Test
     public void test_SimpleDBConnectionPool_upload_all_dateType() throws Exception {