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

Author: chengyitian

test/com/xxdb/DBConnectionTest.java

@@ -4875,4 +4875,31 @@ public void test_parseException() throws IOException {
         }
         assertEquals(true, re.contains("fetchSize must be greater than 8192"));
     }
+    @Test
+    public void test_exception_script() throws IOException {
+        DBConnection connection = new DBConnection(false, false, false);
+        connection.connect(HOST, PORT, "admin", "123456","", true, ipports);
+        String re = null;
+        try{
+            connection.run("share table(1..100 as name,take(`aaa,100) as name) as table_upload_tb3;\n ;");
+        }catch(Exception e){
+            re = e.getMessage();
+        }
+        assertEquals(true, re.contains("Duplicated column name name. "));
+    }
+
+    @Test
+    public void test_exception_Function() throws IOException {
+        List<Entity> args = new ArrayList<Entity>(1);
+        String[] array = {"1.5", "2.5", "A"};
+        BasicStringVector vec = new BasicStringVector(array);
+        args.add(vec);
+        String re = null;
+        try{
+            Scalar result = (Scalar) conn.run("C", args);
+        }catch(Exception e){
+            re = e.getMessage();
+        }
+        assertEquals(true, re.contains("Can't recognize function name C. function: C"));
+    }
 }

test/com/xxdb/streaming/client/BasicMessageTest.java

@@ -24,6 +24,7 @@ public void test_BasicMessage() throws Exception {
         BasicMessage bm = new BasicMessage(0L,"first",bav,map);
         assertEquals("(6.4, 9.2)",bm.getValue(1).toString());
         assertEquals("China",bm.getValue("mongoDB").toString());
+        assertEquals("(5,(6.4, 9.2),China,15.48)",bm.getMsg().getString());
     }
 
 }