Skip to content

Commit 47dcb98

Browse files
StuartWheaterStuartWheater
authored
Merge pull request #253 from StuartWheater/v6.1-dev
Fixed, context messages 'expt' -> 'expt_dgr'
2 parents 16ebf89 + 7124b26 commit 47dcb98

5 files changed

Lines changed: 235 additions & 35 deletions

‎tests/testthat/test-expt_dgr-ds.dataFrameSort.R‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,20 @@
88
# along with this program. If not, see <http://www.gnu.org/licenses/>.
99
#-------------------------------------------------------------------------------
1010

11-
context('ds.dataFrameSort::expt::setup')
11+
#
12+
# Set up
13+
#
14+
15+
context('ds.dataFrameSort::expt_dgr::setup')
1216

1317
source('connection_to_datasets/init_testing_datasets.R')
1418
source('definition_tests/def-ds.dataFrameSort.R')
1519

16-
context("ds.dataFrameSort::expt::multiple::correct_parameter_class")
20+
#
21+
# Tests
22+
#
23+
24+
context("ds.dataFrameSort::expt_dgr::multiple::correct_parameter_class")
1725
test_that('all datasets',
1826
{
1927
connect.all.datasets()
@@ -31,7 +39,8 @@ test_that('all datasets',
3139
.test.function.parameters("D","D$NUMERIC_ONE_CHANGE",TRUE,"alphabetic","server.data")
3240
.test.function.parameters("D","D$INTEGER_ONE_CHANGE",TRUE,"numeric","server.data")
3341
})
34-
context("ds.dataFrameSort::expt::single::correct_parameter_class")
42+
43+
context("ds.dataFrameSort::expt_dgr::single::correct_parameter_class")
3544
test_that('dataset 2',
3645
{
3746
connect.dataset.2()
@@ -49,7 +58,8 @@ test_that('dataset 2',
4958
.test.function.parameters("D","D$NUMERIC_ONE_CHANGE",TRUE,"alphabetic","server.data")
5059
.test.function.parameters("D","D$INTEGER_ONE_CHANGE",TRUE,"numeric","server.data")
5160
})
52-
context("ds.dataFrameSort::expt::multiple::incorrect_parameter_class")
61+
62+
context("ds.dataFrameSort::expt_dgr::multiple::incorrect_parameter_class")
5363
test_that('all datasets',
5464
{
5565
connect.all.datasets()
@@ -65,7 +75,8 @@ test_that('all datasets',
6575
.test.function.parameters("D","D$NUMERIC_ONE_CHANGE",TRUE,"alphabetic",23)
6676
.test.function.parameters("dataframe","D$INTEGER_ONE_CHANGE",TRUE,"numeric","server.data")
6777
})
68-
context("ds.dataFrameSort::expt::single::incorrect_parameter_class")
78+
79+
context("ds.dataFrameSort::expt_dgr::single::incorrect_parameter_class")
6980
test_that('dataset 2',
7081
{
7182
connect.dataset.2()
@@ -82,7 +93,7 @@ test_that('dataset 2',
8293
.test.function.parameters("dataframe","D$INTEGER_ONE_CHANGE",TRUE,"numeric","server.data")
8394
})
8495

85-
context("ds.dataFrameSort::expt::multiple::df::creation")
96+
context("ds.dataFrameSort::expt_dgr::multiple::df::creation")
8697
test_that('all datasets',
8798
{
8899
connect.all.datasets()
@@ -98,7 +109,8 @@ test_that('all datasets',
98109
.test.data.frame.creation("D","NUMERIC_ONE_CHANGE",TRUE,"numeric","server.data")
99110
.test.data.frame.creation("D","INTEGER_ONE_CHANGE",TRUE,"numeric","server.data")
100111
})
101-
context("ds.dataFrameSort::expt::single::df::creation")
112+
113+
context("ds.dataFrameSort::expt_dgr::single::df::creation")
102114
test_that('dataset 3',
103115
{
104116
connect.dataset.3()
@@ -114,7 +126,8 @@ test_that('dataset 3',
114126
.test.data.frame.creation("D","NUMERIC_ONE_CHANGE",TRUE,"numeric","server.data")
115127
.test.data.frame.creation("D","INTEGER_ONE_CHANGE",FALSE,"alphabetic","server.data")
116128
})
117-
context("ds.dataFrameSort::expt::multiple::numeric::ascending")
129+
130+
context("ds.dataFrameSort::expt_dgr::multiple::numeric::ascending")
118131
test_that('all datasets',
119132
{
120133
connect.all.datasets()
@@ -124,7 +137,6 @@ test_that('all datasets',
124137
local.df.list[[i]][,"FACTOR_INTEGER"]<-as.factor(local.df.list[[i]][,"FACTOR_INTEGER"])
125138
colnames(local.df.list[[i]])<-ds.colnames("D",datasources = ds.test_env$connections[i][[1]])
126139
}
127-
128140
.test.data.frame.sorting("D","LOGICAL",FALSE,"numeric","server.data",local.df.list)
129141
#.test.data.frame.sorting("D","INTEGER",FALSE,"numeric","server.data",local.df.list)
130142
.test.data.frame.sorting("D","POSITIVE_INTEGER",FALSE,"numeric","server.data",local.df.list)
@@ -139,10 +151,9 @@ test_that('all datasets',
139151
.test.data.frame.sorting("D","FACTOR_INTEGER",FALSE,"numeric","server.data",local.df.list)
140152
#.test.data.frame.sorting("D","FACTOR_CHARACTER",FALSE,"numeric","server.data",local.df.list)
141153
#.test.data.frame.sorting("D","CHARACTER",FALSE,"numeric","server.data",local.df.list)
142-
143-
144154
})
145-
context("ds.dataFrameSort::expt::single::numeric::ascending")
155+
156+
context("ds.dataFrameSort::expt_dgr::single::numeric::ascending")
146157
test_that('dataset 1',
147158
{
148159
connect.dataset.1()
@@ -172,7 +183,8 @@ test_that('dataset 1',
172183

173184

174185
})
175-
context("ds.dataFrameSort::expt::multiple::numeric::descending")
186+
187+
context("ds.dataFrameSort::expt_dgr::multiple::numeric::descending")
176188
test_that('all datasets',
177189
{
178190
connect.all.datasets()
@@ -199,7 +211,8 @@ test_that('all datasets',
199211

200212

201213
})
202-
context("ds.dataFrameSort::expt::single::numeric::descending")
214+
215+
context("ds.dataFrameSort::expt_dgr::single::numeric::descending")
203216
test_that('dataset 1',
204217
{
205218
connect.dataset.1()
@@ -228,7 +241,7 @@ test_that('dataset 1',
228241
})
229242

230243

231-
context("ds.dataFrameSort::expt::multiple::alphabetic::ascending")
244+
context("ds.dataFrameSort::expt_dgr::multiple::alphabetic::ascending")
232245
test_that('all datasets',
233246
{
234247
connect.all.datasets()
@@ -255,7 +268,8 @@ test_that('all datasets',
255268
#.test.data.frame.sorting("D","FACTOR_CHARACTER",FALSE,"alphabetic","server.data",local.df.list)
256269
.test.data.frame.sorting("D","CHARACTER",FALSE,"alphabetic","server.data",local.df.list)
257270
})
258-
context("ds.dataFrameSort::expt::single::alphabetic::ascending")
271+
272+
context("ds.dataFrameSort::expt_dgr::single::alphabetic::ascending")
259273
test_that('dataset 2',
260274
{
261275
connect.dataset.2()
@@ -282,7 +296,8 @@ test_that('dataset 2',
282296
#.test.data.frame.sorting("D","FACTOR_CHARACTER",FALSE,"alphabetic","server.data",local.df.list)
283297
.test.data.frame.sorting("D","CHARACTER",FALSE,"alphabetic","server.data",local.df.list)
284298
})
285-
context("ds.dataFrameSort::expt::multiple::alphabetic::descending")
299+
300+
context("ds.dataFrameSort::expt_dgr::multiple::alphabetic::descending")
286301
test_that('all datasets',
287302
{
288303
connect.all.datasets()
@@ -307,7 +322,8 @@ test_that('all datasets',
307322
#.test.data.frame.sorting("D","FACTOR_CHARACTER",TRUE,"alphabetic","server.data",local.df.list)
308323
.test.data.frame.sorting("D","CHARACTER",TRUE,"alphabetic","server.data",local.df.list)
309324
})
310-
context("ds.dataFrameSort::expt::single::alphabetic::descending")
325+
326+
context("ds.dataFrameSort::expt_dgr::single::alphabetic::descending")
311327
test_that('dataset 3',
312328
{
313329
connect.dataset.3()
@@ -333,8 +349,14 @@ test_that('dataset 3',
333349
.test.data.frame.sorting("D","CHARACTER",TRUE,"alphabetic","server.data",local.df.list)
334350
})
335351

352+
#
353+
# Shutdown
354+
#
336355

337-
context('ds.dataFrameSort::expt::shutdown')
356+
context('ds.dataFrameSort::expt_dgr::shutdown')
338357

358+
#
359+
# Done
360+
#
339361

340-
context('ds.dataFrameSort::expt::done')
362+
context('ds.dataFrameSort::expt_dgr::done')

‎tests/testthat/test-expt_dgr-ds.dataFrameSubset.R‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,20 @@
88
# along with this program. If not, see <http://www.gnu.org/licenses/>.
99
#-------------------------------------------------------------------------------
1010

11+
#
12+
# Set up
13+
#
14+
15+
context("ds.dataFrameSubset()::expt_dgr::setup")
16+
1117
source("connection_to_datasets/init_testing_datasets.R")
1218
source("definition_tests/def-ds.dataFrameSubset.R")
1319

20+
#
21+
# Tests
22+
#
1423

15-
context("ds.dataFrameSubset()::expt::multiple::parameter_class")
24+
context("ds.dataFrameSubset()::expt_dgr::multiple::parameter_class")
1625
test_that('all datasets',
1726
{
1827
connect.all.datasets()
@@ -32,7 +41,7 @@ test_that('all datasets',
3241

3342
})
3443

35-
context("ds.dataFrameSubset()::expt::single::parameter_class")
44+
context("ds.dataFrameSubset()::expt_dgr::single::parameter_class")
3645
test_that('dataset 1',
3746
{
3847
connect.dataset.1()
@@ -52,7 +61,7 @@ test_that('dataset 1',
5261

5362
})
5463

55-
context("ds.dataFrameSubset()::expt::multiple::all_columns")
64+
context("ds.dataFrameSubset()::expt_dgr::multiple::all_columns")
5665
test_that('all datasets',
5766
{
5867
connect.all.datasets()
@@ -64,7 +73,7 @@ test_that('all datasets',
6473
.test.data.frame.creation("D","POSITIVE_NUMERIC","NON_NEGATIVE_NUMERIC","<=","subset.server")
6574
})
6675

67-
context("ds.dataFrameSubset()::expt::single::all_columns")
76+
context("ds.dataFrameSubset()::expt_dgr::single::all_columns")
6877
test_that('dataset 2',
6978
{
7079
connect.dataset.2()
@@ -76,7 +85,7 @@ test_that('dataset 2',
7685
.test.data.frame.creation("D","POSITIVE_NUMERIC","NON_NEGATIVE_NUMERIC","<=","subset.server")
7786
})
7887

79-
context("ds.dataFrameSubset()::expt::multiple::all_columns::subset_by_rows")
88+
context("ds.dataFrameSubset()::expt_dgr::multiple::all_columns::subset_by_rows")
8089
test_that("all datasets",
8190
{
8291
connect.all.datasets()
@@ -95,7 +104,7 @@ test_that("all datasets",
95104
subset.by.rows("D","POSITIVE_NUMERIC","NON_NEGATIVE_NUMERIC","<=",FALSE,"subset.server",local.df.list)
96105
})
97106

98-
context("ds.dataFrameSubset()::expt::single::all_columns::subset_by_rows")
107+
context("ds.dataFrameSubset()::expt_dgr::single::all_columns::subset_by_rows")
99108
test_that("dataset 3",
100109
{
101110
connect.dataset.3()
@@ -114,7 +123,7 @@ test_that("dataset 3",
114123
subset.by.rows("D","POSITIVE_NUMERIC","NON_NEGATIVE_NUMERIC","<=",FALSE,"subset.server",local.df.list)
115124
})
116125

117-
context("ds.dataFrameSubset()::expt::multiple::subset_by_rows_columns")
126+
context("ds.dataFrameSubset()::expt_dgr::multiple::subset_by_rows_columns")
118127
test_that("all datasets",
119128
{
120129
connect.all.datasets()
@@ -132,7 +141,8 @@ test_that("all datasets",
132141
subset.by.rows.cols("D","POSITIVE_NUMERIC","NON_NEGATIVE_NUMERIC",1:15,"<=",TRUE,"subset.server",local.df.list)
133142
subset.by.rows.cols("D","POSITIVE_NUMERIC","NON_NEGATIVE_NUMERIC",1:15,"<=",FALSE,"subset.server",local.df.list)
134143
})
135-
context("ds.dataFrameSubset()::expt::single::subset_by_rows_columns")
144+
145+
context("ds.dataFrameSubset()::expt_dgr::single::subset_by_rows_columns")
136146
test_that("dataset 1",
137147
{
138148
connect.dataset.1()
@@ -152,8 +162,7 @@ test_that("dataset 1",
152162
})
153163

154164

155-
156-
context("ds.dataFrameSubset()::expt::multiple::subset_by_rows_columns")
165+
context("ds.dataFrameSubset()::expt_dgr::multiple::subset_by_rows_columns")
157166
test_that("all datasets",
158167
{
159168
connect.all.datasets()
@@ -171,7 +180,7 @@ test_that("all datasets",
171180
subset.by.rows.cols("D","POSITIVE_NUMERIC","NON_NEGATIVE_NUMERIC",1:15,"<=",TRUE,"subset.server",local.df.list)
172181
subset.by.rows.cols("D","POSITIVE_NUMERIC","NON_NEGATIVE_NUMERIC",1:15,"<=",FALSE,"subset.server",local.df.list)
173182
})
174-
context("ds.dataFrameSubset()::expt::single::subset_by_rows_columns")
183+
context("ds.dataFrameSubset()::expt_dgr::single::subset_by_rows_columns")
175184
test_that("dataset 2",
176185
{
177186
connect.dataset.2()
@@ -189,7 +198,8 @@ test_that("dataset 2",
189198
subset.by.rows.cols("D","POSITIVE_NUMERIC","NON_NEGATIVE_NUMERIC",1:15,"<=",TRUE,"subset.server",local.df.list)
190199
subset.by.rows.cols("D","POSITIVE_NUMERIC","NON_NEGATIVE_NUMERIC",1:15,"<=",FALSE,"subset.server",local.df.list)
191200
})
192-
context("ds.dataFrameSubset()::expt::multiple::all_rows_subset_by_columns")
201+
202+
context("ds.dataFrameSubset()::expt_dgr::multiple::all_rows_subset_by_columns")
193203
test_that("all datasets",
194204
{ connect.all.datasets()
195205
local.df.list<-list(ds.test_env$local.values.1[,-1],ds.test_env$local.values.2[,-1],ds.test_env$local.values.3[,-1])
@@ -200,7 +210,8 @@ test_that("all datasets",
200210
subset.by.cols("D","POSITIVE_NUMERIC",c(2:5,12:14),TRUE,"subset.server",local.df.list)
201211
subset.by.cols("D","NON_NEGATIVE_NUMERIC",c(1:7,13:16),FALSE,"subset.server",local.df.list)
202212
})
203-
context("ds.dataFrameSubset()::expt::multiple::all_rows_subset_by_columns")
213+
214+
context("ds.dataFrameSubset()::expt_dgr::multiple::all_rows_subset_by_columns")
204215
test_that("dataset 3",
205216
{ connect.dataset.3()
206217
local.df.list<-list(ds.test_env$local.values.3[,-1])
@@ -210,4 +221,12 @@ test_that("dataset 3",
210221
subset.by.cols("D","NUMERIC",c(3:7,10,15),FALSE,"subset.server",local.df.list)
211222
subset.by.cols("D","POSITIVE_NUMERIC",c(2:5,12:14),TRUE,"subset.server",local.df.list)
212223
subset.by.cols("D","NON_NEGATIVE_NUMERIC",c(1:7,13:16),FALSE,"subset.server",local.df.list)
213-
})
224+
})
225+
226+
#
227+
# Shutdown
228+
#
229+
230+
#
231+
# Done
232+
#

‎tests/testthat/test-smk_dgr-ds.asCharacter.R‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test_that("simple test", {
3636
})
3737

3838
#
39-
# Done
39+
# Shutdown
4040
#
4141

4242
context("ds.asCharacter::smk_dgr::stutdown")
@@ -47,4 +47,8 @@ test_that("setup", {
4747

4848
disconnect.studies.dataset.cnsim()
4949

50+
#
51+
# Done
52+
#
53+
5054
context("ds.asCharacter::smk_dgr::done")

0 commit comments

Comments
 (0)