AJ-700:update test case about getOffset

Author: weisun123

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

@@ -2309,7 +2309,7 @@ public void test_subscribe_getOffset() throws IOException {
         BasicIntVector filter = (BasicIntVector) conn.run("filter");
         TopicPoller poller1 = client.subscribe(HOST,PORT,"Trades1","subTread1",-1,filter);
         ArrayList<IMessage> msg1;
-        conn.run("n=6;t=table(1..n as tag,now()+1..n as ts,rand(100.0,n) as data);" +
+        conn.run("n=5;t=table(1..n as tag,now()+1..n as ts,rand(100.0,n) as data);" +
                 "Trades1.append!(t)");
         msg1 = poller1.poll(500, 10000);
         assertEquals(5, msg1.size());
@@ -2318,11 +2318,11 @@ public void test_subscribe_getOffset() throws IOException {
         System.out.println("msg1.get(2).getOffset() :" + msg1.get(2).getOffset());
         System.out.println("msg1.get(3).getOffset() :" + msg1.get(3).getOffset());
         System.out.println("msg1.get(4).getOffset() :" + msg1.get(4).getOffset());
-        assertEquals(1, msg1.get(0).getOffset());
-        assertEquals(2, msg1.get(1).getOffset());
-        assertEquals(3, msg1.get(2).getOffset());
-        assertEquals(4, msg1.get(3).getOffset());
-        assertEquals(5, msg1.get(4).getOffset());
+        assertEquals(0, msg1.get(0).getOffset());
+        assertEquals(1, msg1.get(1).getOffset());
+        assertEquals(2, msg1.get(2).getOffset());
+        assertEquals(3, msg1.get(3).getOffset());
+        assertEquals(4, msg1.get(4).getOffset());
         client.unsubscribe(HOST,PORT,"Trades1","subTread1");
     }
 }

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

@@ -2141,30 +2141,4 @@ public void test_subscribe_getOffset() throws Exception{
         }
         client1.unsubscribe(HOST, PORT, "Trades");
     }
-
-    @Test(timeout = 180000)
-    public void test_subscribe_filter_getOffset() throws Exception{
-        String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
-                "share(st1,`Trades)\t\n"
-                + "setStreamTableFilterColumn(objByName(`Trades),`tag)";
-        conn.run(script1);
-        String script2 = "st2 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
-                "share(st2, `Receive)\t\n";
-        conn.run(script2);
-        ThreadPooledClient client1 = new ThreadPooledClient(HOST, 0,1);
-        BasicIntVector filter = new BasicIntVector(new int[]{1,2,3,4,5});
-        client1.subscribe(HOST, PORT, "Trades","ACTION1", MessageHandler_handler_getOffset, -1,filter);
-        conn.run("n=7;t=table(1..n as tag,now()+1..n as ts,rand(100.0,n) as data);" + "Trades.append!(t)");
-        Thread.sleep(5000);
-        BasicTable re = (BasicTable) conn.run("Receive");
-        BasicTable tra = (BasicTable) conn.run("Trades");
-        assertEquals(5, re.rows());
-        for (int i = 0; i < re.rows(); i++) {
-            assertEquals(re.getColumn(0).get(i), tra.getColumn(0).get(i));
-            assertEquals(re.getColumn(1).get(i), tra.getColumn(1).get(i));
-            assertEquals(((Scalar)re.getColumn(2).get(i)).getNumber().doubleValue(), ((Scalar)tra.getColumn(2).get(i)).getNumber().doubleValue(), 4);
-        }
-        client1.unsubscribe(HOST, PORT, "Trades","ACTION1");
-    }
-
 }

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

@@ -3677,27 +3677,4 @@ public void test_subscribe_getOffset() throws Exception{
         }
         client.unsubscribe(HOST, PORT, "Trades");
     }
-    @Test(timeout = 180000)
-    public void test_subscribe_filter_getOffset() throws Exception{
-        String script1 = "st1 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
-                "share(st1,`Trades)\t\n"
-                + "setStreamTableFilterColumn(objByName(`Trades),`tag)";
-        conn.run(script1);
-        String script2 = "st2 = streamTable(1000000:0,`tag`ts`data,[INT,TIMESTAMP,DOUBLE])\n" +
-                "share(st2, `Receive)\t\n";
-        conn.run(script2);
-        BasicIntVector filter = new BasicIntVector(new int[]{1,2,3,4,5});
-        client.subscribe(HOST, PORT, "Trades","ACTION1", MessageHandler_handler_getOffset, -1,filter);
-        conn.run("n=7;t=table(1..n as tag,now()+1..n as ts,rand(100.0,n) as data);" + "Trades.append!(t)");
-        Thread.sleep(5000);
-        BasicTable re = (BasicTable) conn.run("Receive");
-        BasicTable tra = (BasicTable) conn.run("Trades");
-        assertEquals(5, re.rows());
-        for (int i = 0; i < re.rows(); i++) {
-            assertEquals(re.getColumn(0).get(i), tra.getColumn(0).get(i));
-            assertEquals(re.getColumn(1).get(i), tra.getColumn(1).get(i));
-            assertEquals(((Scalar)re.getColumn(2).get(i)).getNumber().doubleValue(), ((Scalar)tra.getColumn(2).get(i)).getNumber().doubleValue(), 4);
-        }
-        client.unsubscribe(HOST, PORT, "Trades","ACTION1");
-    }
 }