Skip to content

Commit c7ae106

Browse files
mrdrivingduckmrdrivingduck
committed
Updated test cases
1 parent 2bda828 commit c7ae106

File tree

5 files changed

+44
-59
lines changed

5 files changed

+44
-59
lines changed

‎test/TestAnyVector.R‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ if (conn@connected == TRUE) {
1414
record <- c(0L, 0L)
1515

1616
result <- dbRun(conn, "(1, table(2018.07.22 2018.08.21 as date, `Hello`World as str), 5.5, 1 2 3, 2012.06M)")
17-
1817
value_int <- 1L
1918
value_table <- data.frame(
2019
date = as.Date(c("2018-07-22", "2018-08-21")),
@@ -23,8 +22,8 @@ if (conn@connected == TRUE) {
2322
value_dbl <- 5.5
2423
value_vec <- c(1L, 2L, 3L)
2524
value_month <- as.Date("2012-06-01")
26-
2725
record <- assert(record, "test anyvector", result, list(value_int, value_table, value_dbl, value_vec, value_month))
26+
2827
printer(record)
2928
}
3029
dbClose(conn)

‎test/TestDataFrame.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ if (conn@connected == TRUE) {
2020
result <- dbRpc(conn, "cell", testList)
2121
record <- assert(record, "test dataframe rpc", result, 3.5)
2222

23-
2423
result <- dbRun(conn, "table(2018.06.12 2018.07.22 2018.08.21 as date, 1 2 NULL as int, `x`dd`zz as str, 10.8 7.6 3.5 as dbl)")
2524
table <- data.frame(
2625
date=as.Date(c("2018-06-12","2018-07-22","2018-08-21")),
@@ -29,6 +28,7 @@ if (conn@connected == TRUE) {
2928
dbl=c(10.8, 7.6, 3.5)
3029
)
3130
record <- assert(record, "test dataframe run", result, table)
31+
3232
printer(record)
3333

3434
}

‎test/TestMatrixs.R‎

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,83 +2,71 @@
22
#
33
# @Author -- Jingtang Zhang
44
# @Date -- 2018.7.31, Hangzhou
5-
# @Update -- 2018.8.15, Hangzhou
5+
# @Update -- 2018.8.19, Ningbo
66
#
77
#
88

99
library("RDolphinDB")
1010
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
1111
if (conn@connected == TRUE) {
1212

13-
ptm <- proc.time()
13+
source("Assert.R")
14+
record <- c(0L, 0L)
15+
1416
mtx <- matrix(c(NA, NA, NA, NA, NA, NA), nrow=3, byrow=F)
1517
rownames(mtx) <- c("a", "b", "c")
1618
colnames(mtx) <- c(2.5, 3.6)
1719
testList <- list(mtx)
1820
result <- dbRpc(conn, "sum", testList)
19-
print(result)
20-
print(class(result))
21-
print(proc.time() - ptm)
21+
vec <- as.numeric(c(NA, NA, NA))
22+
record <- assert(record, "test empty matrix rpc", result, vec)
2223

23-
ptm <- proc.time()
2424
mtx <- matrix(c(1.5, 2.5, 3.5, NA, 5.5, 6.5), nrow=3, byrow=F)
2525
rownames(mtx) <- c("a", "b", "c")
2626
colnames(mtx) <- c(2.5, 3.6)
2727
testList <- list(mtx)
2828
result <- dbRpc(conn, "sum", testList)
29-
print(result)
30-
print(class(result))
31-
print(proc.time() - ptm)
29+
vec <- c(1.5, 8.0, 10.0)
30+
record <- assert(record, "test numeric matrix rpc", result, vec)
3231

33-
ptm <- proc.time()
3432
mtx <- matrix(c(1L, 2L, 3L, NA, 5L, 6L), nrow=3, byrow=F)
3533
rownames(mtx) <- c("a", "b", "c")
3634
colnames(mtx) <- c(2.5, 3.6)
3735
testList <- list(mtx)
3836
result <- dbRpc(conn, "sum", testList)
39-
print(result)
40-
print(class(result))
41-
print(proc.time() - ptm)
37+
vec <- c(1L, 7L, 9L)
38+
record <- assert(record, "test integer matrix rpc", result, vec)
4239

43-
ptm <- proc.time()
4440
mtx <- matrix(c(TRUE, TRUE, FALSE, FALSE, FALSE, NA), nrow=3, byrow=F)
4541
rownames(mtx) <- c("a", "b", "c")
4642
colnames(mtx) <- c(2.5, 3.6)
4743
testList <- list(mtx)
4844
result <- dbRpc(conn, "sum", testList)
49-
print(result)
50-
print(class(result))
51-
print(proc.time() - ptm)
45+
vec <- c(1L, 1L, 0L)
46+
record <- assert(record, "test logical matrix rpc", result, vec)
5247

53-
ptm <- proc.time()
5448
result <- dbRun(conn, "matrix(true true NULL, false false false)")
55-
print(result)
56-
print(class(result))
57-
print(proc.time() - ptm)
49+
mtx <- matrix(c(TRUE, TRUE, NA, FALSE, FALSE, FALSE), nrow=3, byrow=F)
50+
record <- assert(record, "test logical matrix with NULL", result, mtx)
5851

59-
ptm <- proc.time()
6052
result <- dbRun(conn, "a = matrix(1 2 3, 4 5 6);a.rename!(`a`b`c, NULL 1.5);a")
61-
print(result)
62-
print(class(result))
63-
print(proc.time() - ptm)
53+
mtx <- matrix(c(1L, 2L, 3L, 4L, 5L, 6L), nrow=3, byrow=F)
54+
rownames(mtx) <- c("a", "b", "c")
55+
colnames(mtx) <- c(NA, 1.5)
56+
record <- assert(record, "test integer matrix with lable", result, mtx)
6457

65-
ptm <- proc.time()
6658
result <- dbRun(conn, "matrix(1 NULL 3, 4 5 6)")
67-
print(result)
68-
print(class(result))
69-
print(proc.time() - ptm)
59+
mtx <- matrix(c(1L, NA, 3L, 4L, 5L, 6L), nrow=3, byrow=F)
60+
record <- assert(record, "test integer matrix with NULL", result, mtx)
7061

71-
ptm <- proc.time()
7262
result <- dbRun(conn, "matrix(1.5 2.5 3.5, 4 5 6)")
73-
print(result)
74-
print(class(result))
75-
print(proc.time() - ptm)
63+
mtx <- matrix(c(1.5, 2.5, 3.5, 4, 5, 6), nrow=3, byrow=F)
64+
record <- assert(record, "test numeric matrix", result, mtx)
7665

77-
ptm <- proc.time()
7866
result <- dbRun(conn, "matrix(1.5 2.5 3.5, 4 NULL 6)")
79-
print(result)
80-
print(class(result))
81-
print(proc.time() - ptm)
67+
mtx <- matrix(c(1.5, 2.5, 3.5, 4, NA, 6), nrow=3, byrow=F)
68+
record <- assert(record, "test numeric matrix with NULL", result, mtx)
8269

70+
printer(record)
8371
}
8472
dbClose(conn)

‎test/TestPair.R‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,29 @@
22
#
33
# @Author -- Jingtang Zhang
44
# @Date -- 2018.8.17, Hangzhou
5-
# @Update -- 2018.8.17, Hangzhou
5+
# @Update -- 2018.8.19, Ningbo
66
#
77
#
88

99
library("RDolphinDB")
1010
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
1111
if (conn@connected == TRUE) {
12+
13+
source("Assert.R")
14+
record <- c(0L, 0L)
1215

13-
ptm <- proc.time()
1416
result <- dbRun(conn, "4:8")
15-
print(result)
16-
print(class(result))
17-
print(proc.time() - ptm)
17+
vec <- c(4L, 8L)
18+
record <- assert(record, "test integer pair", result, vec)
1819

19-
ptm <- proc.time()
2020
result <- dbRun(conn, "3.5:6.8")
21-
print(result)
22-
print(class(result))
23-
print(proc.time() - ptm)
21+
vec <- c(3.5, 6.8)
22+
record <- assert(record, "test numeric pair", result, vec)
2423

25-
ptm <- proc.time()
2624
result <- dbRun(conn, "`Hello:`World")
27-
print(result)
28-
print(class(result))
29-
print(proc.time() - ptm)
30-
25+
vec <- c("Hello", "World")
26+
record <- assert(record, "test character pair", result, vec)
27+
28+
printer(record)
3129
}
3230
dbClose(conn)

‎test/TestScalars.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
#
33
# @Author -- Jingtang Zhang
44
# @Date -- 2018.7.31, Hangzhou
5-
# @Update -- 2018.8.17, Hangzhou
5+
# @Update -- 2018.8.19, Ningbo
66
#
77
#
88

99
library("RDolphinDB")
1010
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
1111
if (conn@connected == TRUE) {
12+
13+
source("Assert.R")
14+
record <- c(0L, 0L)
1215

13-
ptm <- proc.time()
1416
result <- dbRun(conn, "a = `EXE`ELF;symbol(a)")
15-
print(result)
16-
print(class(result))
17-
print(proc.time() - ptm)
17+
vec
1818

1919
ptm <- proc.time()
2020
testList <- list("hello", "world")

0 commit comments

Comments
 (0)