Skip to content

Commit 717a68b

Browse files
weisun123weisun123
committed
AJ-694:update test case about Vector toJSONString
1 parent 94f7ff6 commit 717a68b

26 files changed

+63
-29
lines changed

‎test/com/xxdb/data/BasicByteTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,6 @@ public void test_BasicByteVector_toJsonString(){
590590
BasicByteVector bbv = new BasicByteVector(new byte[]{'d','o','l','p','h','i','n'});
591591
String re = JSONObject.toJSONString(bbv);
592592
System.out.println(re);
593-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[100,111,108,112,104,105,110],\"dataCategory\":\"INTEGRAL\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_BYTE\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicByte\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"['d','o','l','p','h','i','n']\",\"table\":false,\"unitLength\":1,\"vector\":true}", re);
593+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[100,111,108,112,104,105,110],\"dataCategory\":\"INTEGRAL\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_BYTE\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicByte\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"['d','o','l','p','h','i','n']\",\"table\":false,\"unitLength\":1,\"values\":[100,111,108,112,104,105,110],\"vector\":true}", re);
594594
}
595595
}

‎test/com/xxdb/data/BasicComplexTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,6 @@ public void test_BasicComplexVector_toJSONString() {
533533
BasicComplexVector bcv = new BasicComplexVector(list);
534534
String re = JSONObject.toJSONString(bcv);
535535
System.out.println(re);
536-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[{\"null\":false,\"x\":1.0,\"y\":9.2},{\"null\":false,\"x\":3.8,\"y\":7.4},{\"null\":false,\"x\":5.6,\"y\":6.5},{\"null\":true,\"x\":-1.7976931348623157E308,\"y\":-1.7976931348623157E308}],\"dataCategory\":\"BINARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_COMPLEX\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicComplex\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[1.0+9.2i,3.8+7.4i,5.6+6.5i,]\",\"table\":false,\"unitLength\":16,\"vector\":true}", re);
536+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[{\"null\":false,\"x\":1.0,\"y\":9.2},{\"null\":false,\"x\":3.8,\"y\":7.4},{\"null\":false,\"x\":5.6,\"y\":6.5},{\"null\":true,\"x\":-1.7976931348623157E308,\"y\":-1.7976931348623157E308}],\"dataCategory\":\"BINARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_COMPLEX\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicComplex\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[1.0+9.2i,3.8+7.4i,5.6+6.5i,]\",\"table\":false,\"unitLength\":16,\"values\":[{\"null\":false,\"x\":1.0,\"y\":9.2},{\"null\":false,\"x\":3.8,\"y\":7.4},{\"null\":false,\"x\":5.6,\"y\":6.5},{\"null\":true,\"x\":-1.7976931348623157E308,\"y\":-1.7976931348623157E308}],\"vector\":true}", re);
537537
}
538538
}

‎test/com/xxdb/data/BasicDateHourTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void test_BasicDateHourVector_toJSONString() throws Exception {
128128
BasicDateHourVector v = new BasicDateHourVector(list);
129129
String re = JSONObject.toJSONString(v);
130130
System.out.println(re);
131-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[1,2,3],\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DATEHOUR\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDateHour\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[1970.01.01T01,1970.01.01T02,1970.01.01T03]\",\"table\":false,\"unitLength\":4,\"vector\":true}", re);
131+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[1,2,3],\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DATEHOUR\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDateHour\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[1970.01.01T01,1970.01.01T02,1970.01.01T03]\",\"table\":false,\"unitLength\":4,\"values\":[1,2,3],\"vector\":true}", re);
132132
}
133133
@Test
134134
public void test_BasicDateHourMatrix_toJSONString() throws Exception {

‎test/com/xxdb/data/BasicDateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void test_BasicDateVector_toJSONString() throws Exception {
146146
BasicDateVector v = new BasicDateVector(list);
147147
String re = JSONObject.toJSONString(v);
148148
System.out.println(re);
149-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[1,2,3],\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DATE\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDate\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[1970.01.02,1970.01.03,1970.01.04]\",\"table\":false,\"unitLength\":4,\"vector\":true}", re);
149+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[1,2,3],\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DATE\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDate\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[1970.01.02,1970.01.03,1970.01.04]\",\"table\":false,\"unitLength\":4,\"values\":[1,2,3],\"vector\":true}", re);
150150
}
151151
@Test
152152
public void test_BasicDateMatrix_toJSONString() throws Exception {

‎test/com/xxdb/data/BasicDateTimeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public void test_BasicDateTimeVector_toJSONString() throws Exception {
204204
BasicDateTimeVector v = new BasicDateTimeVector(list);
205205
String re = JSONObject.toJSONString(v);
206206
System.out.println(re);
207-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[1,2,3],\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DATETIME\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDateTime\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[1970.01.01T00:00:01,1970.01.01T00:00:02,1970.01.01T00:00:03]\",\"table\":false,\"unitLength\":4,\"vector\":true}", re);
207+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[1,2,3],\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DATETIME\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDateTime\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[1970.01.01T00:00:01,1970.01.01T00:00:02,1970.01.01T00:00:03]\",\"table\":false,\"unitLength\":4,\"values\":[1,2,3],\"vector\":true}", re);
208208
}
209209
@Test
210210
public void test_BasicDateTimeMatrix_toJSONString() throws Exception {

‎test/com/xxdb/data/BasicDecimal128VectorTest.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.io.IOException;
1010
import java.math.BigDecimal;
1111
import java.math.BigInteger;
12+
import java.util.Arrays;
1213
import java.util.ResourceBundle;
1314

1415
import static org.junit.Assert.*;
@@ -502,15 +503,23 @@ public void testBasicDecimal128Vector_toJsonString() throws IOException {
502503
BasicDecimal128Vector re1 = new BasicDecimal128Vector(tmp_string_v,4);
503504
String re = JSONObject.toJSONString(re1);
504505
System.out.println(re);
505-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL128\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal128\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":4,\"string\":\"[0.0000,-123.0043,132.2042,100.0000]\",\"table\":false,\"unitLength\":16,\"vector\":true}", re);
506+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL128\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal128\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":4,\"string\":\"[0.0000,-123.0043,132.2042,100.0000]\",\"table\":false,\"unitLength\":16,\"unscaledValues\":[0,-1230043,1322042,1000000],\"vector\":true}", re);
506507
}
507508
@Test
508509
public void testBasicDecimal128Vector_toJsonString_null() throws IOException {
509510
BasicDecimal128Vector re1 = new BasicDecimal128Vector(2,2);
510511
String re = JSONObject.toJSONString(re1);
511512
System.out.println(re);
512-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL128\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal128\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":2,\"string\":\"[0.00,0.00]\",\"table\":false,\"unitLength\":16,\"vector\":true}", re);
513-
}
513+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL128\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal128\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":2,\"string\":\"[0.00,0.00]\",\"table\":false,\"unitLength\":16,\"unscaledValues\":[0,0],\"vector\":true}", re);
514+
}
515+
// @Test
516+
// public void testBasicDecimal128Vector_getValue() throws IOException {
517+
// String[] tmp_string_v = {"0.0","-123.00432","132.204234","100.0"};
518+
// BasicDecimal128Vector re1 = new BasicDecimal128Vector(tmp_string_v,4);
519+
// BigInteger[] re = re1.getValues();
520+
// System.out.println(Arrays.toString(re));
521+
// assertEquals("[0, -1230043, 1322042, 1000000]",Arrays.toString(re));
522+
// }
514523
@Test
515524
public void test_BasicDecimal128Vector_deserialize() throws Exception {
516525
String[] tmp_string_v = {"0.0","-123.00432","132.204234","100.0"};

‎test/com/xxdb/data/BasicDecimal32VectorTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,14 +490,22 @@ public void testBasicDecimal32Vector_toJsonString() throws IOException {
490490
BasicDecimal32Vector re1 = new BasicDecimal32Vector(tmp_string_v,4);
491491
String re = JSONObject.toJSONString(re1);
492492
System.out.println(re);
493-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL32\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal32\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":4,\"string\":\"[0.0000,-123.0043,132.2042,100.0000]\",\"table\":false,\"unitLength\":4,\"vector\":true}", re);
493+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL32\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal32\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":4,\"string\":\"[0.0000,-123.0043,132.2042,100.0000]\",\"table\":false,\"unitLength\":4,\"values\":[0,-1230043,1322042,1000000],\"vector\":true}", re);
494494
}
495495
@Test
496496
public void testBasicDecimal32Vector_toJsonString_null() throws IOException {
497497
BasicDecimal32Vector re1 = new BasicDecimal32Vector(2,2);
498498
String re = JSONObject.toJSONString(re1);
499499
System.out.println(re);
500-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL32\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal32\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":2,\"string\":\"[0.00,0.00]\",\"table\":false,\"unitLength\":4,\"vector\":true}", re);
500+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL32\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal32\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":2,\"string\":\"[0.00,0.00]\",\"table\":false,\"unitLength\":4,\"values\":[0,0],\"vector\":true}", re);
501+
}
502+
@Test
503+
public void testBasicDecimal32Vector_getValue() throws IOException {
504+
String[] tmp_string_v = {"0.0","-123.00432","132.204234","100.0"};
505+
BasicDecimal32Vector re1 = new BasicDecimal32Vector(tmp_string_v,4);
506+
int[] re = re1.getValues();
507+
System.out.println(Arrays.toString(re));
508+
assertEquals("[0, -1230043, 1322042, 1000000]",Arrays.toString(re));
501509
}
502510
@Test
503511
public void test_BasicDecimal32Vector_asof() throws Exception {

‎test/com/xxdb/data/BasicDecimal64VectorTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,13 +442,21 @@ public void testBasicDecimal64Vector_toJsonString() throws IOException {
442442
BasicDecimal64Vector re1 = new BasicDecimal64Vector(tmp_string_v,4);
443443
String re = JSONObject.toJSONString(re1);
444444
System.out.println(re);
445-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL64\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal64\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":4,\"string\":\"[0.0000,-123.0043,132.2042,100.0000]\",\"table\":false,\"unitLength\":8,\"vector\":true}", re);
445+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL64\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal64\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":4,\"string\":\"[0.0000,-123.0043,132.2042,100.0000]\",\"table\":false,\"unitLength\":8,\"values\":[0,-1230043,1322042,1000000],\"vector\":true}", re);
446446
}
447447
@Test
448448
public void testBasicDecimal64Vector_toJsonString_null() throws IOException {
449449
BasicDecimal64Vector re1 = new BasicDecimal64Vector(2,2);
450450
String re = JSONObject.toJSONString(re1);
451451
System.out.println(re);
452-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL64\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal64\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":2,\"string\":\"[0.00,0.00]\",\"table\":false,\"unitLength\":8,\"vector\":true}", re);
452+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL64\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal64\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":2,\"string\":\"[0.00,0.00]\",\"table\":false,\"unitLength\":8,\"values\":[0,0],\"vector\":true}", re);
453+
}
454+
@Test
455+
public void testBasicDecimal64Vector_getValue() throws IOException {
456+
String[] tmp_string_v = {"0.0","-123.00432","132.204234","100.0"};
457+
BasicDecimal64Vector re1 = new BasicDecimal64Vector(tmp_string_v,4);
458+
long[] re = re1.getValues();
459+
System.out.println(Arrays.toString(re));
460+
assertEquals("[0, -1230043, 1322042, 1000000]",Arrays.toString(re));
453461
}
454462
}

‎test/com/xxdb/data/BasicDoubleTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void test_BasicDoubleVector_toJSONString() throws Exception {
132132
BasicDoubleVector bdv = new BasicDoubleVector(arr,false);
133133
String re = JSONObject.toJSONString(bdv);
134134
System.out.println(re);
135-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[6.2,6.28,7.26],\"dataCategory\":\"FLOATING\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DOUBLE\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDouble\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[6.2,6.28,7.26]\",\"table\":false,\"unitLength\":8,\"vector\":true}", re);
135+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[6.2,6.28,7.26],\"dataCategory\":\"FLOATING\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DOUBLE\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDouble\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[6.2,6.28,7.26]\",\"table\":false,\"unitLength\":8,\"values\":[6.2,6.28,7.26],\"vector\":true}", re);
136136
}
137137
@Test
138138
public void testBasicDoubleMatrix_toJSONString(){

‎test/com/xxdb/data/BasicFloatTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void test_BasicFloatVector_toJSONString() throws Exception {
152152
BasicFloatVector bfv = new BasicFloatVector(arr,false);
153153
String re = JSONObject.toJSONString(bfv);
154154
System.out.println(re);
155-
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[47.47,52.38,66.45,71.89],\"dataCategory\":\"FLOATING\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_FLOAT\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicFloat\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[47.47000122,52.38000107,66.44999695,71.88999939]\",\"table\":false,\"unitLength\":4,\"vector\":true}", re);
155+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[47.47,52.38,66.45,71.89],\"dataCategory\":\"FLOATING\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_FLOAT\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicFloat\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[47.47000122,52.38000107,66.44999695,71.88999939]\",\"table\":false,\"unitLength\":4,\"values\":[47.47,52.38,66.45,71.89],\"vector\":true}", re);
156156
}
157157
@Test
158158
public void test_BasicFloatMatrix_toJSONString() throws Exception {

0 commit comments

Comments
 (0)