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

Author: HakukuMatata

test/com/xxdb/streaming/reverse/PollingClientReverseTest.java

@@ -2079,7 +2079,7 @@ public void test_PollingClient_subscribe_backupSites_unsubscribe() throws IOExce
         pollingClient.unsubscribe(HOST,11111,"Trades","subTread1");
     }
     @Test(timeout = 180000)
-    public void test_PollingClient_subscribe_resubTimeout_not_true() throws IOException, InterruptedException {
+    public void test_PollingClient_subscribe_resubscribeInterval_not_true() throws IOException, InterruptedException {
         String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
                 "share(st1,`Trades)\t\n"
                 + "setStreamTableFilterColumn(objByName(`Trades),`tag)";
@@ -2100,7 +2100,7 @@ public void test_PollingClient_subscribe_resubTimeout_not_true() throws IOExcept
         pollingClient.unsubscribe(HOST,PORT,"Trades","subTread1");
     }
     @Test(timeout = 180000)
-    public void test_PollingClient_subscribe_backupSites_resubTimeout() throws Exception {
+    public void test_PollingClient_subscribe_backupSites_resubscribeInterval() throws Exception {
         DBConnection controller_conn = new DBConnection();
         controller_conn.connect(controller_host,controller_port,"admin","123456");
         controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
@@ -2196,7 +2196,7 @@ public void run() {
     }
 
     @Test//(timeout = 180000)
-    public void test_PollingClient_subscribe_resubTimeout_subOnce_not_set() throws IOException, InterruptedException {
+    public void test_PollingClient_subscribe_resubscribeInterval_subOnce_not_set() throws IOException, InterruptedException {
         DBConnection controller_conn = new DBConnection();
         controller_conn.connect(controller_host,controller_port,"admin","123456");
         controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");

test/com/xxdb/streaming/reverse/ThreadPooledClientReverseTest.java

@@ -1935,7 +1935,7 @@ public void Test_ThreadPooledClient_subscribe_backupSites_unsubscribe() throws I
         threadPooledClient.unsubscribe(HOST,11111,"Trades","subTread1");
     }
     @Test(timeout = 180000)
-    public void Test_ThreadPooledClient_subscribe_resubTimeout_not_true() throws IOException, InterruptedException {
+    public void Test_ThreadPooledClient_subscribe_resubscribeInterval_not_true() throws IOException, InterruptedException {
         String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
                 "share(st1,`Trades)\t\n"
                 + "setStreamTableFilterColumn(objByName(`Trades),`tag)";
@@ -1968,7 +1968,7 @@ public void doEvent(IMessage msg) {
     };
 
     @Test(timeout = 180000)
-    public void Test_ThreadPooledClient_subscribe_backupSites_resubTimeout() throws Exception {
+    public void Test_ThreadPooledClient_subscribe_backupSites_resubscribeInterval() throws Exception {
         DBConnection controller_conn = new DBConnection();
         controller_conn.connect(controller_host,controller_port,"admin","123456");
         controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
@@ -2054,7 +2054,7 @@ public void run() {
     }
 
     @Test(timeout = 180000)
-    public void Test_ThreadPooledClient_subscribe_resubTimeout_subOnce_not_set() throws IOException, InterruptedException {
+    public void Test_ThreadPooledClient_subscribe_resubscribeInterval_subOnce_not_set() throws IOException, InterruptedException {
         DBConnection controller_conn = new DBConnection();
         controller_conn.connect(controller_host,controller_port,"admin","123456");
         controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");

test/com/xxdb/streaming/reverse/ThreadedClientsubscribeReverseTest.java

@@ -3510,7 +3510,7 @@ public void test_ThreadClient_subscribe_backupSites_unsubscribe() throws IOExcep
         threadedClient.unsubscribe(HOST,11111,"Trades","subTread1");
     }
     @Test(timeout = 180000)
-    public void test_ThreadClient_subscribe_resubTimeout_not_true() throws IOException, InterruptedException {
+    public void test_ThreadClient_subscribe_resubscribeInterval_not_true() throws IOException, InterruptedException {
         String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
                 "share(st1,`Trades)\t\n"
                 + "setStreamTableFilterColumn(objByName(`Trades),`tag)";
@@ -3541,7 +3541,7 @@ public void doEvent(IMessage msg) {
         }
     };
     @Test(timeout = 180000)
-    public void test_ThreadClient_subscribe_backupSites_resubTimeout() throws Exception {
+    public void test_ThreadClient_subscribe_backupSites_resubscribeInterval() throws Exception {
         DBConnection controller_conn = new DBConnection();
         controller_conn.connect(controller_host,controller_port,"admin","123456");
         controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");
@@ -3627,7 +3627,7 @@ public void run() {
     }
 
     @Test(timeout = 180000)
-    public void Test_ThreadClient_subscribe_resubTimeout_subOnce_not_set() throws IOException, InterruptedException {
+    public void Test_ThreadClient_subscribe_resubscribeInterval_subOnce_not_set() throws IOException, InterruptedException {
         DBConnection controller_conn = new DBConnection();
         controller_conn.connect(controller_host,controller_port,"admin","123456");
         controller_conn.run("try{startDataNode('"+HOST+":"+port_list[1]+"')}catch(ex){}");