Skip to content

Commit 56e0734

Browse files
committed
Fixed context messages, 'expt' -> 'expt_dgr'
1 parent 4f8bea0 commit 56e0734

1 file changed

Lines changed: 33 additions & 14 deletions

File tree

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+
#

0 commit comments

Comments
 (0)