Skip to content

Commit 1dacda0

Browse files
author
chengyitian
committed
Merge remote-tracking branch 'origin/dev_conn_pool_Prj2' into dev_conn_pool_Prj2
2 parents 1ff1713 + 9d25411 commit 1dacda0

14 files changed

+150
-21
lines changed

‎test/com/xxdb/SimpleDBConnectionPoolTest.java

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,41 +72,45 @@ public void test_SimpleDBConnectionPool_config_newversion(){
7272
assertEquals(5,config.getMaximumPoolSize());
7373
}
7474
@Test
75-
public void test_SimpleDBConnectionPool_config_MinimumandPoolSize_error() {
76-
config.setMinimumPoolSize(-1);
75+
public void test_SimpleDBConnectionPool_config_MinimumandPoolSize_and_MaximumPoolSize_null() {
7776
pool = new SimpleDBConnectionPool(config);
7877
assertEquals(5, config.getMinimumPoolSize());
79-
80-
config.setMinimumPoolSize(0);
78+
assertEquals(5, config.getMaximumPoolSize());
79+
}
80+
@Test
81+
public void test_SimpleDBConnectionPool_config_maxpoolsize_minpoolsize_realtion() {
82+
config.setMaximumPoolSize(6);
83+
config.setMinimumPoolSize(-1);
8184
pool = new SimpleDBConnectionPool(config);
8285
assertEquals(5, config.getMinimumPoolSize());
83-
84-
config.setMinimumPoolSize(6);
85-
pool = new SimpleDBConnectionPool(config);
86-
assertEquals(6, config.getMinimumPoolSize());
8786
assertEquals(6, config.getMaximumPoolSize());
8887

89-
}
90-
@Test
91-
public void test_SimpleDBConnectionPool_config_MinimumandPoolSize_null() {
88+
config.setMaximumPoolSize(-4);
89+
config.setMinimumPoolSize(-6);
9290
pool = new SimpleDBConnectionPool(config);
9391
assertEquals(5, config.getMinimumPoolSize());
92+
assertEquals(5, config.getMaximumPoolSize());
9493
}
9594
@Test
96-
public void test_SimpleDBConnectionPool_config_MaximumPoolSize_error() {
97-
config.setMaximumPoolSize(0);
95+
public void test_SimpleDBConnectionPool_config_maxpoolsize_minpoolsize_realtion_error() {
96+
config.setMaximumPoolSize(4);
97+
config.setMinimumPoolSize(6);
9898
pool = new SimpleDBConnectionPool(config);
99-
assertEquals(5, config.getMaximumPoolSize());
99+
assertEquals(6, config.getMaximumPoolSize());
100+
assertEquals(6, config.getMaximumPoolSize());
100101

101102
config.setMaximumPoolSize(-5);
103+
config.setMinimumPoolSize(6);
102104
pool = new SimpleDBConnectionPool(config);
103-
assertEquals(5, config.getMaximumPoolSize());
105+
assertEquals(6, config.getMaximumPoolSize());
106+
assertEquals(6, config.getMaximumPoolSize());
104107

105-
}
106-
@Test
107-
public void test_SimpleDBConnectionPool_config_MaximumPoolSize_null() {
108+
config.setMaximumPoolSize(-4);
109+
config.setMinimumPoolSize(-2);
108110
pool = new SimpleDBConnectionPool(config);
109111
assertEquals(5, config.getMaximumPoolSize());
112+
assertEquals(5, config.getMaximumPoolSize());
113+
110114
}
111115
@Test
112116
public void test_SimpleDBConnectionPool_config_InvalididleTimeout_error() {

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.xxdb.data;
22

33
import com.alibaba.fastjson2.JSONObject;
4-
import com.xxdb.io.Double2;
5-
import com.xxdb.io.ExtendedDataOutput;
6-
import com.xxdb.io.Long2;
74
import org.junit.Test;
85

96
import java.io.IOException;
@@ -195,4 +192,12 @@ public void test_BasicBoolean_toJsonString_null() throws Exception {
195192
System.out.println(re);
196193
assertEquals("{\"boolean\":true,\"chart\":false,\"chunk\":false,\"dataCategory\":\"LOGICAL\",\"dataForm\":\"DF_SCALAR\",\"dataType\":\"DT_BOOL\",\"dictionary\":false,\"jsonString\":\"null\",\"matrix\":false,\"number\":-128,\"pair\":false,\"scalar\":true,\"string\":\"\",\"table\":false,\"value\":-128,\"vector\":false}", re);
197194
}
195+
@Test(expected = RuntimeException.class)
196+
public void test_BasicBooleanMartix_getScale() throws Exception {
197+
byte [] a={1,2,3};
198+
byte [] b={1,2,3};
199+
BasicBooleanMatrix bm=new BasicBooleanMatrix(3,2,Arrays.asList(a,b));
200+
bm.getScale();
201+
202+
}
198203
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,4 +592,11 @@ public void test_BasicByteVector_toJsonString(){
592592
System.out.println(re);
593593
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
}
595+
@Test(expected = RuntimeException.class)
596+
public void test_BasicByteMartix_getScale() throws Exception {
597+
byte [] a={1,2,3};
598+
byte [] b={1,2,3};
599+
BasicByteMatrix bm=new BasicByteMatrix(3,2,Arrays.asList(a,b));
600+
bm.getScale();
601+
}
595602
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,4 +535,13 @@ public void test_BasicComplexVector_toJSONString() {
535535
System.out.println(re);
536536
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
}
538+
@Test(expected = RuntimeException.class)
539+
public void test_BasicComplexMartix_getScale() throws Exception {
540+
BasicComplexMatrix bcm = new BasicComplexMatrix(2, 2);
541+
bcm.setComplex(0,0,1.1,2.2);
542+
bcm.setComplex(0,1,3.3,4.4);
543+
bcm.setComplex(1,0,5.5,6.6);
544+
bcm.setComplex(1,1,7.7,8.8);
545+
bcm.getScale();
546+
}
538547
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,13 @@ public void test_BasicDateHourMatrix_toJSONString() throws Exception {
140140
System.out.println(re);
141141
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_MATRIX\",\"dataType\":\"DT_DATEHOUR\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDateHour\",\"matrix\":true,\"pair\":false,\"scalar\":false,\"string\":\"#0 #1 \\n1970.01.01T01 1970.01.01T03\\n1970.01.01T02 1970.01.01T04\\n\",\"table\":false,\"vector\":false}", re);
142142
}
143+
@Test(expected = RuntimeException.class)
144+
public void test_BasicDateHourMartix_getScale() throws Exception {
145+
BasicDateHourMatrix bdhm = new BasicDateHourMatrix(2,2);
146+
bdhm.setDateHour(0,0,LocalDateTime.of(2022,7,29,11,07));
147+
bdhm.setDateHour(0,1,LocalDateTime.of(1970,1,1,11,11));
148+
bdhm.setDateHour(1,0,LocalDateTime.of(1993,6,23,15,36));
149+
bdhm.setDateHour(1,1,LocalDateTime.MIN);
150+
bdhm.getScale();
151+
}
143152
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,13 @@ public void test_BasicDateMatrix_toJSONString() throws Exception {
158158
System.out.println(re);
159159
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_MATRIX\",\"dataType\":\"DT_DATE\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDate\",\"matrix\":true,\"pair\":false,\"scalar\":false,\"string\":\"#0 #1 \\n1977.11.01 1982.07.02\\n1991.10.21 1976.10.03\\n\",\"table\":false,\"vector\":false}", re);
160160
}
161+
@Test(expected = RuntimeException.class)
162+
public void test_BasicDateMartix_getScale() throws Exception {
163+
BasicDateMatrix bdhm = new BasicDateMatrix(2,2);
164+
bdhm.setDate(0,0,LocalDate.of(2022,7,29));
165+
bdhm.setDate(0,1,LocalDate.of(1970,1,1));
166+
bdhm.setDate(1,0,LocalDate.of(1993,6,23));
167+
bdhm.setDate(1,1,LocalDate.MIN);
168+
bdhm.getScale();
169+
}
161170
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.io.IOException;
88
import java.nio.ByteBuffer;
9+
import java.time.LocalDate;
910
import java.time.LocalDateTime;
1011
import java.util.*;
1112

@@ -216,4 +217,13 @@ public void test_BasicDateTimeMatrix_toJSONString() throws Exception {
216217
System.out.println(re);
217218
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_MATRIX\",\"dataType\":\"DT_DATETIME\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDateTime\",\"matrix\":true,\"pair\":false,\"scalar\":false,\"string\":\"#0 #1 \\n1970.01.01T00:00:01 1970.01.01T00:00:03\\n1970.01.01T00:00:02 1970.01.01T00:00:04\\n\",\"table\":false,\"vector\":false}", re);
218219
}
220+
@Test(expected = RuntimeException.class)
221+
public void test_BasicDateTimeMartix_getScale() throws Exception {
222+
BasicDateTimeMatrix bdtm = new BasicDateTimeMatrix(2,2);
223+
bdtm.setDateTime(0,0,LocalDateTime.of(2022,8,10,15,55));
224+
bdtm.setDateTime(0,1,LocalDateTime.of(1978,12,13,17,58));
225+
bdtm.setDateTime(1,0,LocalDateTime.MIN);
226+
bdtm.setDateTime(1,1,LocalDateTime.MAX);
227+
bdtm.getScale();
228+
}
219229
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,5 +277,17 @@ public void test_BasicDecimal128Matrix_set_entity_not_support() throws Exception
277277
}
278278
assertEquals("The value type is not BasicDecimal128!", exception1);
279279
}
280+
@Test
281+
public void test_BasicDecimal128Matrix_getScale() throws Exception {
282+
for(int i=1;i<=38;i++){
283+
int scale=i;
284+
List<String[]> list1 = new ArrayList<>();
285+
list1.add(new String[]{"1", "1", "1"});
286+
list1.add(new String[]{"1", "1", "1"});
287+
BasicDecimal128Matrix re = new BasicDecimal128Matrix(3, 2,list1,scale);
288+
assertEquals(scale,re.getScale());
289+
}
290+
291+
}
280292

281293
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,4 +277,18 @@ public void test_BasicDecimal32Matrix_set_entity_not_support() throws Exception
277277
assertEquals("The value type is not BasicDecimal32!", exception1);
278278
}
279279

280+
@Test
281+
public void test_BasicDecimal32Matrix_getScale() throws Exception {
282+
for(int i=1;i<=9;i++ ){
283+
int scale=i;
284+
List<int[]> list = new ArrayList<>();
285+
list.add(new int[]{1, 2, 3});
286+
list.add(new int[]{4, 5, 6});
287+
BasicDecimal32Matrix re = new BasicDecimal32Matrix(3, 2,list,scale);
288+
assertEquals(scale,re.getScale());
289+
}
290+
291+
}
292+
293+
280294
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,5 +284,18 @@ public void test_BasicDecimal64Matrix_set_entity_not_support() throws Exception
284284
}
285285
assertEquals("The value type is not BasicDecimal64!", exception1);
286286
}
287+
@Test
288+
public void test_BasicDecimal64Matrix_getScale() throws Exception {
289+
for(int i=1;i<=18;i++){
290+
int scale=i;
291+
List<long[]> list = new ArrayList<>();
292+
list.add(new long[]{1, 2, 3});
293+
list.add(new long[]{4, 5, 6});
294+
BasicDecimal64Matrix re = new BasicDecimal64Matrix(3, 2,list,scale);
295+
assertEquals(scale,re.getScale());
296+
}
297+
298+
}
299+
287300

288301
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,14 @@ public void testBasicDoubleMatrix_toJSONString(){
145145
System.out.println(re);
146146
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"FLOATING\",\"dataForm\":\"DF_MATRIX\",\"dataType\":\"DT_DOUBLE\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDouble\",\"matrix\":true,\"pair\":false,\"scalar\":false,\"string\":\"#0 #1 \\n2.4 5.2\\n2.7 3.8\\n\",\"table\":false,\"vector\":false}", re);
147147
}
148+
149+
@Test(expected = RuntimeException.class)
150+
public void test_BasicDoubleMatrix_getScale() throws Exception {
151+
BasicDoubleMatrix bdm = new BasicDoubleMatrix(2,2);
152+
bdm.setDouble(0,0,2.4);
153+
bdm.setDouble(0,1,5.2);
154+
bdm.setDouble(1,0,2.7);
155+
bdm.setDouble(1,1,3.8);
156+
bdm.getScale();
157+
}
148158
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,13 @@ public void test_BasicFloatMatrix_toJSONString() throws Exception {
161161
System.out.println(re);
162162
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"FLOATING\",\"dataForm\":\"DF_MATRIX\",\"dataType\":\"DT_FLOAT\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicFloat\",\"matrix\":true,\"pair\":false,\"scalar\":false,\"string\":\"#0\\n0 \\n0 \\n0 \\n\",\"table\":false,\"vector\":false}", re);
163163
}
164+
@Test(expected = RuntimeException.class)
165+
public void test_BasicFloatMatrix_getScale() throws Exception {
166+
BasicFloatMatrix bdm = new BasicFloatMatrix(2,2);
167+
bdm.setFloat(0,0, 2.4F);
168+
bdm.setFloat(0,1, 5.2F);
169+
bdm.setFloat(1,0, 2.7F);
170+
bdm.setFloat(1,1, 3.8F);
171+
bdm.getScale();
172+
}
164173
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,14 @@ public void test_BasicIntMatrix_toJSONString() throws Exception {
204204
System.out.println(re);
205205
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"INTEGRAL\",\"dataForm\":\"DF_MATRIX\",\"dataType\":\"DT_INT\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicInt\",\"matrix\":true,\"pair\":false,\"scalar\":false,\"string\":\"#0 #1 #2\\n1 5 \\n4 0 2 \\n5 2147483647 1 \\n\",\"table\":false,\"vector\":false}", re);
206206
}
207+
@Test(expected = RuntimeException.class)
208+
public void test_BasicIntMatrix_getScale() throws Exception {
209+
BasicIntMatrix bdm = new BasicIntMatrix(2,2);
210+
bdm.setInt(0,0, 2);
211+
bdm.setInt(0,1, 5);
212+
bdm.setInt(1,0, 2);
213+
bdm.setInt(1,1, 3);
214+
bdm.getScale();
215+
}
207216

208217
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,13 @@ public void test_BasicLongMatrix_toJSONString() throws Exception {
201201
System.out.println(re);
202202
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"INTEGRAL\",\"dataForm\":\"DF_MATRIX\",\"dataType\":\"DT_LONG\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicLong\",\"matrix\":true,\"pair\":false,\"scalar\":false,\"string\":\"#0 #1\\n0 0 \\n0 0 \\n\",\"table\":false,\"vector\":false}", re);
203203
}
204+
@Test(expected = RuntimeException.class)
205+
public void test_BasicLongMatrix_getScale() throws Exception {
206+
BasicLongMatrix bdm = new BasicLongMatrix(2,2);
207+
bdm.setLong(0,0, 2);
208+
bdm.setLong(0,1, 5);
209+
bdm.setLong(1,0, 2);
210+
bdm.setLong(1,1, 3);
211+
bdm.getScale();
212+
}
204213
}

0 commit comments

Comments
 (0)