Skip to content

Commit 87025bf

Browse files
committed
AJ-532:fix broken case
1 parent a5eaeb1 commit 87025bf

File tree

4 files changed

+47
-3
lines changed

4 files changed

+47
-3
lines changed

test/com/xxdb/ConnectionPoolTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1668,7 +1668,7 @@ public void test_PartitionedTableAppender_ArrayVector_decimal128_compress_true()
16681668
pool.shutdown();
16691669
}
16701670

1671-
@Test(timeout = 200000)
1671+
@Test(timeout = 300000)
16721672
public void test_PartitionedTableAppender_ArrayVector_BigData() throws Exception {
16731673
String script = "if(existsDatabase(\"dfs://testArrayVector\")){\n" +
16741674
" dropDatabase(\"dfs://testArrayVector\")\n" +

test/com/xxdb/DBConnectionTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,6 @@ public void testDurationVector() throws Exception {
829829
dataStream.close();
830830
fos.close();
831831
}
832-
833832
@Test
834833
public void testSymbolVector() throws IOException {
835834
BasicStringVector vector = (BasicStringVector) conn.run("rand(`IBM`MSFT`GOOG`BIDU,10)");

test/com/xxdb/LoadBalanceTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ public void Test_getConnection_enableHighAvailability_false_enableLoadBalance_fa
376376
}
377377
DBConnection connection1 = new DBConnection();
378378
connection1.connect(HOST, PORT, "admin", "123456",false);
379+
connection1.run("sleep(1000)");
379380
BasicIntVector re = (BasicIntVector)connection1.run("EXEC connectionNum from rpc(getControllerAlias(),getClusterPerf) where port="+PORT);
380381
System.out.println(re.getInt(0));
381382
assertEquals(true,re.getInt(0)>100);
@@ -421,6 +422,7 @@ public void Test_getConnection_enableHighAvailability_true_enableLoadBalance_fal
421422
list.add(connection);
422423
}
423424
controller_conn.run("try{startDataNode('"+HOST+":"+PORT+"')}catch(ex){}");
425+
controller_conn.run("sleep(2000);");
424426
DBConnection connection1 = new DBConnection();
425427
connection1.connect(HOST, PORT, "admin", "123456",false);
426428
int port1 = port_list[1];

test/com/xxdb/data/BasicDurationTest.java

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,38 @@ public void test_BasicDuration(){
3030
assertFalse(bd.equals(null));
3131
assertEquals("",new BasicDuration(Entity.DURATION.US,Integer.MIN_VALUE).getString());
3232
}
33-
33+
@Test
34+
public void test_BasicDuration_unit_string() throws IOException {
35+
BasicDuration bd1 = new BasicDuration("ns",3);
36+
assertEquals("3ns",bd1.getJsonString());
37+
BasicDuration bd2 = new BasicDuration("us",3);
38+
assertEquals("3us",bd2.getJsonString());
39+
BasicDuration bd3 = new BasicDuration("ms",3);
40+
assertEquals("3ms",bd3.getJsonString());
41+
BasicDuration bd4 = new BasicDuration("s",3);
42+
assertEquals("3s",bd4.getJsonString());
43+
BasicDuration bd5 = new BasicDuration("m",3);
44+
assertEquals("3m",bd5.getJsonString());
45+
BasicDuration bd6 = new BasicDuration("H",3);
46+
assertEquals("3H",bd6.getJsonString());
47+
BasicDuration bd7 = new BasicDuration("d",3);
48+
assertEquals("3d",bd7.getJsonString());
49+
BasicDuration bd8 = new BasicDuration("w",3);
50+
assertEquals("3w",bd8.getJsonString());
51+
BasicDuration bd9 = new BasicDuration("M",3);
52+
assertEquals("3M",bd9.getJsonString());
53+
BasicDuration bd10 = new BasicDuration("y",3);
54+
assertEquals("3y",bd10.getJsonString());
55+
BasicDuration bd11 = new BasicDuration("B",3);
56+
assertEquals("3B",bd11.getJsonString());
57+
String re = null;
58+
try{
59+
BasicDuration bd12 = new BasicDuration("b",3);
60+
}catch(Exception e){
61+
re = e.getMessage();
62+
}
63+
assertEquals("error unit: b",re);
64+
}
3465
@Test
3566
public void test_BasicDuration_write() throws IOException {
3667
BasicDuration bd = new BasicDuration(Entity.DURATION.MONTH,3);
@@ -481,6 +512,7 @@ public void test_BasicDuration_1() throws IOException {
481512
BasicDuration bd3 = (BasicDuration)conn.run("duration(-9999999XNYS)");
482513
assertEquals(-9999999,bd3.getDuration());
483514
assertEquals("-9999999XNYS",bd3.getString());
515+
conn.close();
484516
}
485517
@Test
486518
public void test_BasicDuration_2() throws IOException {
@@ -536,6 +568,7 @@ public void test_BasicDurationVector_1() throws Exception {
536568
assertEquals("(3XNYS,3XNYS)",bdv.getString());
537569
System.out.println(((BasicDuration)bdv.get(0)).getDuration());
538570
assertEquals(3,((BasicDuration)bdv.get(0)).getDuration());
571+
conn.close();
539572
}
540573
@Test
541574
public void test_BasicDurationVector_2() throws Exception {
@@ -546,4 +579,14 @@ public void test_BasicDurationVector_2() throws Exception {
546579
assertEquals("[3XNYS,0XNYS,-999999999XNYS]",bdv.getString());
547580
assertEquals("3XNYS",bdv.get(0).getString());
548581
}
582+
@Test
583+
public void test_BasicDurationVector_3() throws Exception {
584+
DBConnection conn = new DBConnection();
585+
conn.connect(HOST,PORT,"admin","123456");
586+
BasicDurationVector Vector1 = (BasicDurationVector) conn.run("-5AAAA:0AAAA");
587+
BasicDurationVector Vector2 = (BasicDurationVector) conn.run("pair(-5AAAA,0AAAA)");
588+
assertEquals("[-5AAAA,0AAAA]",Vector1.getString());
589+
assertEquals("[-5AAAA,0AAAA]",Vector2.getString());
590+
conn.close();
591+
}
549592
}

0 commit comments

Comments
 (0)