Skip to content

Commit e6ee610

Browse files
author
chengyitian
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 153c6a6 + 61d8dde commit e6ee610

File tree

2 files changed

+55
-3
lines changed

2 files changed

+55
-3
lines changed

test/com/xxdb/DBConnectionTest.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.xxdb;
22

33
import com.alibaba.fastjson2.JSONObject;
4+
import com.xxdb.data.Dictionary;
45
import com.xxdb.data.Vector;
56
import com.xxdb.data.*;
67
import com.xxdb.io.Double2;
@@ -1410,6 +1411,24 @@ public void testDictionaryUpload() throws IOException {
14101411
assertEquals(3, dict1.rows());
14111412
}
14121413
@Test
1414+
public void testDictionaryUpload_1() throws IOException {
1415+
DBConnection conn = new DBConnection();
1416+
conn.connect(HOST,PORT);
1417+
BasicDictionary bd = new BasicDictionary(Entity.DATA_TYPE.DT_INT, Entity.DATA_TYPE.DT_ANY);
1418+
Map<String,Entity> data = new HashMap<>();
1419+
data.put("bd",bd);
1420+
conn.upload(data);
1421+
Dictionary re= (Dictionary) conn.run("bd");
1422+
System.out.println(re.getString());
1423+
assertEquals("", re.getString());
1424+
bd.put(new BasicInt(1),new BasicInt(1));
1425+
data.put("bd",bd);
1426+
conn.upload(data);
1427+
Dictionary re1= (Dictionary) conn.run("bd");
1428+
System.out.println(re1.getString());
1429+
assertEquals("1->1\n", re1.getString());
1430+
}
1431+
@Test
14131432
public void testDurationUpload() throws IOException {
14141433
Entity duration = conn.run("duration(3XNYS)");
14151434
Map<String, Entity> map = new HashMap<String, Entity>();

test/com/xxdb/data/BasicDictionaryTest.java

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import java.io.IOException;
99
import java.io.OutputStream;
1010
import java.time.LocalDateTime;
11-
import java.util.Calendar;
12-
import java.util.GregorianCalendar;
13-
import java.util.ResourceBundle;
11+
import java.util.*;
1412

1513
import static org.junit.Assert.*;
1614

@@ -77,6 +75,41 @@ public void test_BasicDictionary_getString_DT_ANY() throws IOException {
7775
bd.put(new BasicInt(1),new BasicAnyVector(arr,true));
7876
assertEquals("1->(0,1,2,3,4,5,6,7,8,9)\n",bd.getString());
7977
}
78+
@Test
79+
public void test_BasicDictionary_upload() throws IOException {
80+
DBConnection conn = new DBConnection();
81+
conn.connect(HOST,PORT);
82+
BasicDictionary bd = new BasicDictionary(Entity.DATA_TYPE.DT_INT, Entity.DATA_TYPE.DT_ANY);
83+
Map<String,Entity> data = new HashMap<>();
84+
data.put("bd",bd);
85+
conn.upload(data);
86+
Dictionary re= (Dictionary) conn.run("bd");
87+
System.out.println(re.getString());
88+
assertEquals("", re.getString());
89+
Entity[] arr = new Entity[10];
90+
for (int i = 0; i < 10; i++) {
91+
arr[i] = conn.run(""+i);
92+
}
93+
94+
bd.put(new BasicInt(1),new BasicAnyVector(arr,true));
95+
data.put("bd",bd);
96+
conn.upload(data);
97+
Dictionary re1= (Dictionary) conn.run("bd");
98+
System.out.println(re1.getString());
99+
assertEquals("1->(0,1,2,3,4,5,6,7,8,9)", re1.getString());
100+
}
101+
@Test
102+
public void test_BasicDictionary_valueType_DT_ANY() throws IOException {
103+
BasicDictionary bd = new BasicDictionary(Entity.DATA_TYPE.DT_INT, Entity.DATA_TYPE.DT_ANY,1);
104+
conn = new DBConnection();
105+
conn.connect(HOST,PORT);
106+
bd.put(new BasicInt(1),new BasicInt(1));
107+
assertEquals("1->1\n",bd.getString());
108+
bd.put(new BasicInt(1),new BasicString("1121!@#$%^&*()_+-=`~{}[]|\":;',.ldfdf中文"));
109+
assertEquals("1->1121!@#$%^&*()_+-=`~{}[]|\":;',.ldfdf中文\n",bd.getString());
110+
bd.put(new BasicInt(1),new BasicDouble(1.666));
111+
assertEquals("1->1.666\n",bd.getString());
112+
}
80113

81114
@Test(expected = IOException.class)
82115
public void test_BasicDictionary_Exception() throws IOException {

0 commit comments

Comments
 (0)