Skip to content

Commit 0b8164a

Browse files
weisun123weisun123
committed
AJ-1010:fix test case
1 parent fedcbf8 commit 0b8164a

1 file changed

Lines changed: 36 additions & 15 deletions

File tree

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

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -680,14 +680,35 @@ public void test_BasicTable_Basic_cols_date_Calendar() throws IOException {
680680
Calendar cal2 = Calendar.getInstance();
681681
cal2.setTimeInMillis(1704067299999L);
682682
Calendar cal3 = Calendar.getInstance();
683-
cal2.setTimeInMillis(1704067200000L);
683+
cal3.setTimeInMillis(1704067200000L);
684684
Object[] cols = new Object[]{
685685
Arrays.asList(new java.util.Date(1704067200000L), new java.util.Date(1704067299999L),new java.util.Date(1704067200000L)),
686686
Arrays.asList(cal1, cal2, cal3)
687687
};
688688
BasicTable re = new BasicTable(colNames, cols);
689-
assertEquals("[2024.01.01 00:00:00.000,2024.01.01 00:01:39.999,2024.01.01 00:00:00.000]", re.getColumn(0).getString());
690-
assertEquals("[2024.01.01 00:00:00.000,2024.01.01 00:01:39.999,2024.01.01 00:00:00.000]", re.getColumn(1).getString());
689+
assertEquals("[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]", re.getColumn(0).getString());
690+
assertEquals("[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]", re.getColumn(1).getString());
691+
}
692+
693+
@Test
694+
public void test_BasicTable_Basic_list_cols_date_Calendar() throws IOException {
695+
List<String> colNames = Arrays.asList(
696+
"ctimestamp_Date ",
697+
"ctimestamp_Calendar"
698+
);
699+
Calendar cal1 = Calendar.getInstance();
700+
cal1.setTimeInMillis(1704067200000L);
701+
Calendar cal2 = Calendar.getInstance();
702+
cal2.setTimeInMillis(1704067299999L);
703+
Calendar cal3 = Calendar.getInstance();
704+
cal3.setTimeInMillis(1704067200000L);
705+
List<Object> cols = Arrays.asList(
706+
Arrays.asList(new java.util.Date(1704067200000L), new java.util.Date(1704067299999L),new java.util.Date(1704067200000L)),
707+
Arrays.asList(cal1, cal2, cal3)
708+
);
709+
BasicTable re = new BasicTable(colNames, cols);
710+
assertEquals("[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]", re.getColumn(0).getString());
711+
assertEquals("[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]", re.getColumn(1).getString());
691712
}
692713

693714
@Test
@@ -715,7 +736,7 @@ public void test_BasicTable_Basic_cols_list_list_allDataType_java() throws IOExc
715736
Calendar cal2 = Calendar.getInstance();
716737
cal2.setTimeInMillis(1704067299999L);
717738
Calendar cal3 = Calendar.getInstance();
718-
cal2.setTimeInMillis(1704067200000L);
739+
cal3.setTimeInMillis(1704067200000L);
719740

720741
List<Object> cols = Arrays.asList(
721742
Arrays.asList(true, false, false),
@@ -771,8 +792,8 @@ public void test_BasicTable_Basic_cols_list_list_allDataType_java() throws IOExc
771792
"[1970.01.02,1969.12.31,1970.01.03]",
772793
"[00:00:02.345000000,00:00:46.284000000,00:00:05.839000000]",
773794
"[1970.01.01T00:00:49.000000000,1970.01.01T00:04:02.000000000,1970.01.01T00:00:25.000000000]",
774-
"[2024.01.01 00:00:00.000,2024.01.01 00:01:39.999,2024.01.01 00:00:00.000]",
775-
"[2024.01.01 00:00:00.000,2024.01.01 00:01:39.999,2024.01.01 00:00:00.000]",
795+
"[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]",
796+
"[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]",
776797
"[\u0001\u0002,\u0003\u0004,\u0003\u0004]"
777798
};
778799
for (int i = 0; i < colNames.size(); i++) {
@@ -807,7 +828,7 @@ public void test_BasicTable_Basic_cols_list_array_allDataType_java() throws IOEx
807828
Calendar cal2 = Calendar.getInstance();
808829
cal2.setTimeInMillis(1704067299999L);
809830
Calendar cal3 = Calendar.getInstance();
810-
cal2.setTimeInMillis(1704067200000L);
831+
cal3.setTimeInMillis(1704067200000L);
811832

812833
List<Object> cols = Arrays.asList(
813834
new Object[]{true, false, false},
@@ -863,8 +884,8 @@ public void test_BasicTable_Basic_cols_list_array_allDataType_java() throws IOEx
863884
"[1970.01.02,1969.12.31,1970.01.03]",
864885
"[00:00:02.345000000,00:00:46.284000000,00:00:05.839000000]",
865886
"[1970.01.01T00:00:49.000000000,1970.01.01T00:04:02.000000000,1970.01.01T00:00:25.000000000]",
866-
"[2024.01.01 00:00:00.000,2024.01.01 00:01:39.999,2024.01.01 00:00:00.000]",
867-
"[2024.01.01 00:00:00.000,2024.01.01 00:01:39.999,2024.01.01 00:00:00.000]",
887+
"[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]",
888+
"[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]",
868889
"[\u0001\u0002,\u0003\u0004,\u0003\u0004]"
869890
};
870891
for (int i = 0; i < colNames.size(); i++) {
@@ -899,7 +920,7 @@ public void test_BasicTable_Basic_cols_array_list_allDataType_java() throws IOEx
899920
Calendar cal2 = Calendar.getInstance();
900921
cal2.setTimeInMillis(1704067299999L);
901922
Calendar cal3 = Calendar.getInstance();
902-
cal2.setTimeInMillis(1704067200000L);
923+
cal3.setTimeInMillis(1704067200000L);
903924
Object[] cols = new Object[]{
904925
Arrays.asList(true, false, false),
905926
Arrays.asList((byte) 22, (byte) 57, (byte) 13),
@@ -954,8 +975,8 @@ public void test_BasicTable_Basic_cols_array_list_allDataType_java() throws IOEx
954975
"[1970.01.02,1969.12.31,1970.01.03]",
955976
"[00:00:02.345000000,00:00:46.284000000,00:00:05.839000000]",
956977
"[1970.01.01T00:00:49.000000000,1970.01.01T00:04:02.000000000,1970.01.01T00:00:25.000000000]",
957-
"[2024.01.01 00:00:00.000,2024.01.01 00:01:39.999,2024.01.01 00:00:00.000]",
958-
"[2024.01.01 00:00:00.000,2024.01.01 00:01:39.999,2024.01.01 00:00:00.000]",
978+
"[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]",
979+
"[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]",
959980
"[\u0001\u0002,\u0003\u0004,\u0003\u0004]"
960981
};
961982
for (int i = 0; i < colNames.size(); i++) {
@@ -990,7 +1011,7 @@ public void test_BasicTable_Basic_cols_array_array_allDataType_java() throws IOE
9901011
Calendar cal2 = Calendar.getInstance();
9911012
cal2.setTimeInMillis(1704067299999L);
9921013
Calendar cal3 = Calendar.getInstance();
993-
cal2.setTimeInMillis(1704067200000L);
1014+
cal3.setTimeInMillis(1704067200000L);
9941015
Object[] cols = new Object[]{
9951016
new Object[]{true, false, false},
9961017
new Object[]{(byte) 22, (byte) 57, (byte) 13},
@@ -1045,8 +1066,8 @@ public void test_BasicTable_Basic_cols_array_array_allDataType_java() throws IOE
10451066
"[1970.01.02,1969.12.31,1970.01.03]",
10461067
"[00:00:02.345000000,00:00:46.284000000,00:00:05.839000000]",
10471068
"[1970.01.01T00:00:49.000000000,1970.01.01T00:04:02.000000000,1970.01.01T00:00:25.000000000]",
1048-
"[2024.01.01 00:00:00.000,2024.01.01 00:01:39.999,2024.01.01 00:00:00.000]",
1049-
"[2024.01.01 00:00:00.000,2024.01.01 00:01:39.999,2024.01.01 00:00:00.000]",
1069+
"[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]",
1070+
"[2024.01.01T00:00:00.000,2024.01.01T00:01:39.999,2024.01.01T00:00:00.000]",
10501071
"[\u0001\u0002,\u0003\u0004,\u0003\u0004]"
10511072
};
10521073
for (int i = 0; i < colNames.size(); i++) {

0 commit comments

Comments
 (0)