Skip to content

Commit 955ae2a

Browse files
mrdrivingduckmrdrivingduck
committed
Updated testing shell
1 parent c7ae106 commit 955ae2a

File tree

12 files changed

+143
-186
lines changed

12 files changed

+143
-186
lines changed

‎test/Assert.R‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
#
77
#
88

9+
# Config IP address and port who is running DolphinDB server
10+
ip_addr <- "192.168.137.132"
11+
port <- 8888
12+
13+
# Count all cases, print error message
914
assert <- function(record, item, target, current) {
1015

1116
if (TRUE == all.equal(target, current)) {
@@ -17,7 +22,8 @@ assert <- function(record, item, target, current) {
1722
return (record)
1823
}
1924

25+
# Print testing result
2026
printer <- function(record) {
2127
msg <- paste("Build Failed:", as.character(record[2]-record[1]), "/", as.character(record[2]))
2228
print(msg, quote = FALSE)
23-
}
29+
}

‎test/TestAnyVector.R‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
#
77
#
88

9+
source("Assert.R")
10+
911
library("RDolphinDB")
10-
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
12+
conn <- dbConnect(DolphinDB(), ip_addr, port)
1113
if (conn@connected == TRUE) {
1214

13-
source("Assert.R")
1415
record <- c(0L, 0L)
1516

1617
result <- dbRun(conn, "(1, table(2018.07.22 2018.08.21 as date, `Hello`World as str), 5.5, 1 2 3, 2012.06M)")

‎test/TestDataFrame.R‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
#
77
#
88

9+
source("Assert.R")
10+
911
library("RDolphinDB")
10-
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
12+
conn <- dbConnect(DolphinDB(), ip_addr, port)
1113
if (conn@connected == TRUE) {
1214

13-
source("Assert.R")
1415
record <- c(0L, 0L)
1516

1617
table <- data.frame(id=c(1,2,3), value=c(2.5, 3.5, 5.5))

‎test/TestDateAndTime.R‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
#
77
#
88

9+
source("Assert.R")
10+
911
library("RDolphinDB")
10-
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
12+
conn <- dbConnect(DolphinDB(), ip_addr, port)
1113
if (conn@connected == TRUE) {
1214

13-
source("Assert.R")
1415
record <- c(0L, 0L)
1516

1617
result <- dbRun(conn, "matrix(2018.08.14T16:16:16.016147852 2018.08.17T03:26:56.088985651, 2018.08.25T19:24:46.832147524 2018.08.25T19:24:46.832369852, NULL 2018.08.25T19:24:46.832025741)")

‎test/TestLogIn.R‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66
#
77
#
88

9+
source("Assert.R")
10+
911
library("RDolphinDB")
10-
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888, "admin", "123456")
12+
conn <- dbConnect(DolphinDB(), ip_addr, port, "admin", "123456")
1113
if (conn@connected == TRUE) {
1214

13-
source("Assert.R")
1415
record <- c(0L, 0L)
1516

1617
record <- assert(record, "test log in", 1L, 1L)
17-
printer(record)
1818

19+
printer(record)
1920
}
2021
dbClose(conn)

‎test/TestMatrixs.R‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
#
77
#
88

9+
source("Assert.R")
10+
911
library("RDolphinDB")
10-
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
12+
conn <- dbConnect(DolphinDB(), ip_addr, port)
1113
if (conn@connected == TRUE) {
1214

13-
source("Assert.R")
1415
record <- c(0L, 0L)
1516

1617
mtx <- matrix(c(NA, NA, NA, NA, NA, NA), nrow=3, byrow=F)

‎test/TestPair.R‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
#
77
#
88

9+
source("Assert.R")
10+
911
library("RDolphinDB")
10-
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
12+
conn <- dbConnect(DolphinDB(), ip_addr, port)
1113
if (conn@connected == TRUE) {
1214

13-
source("Assert.R")
1415
record <- c(0L, 0L)
1516

1617
result <- dbRun(conn, "4:8")

‎test/TestScalars.R‎

Lines changed: 44 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -6,129 +6,96 @@
66
#
77
#
88

9+
source("Assert.R")
10+
911
library("RDolphinDB")
10-
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
12+
conn <- dbConnect(DolphinDB(), ip_addr, port)
1113
if (conn@connected == TRUE) {
1214

13-
source("Assert.R")
1415
record <- c(0L, 0L)
15-
16-
result <- dbRun(conn, "a = `EXE`ELF;symbol(a)")
17-
vec
1816

19-
ptm <- proc.time()
2017
testList <- list("hello", "world")
2118
result <- dbRpc(conn, "concat", testList)
22-
print(result)
23-
print(class(result))
24-
print(proc.time() - ptm)
19+
scalar <- "helloworld"
20+
record <- assert(record, "test character scalar rpc", result, scalar)
2521

26-
ptm <- proc.time()
2722
testList <- list(16L)
2823
result <- dbRpc(conn, "sum", testList)
29-
print(result)
30-
print(class(result))
31-
print(proc.time() - ptm)
24+
scalar <- 16L
25+
record <- assert(record, "test integer scalar rpc", result, scalar)
3226

33-
ptm <- proc.time()
3427
testList <- list(TRUE)
3528
result <- dbRpc(conn, "sum", testList)
36-
print(result)
37-
print(class(result))
38-
print(proc.time() - ptm)
29+
scalar <- TRUE
30+
record <- assert(record, "test logical scalar rpc", result, scalar)
3931

40-
ptm <- proc.time()
4132
testList <- list(NA)
4233
result <- dbRpc(conn, "sum", testList)
43-
print(result)
44-
print(class(result))
45-
print(proc.time() - ptm)
34+
scalar <- NA
35+
record <- assert(record, "test NULL scalar rpc", result, scalar)
4636

47-
ptm <- proc.time()
4837
testList <- list(25.6)
4938
result <- dbRpc(conn, "sum", testList)
50-
print(result)
51-
print(class(result))
52-
print(proc.time() - ptm)
39+
scalar <- 25.6
40+
record <- assert(record, "test numeric scalar rpc", result, scalar)
5341

54-
ptm <- proc.time()
5542
testList <- list("hello Rcpp")
5643
result <- dbRpc(conn, "sum", testList)
57-
print(result)
58-
print(class(result))
59-
print(proc.time() - ptm)
44+
scalar <- "hello Rcpp"
45+
record <- assert(record, "test character scalar rpc", result, scalar)
6046

61-
ptm <- proc.time()
6247
result <- dbRun(conn, "00h")
63-
print(result)
64-
print(class(result))
65-
print(proc.time() - ptm)
48+
scalar <- NA
49+
record <- assert(record, "test short NULL scalar", result, scalar)
6650

67-
ptm <- proc.time()
6851
result <- dbRun(conn, "00l")
69-
print(result)
70-
print(class(result))
71-
print(proc.time() - ptm)
52+
scalar <- NA
53+
record <- assert(record, "test long NULL scalar", result, scalar)
7254

73-
ptm <- proc.time()
7455
result <- dbRun(conn, "00b")
75-
print(result)
76-
print(class(result))
77-
print(proc.time() - ptm)
56+
scalar <- NA
57+
record <- assert(record, "test bool NULL scalar", result, scalar)
7858

79-
ptm <- proc.time()
8059
result <- dbRun(conn, "00i")
81-
print(result)
82-
print(class(result))
83-
print(proc.time() - ptm)
60+
scalar <- as.integer(NA)
61+
record <- assert(record, "test int NULL scalar", result, scalar)
8462

85-
ptm <- proc.time()
8663
result <- dbRun(conn, "00f")
87-
print(result)
88-
print(class(result))
89-
print(proc.time() - ptm)
64+
scalar <- NA
65+
record <- assert(record, "test float NULL scalar", result, scalar)
9066

91-
ptm <- proc.time()
9267
result <- dbRun(conn, "00c")
93-
print(result)
94-
print(class(result))
95-
print(proc.time() - ptm)
68+
scalar <- NA
69+
record <- assert(record, "test character NULL scalar", result, scalar)
9670

97-
ptm <- proc.time()
9871
result <- dbRun(conn, "false")
99-
print(result)
100-
print(class(result))
101-
print(proc.time() - ptm)
72+
scalar <- FALSE
73+
record <- assert(record, "test logical scalar", result, scalar)
10274

103-
ptm <- proc.time()
10475
result <- dbRun(conn, "2.5")
105-
print(result)
106-
print(class(result))
107-
print(proc.time() - ptm)
76+
scalar <- 2.5
77+
record <- assert(record, "test double scalar", result, scalar)
78+
79+
result <- dbRun(conn, "2.5f")
80+
scalar <- 2.5
81+
record <- assert(record, "test float scalar", result, scalar)
10882

109-
ptm <- proc.time()
11083
result <- dbRun(conn, "`hello")
111-
print(result)
112-
print(class(result))
113-
print(proc.time() - ptm)
84+
scalar <- "hello"
85+
record <- assert(record, "test string scalar", result, scalar)
11486

115-
ptm <- proc.time()
11687
result <- dbRun(conn, "'a'")
117-
print(result)
118-
print(class(result))
119-
print(proc.time() - ptm)
88+
scalar <- "a"
89+
record <- assert(record, "test character scalar", result, scalar)
12090

121-
ptm <- proc.time()
12291
result <- dbRun(conn, "16")
123-
print(result)
124-
print(class(result))
125-
print(proc.time() - ptm)
92+
scalar <- 16L
93+
record <- assert(record, "test integer scalar", result, scalar)
12694

127-
ptm <- proc.time()
12895
result <- dbRun(conn, "NULL")
129-
print(result)
130-
print(class(result))
131-
print(proc.time() - ptm)
96+
scalar <- NA
97+
record <- assert(record, "test NULL scalar", result, scalar)
13298

99+
printer(record)
133100
}
134101
dbClose(conn)

‎test/TestSet.R‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,22 @@
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

9+
source("Assert.R")
10+
911
library("RDolphinDB")
10-
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
12+
conn <- dbConnect(DolphinDB(), ip_addr, port)
1113
if (conn@connected == TRUE) {
1214

13-
ptm <- proc.time()
15+
record <- c(0L, 0L)
16+
1417
result <- dbRun(conn, "set(1 1.5 2 2.5 2 2.50 2.500 00f NULL)")
15-
print(result)
16-
print(class(result))
17-
print(proc.time() - ptm)
18+
set <- c(2.5, 2.0, NA, 1.5, 1.0)
19+
record <- assert(record, "test set", result, set)
1820

21+
printer(record)
1922
}
2023
dbClose(conn)

‎test/TestUpload.R‎

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

9+
source("Assert.R")
10+
911
library("RDolphinDB")
10-
conn <- dbConnect(DolphinDB(), "192.168.137.132", 8888)
12+
conn <- dbConnect(DolphinDB(), ip_addr, port)
1113
if (conn@connected == TRUE) {
1214

13-
ptm <- proc.time()
15+
record <- c(0L, 0L)
16+
1417
keys <- c("x", "y", "z")
1518
args <- list(5, c(2L, 3L), "666")
1619
stat <- dbUpload(conn, keys, args)
1720
if (stat) {
1821
result <- dbRun(conn, "x")
19-
print(result)
20-
print(class(result))
22+
scalar <- 5
23+
record <- assert(record, "test upload numeric", result, scalar)
2124

2225
result <- dbRun(conn, "y")
23-
print(result)
24-
print(class(result))
26+
vec <- c(2L, 3L)
27+
record <- assert(record, "test upload vector", result, vec)
2528

2629
result <- dbRun(conn, "z")
27-
print(result)
28-
print(class(result))
30+
scalar <- "666"
31+
record <- assert(record, "test upload string", result, scalar)
2932
}
3033

31-
print(proc.time() - ptm)
32-
34+
printer(record)
3335
}
3436
dbClose(conn)

0 commit comments

Comments
 (0)