Skip to content

Commit 7296f8a

Browse files
StuartWheaterStuartWheater
committed
Updated tests and test env
1 parent b55a7b8 commit 7296f8a

7 files changed

Lines changed: 23 additions & 90 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@
1010
inst/tests/test-template.R
1111
azure-pipelines.Rout
1212
tests/testthat/connection_to_datasets/local_settings.csv
13+
tests/docker/armadillo/standard/config/
14+
tests/docker/armadillo/standard/logs/
15+
tests/docker/armadillo/standard/data/

‎tests/docker/armadillo/standard/config/application.yml‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎tests/docker/armadillo/standard/data/system/access.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎tests/docker/armadillo/standard/data/system/profiles.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎tests/docker/armadillo/standard/log/.gitkeep‎

Whitespace-only changes.

‎tests/testthat/test-smk-ds.glmerSLMA.R‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ test_that("check slope formulae - 1", {
110110
expect_length(res$num.valid.studies, 1)
111111
expect_equal(class(res$num.valid.studies), "numeric")
112112
expect_length(res$betamatrix.all, 9)
113-
if (base::getRversion() < 4.0)
113+
if (base::getRversion() < '4.0.0')
114114
{
115115
expect_length(class(res$betamatrix.all), 1)
116116
expect_true("matrix" %in% class(res$betamatrix.all))
@@ -122,7 +122,7 @@ test_that("check slope formulae - 1", {
122122
expect_true("array" %in% class(res$betamatrix.all))
123123
}
124124
expect_length(res$sematrix.all, 9)
125-
if (base::getRversion() < 4.0)
125+
if (base::getRversion() < '4.0.0')
126126
{
127127
expect_length(class(res$sematrix.all), 1)
128128
expect_true("matrix" %in% class(res$sematrix.all))
@@ -134,7 +134,7 @@ test_that("check slope formulae - 1", {
134134
expect_true("array" %in% class(res$sematrix.all))
135135
}
136136
expect_length(res$betamatrix.valid, 9)
137-
if (base::getRversion() < 4.0)
137+
if (base::getRversion() < '4.0.0')
138138
{
139139
expect_length(class(res$betamatrix.valid), 1)
140140
expect_true("matrix" %in% class(res$betamatrix.valid))
@@ -146,7 +146,7 @@ test_that("check slope formulae - 1", {
146146
expect_true("array" %in% class(res$betamatrix.valid))
147147
}
148148
expect_length(res$sematrix.valid, 9)
149-
if (base::getRversion() < 4.0)
149+
if (base::getRversion() < '4.0.0')
150150
{
151151
expect_length(class(res$sematrix.valid), 1)
152152
expect_true("matrix" %in% class(res$sematrix.valid))
@@ -158,7 +158,7 @@ test_that("check slope formulae - 1", {
158158
expect_true("array" %in% class(res$sematrix.valid))
159159
}
160160
expect_length(res$SLMA.pooled.ests.matrix, 18)
161-
if (base::getRversion() < 4.0)
161+
if (base::getRversion() < '4.0.0')
162162
{
163163
expect_length(class(res$SLMA.pooled.ests.matrix), 1)
164164
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
@@ -182,7 +182,7 @@ test_that("check slope formulae - 2", {
182182
expect_length(res$num.valid.studies, 1)
183183
expect_equal(class(res$num.valid.studies), "numeric")
184184
expect_length(res$betamatrix.all, 9)
185-
if (base::getRversion() < 4.0)
185+
if (base::getRversion() < '4.0.0')
186186
{
187187
expect_length(class(res$betamatrix.all), 1)
188188
expect_true("matrix" %in% class(res$betamatrix.all))
@@ -194,7 +194,7 @@ test_that("check slope formulae - 2", {
194194
expect_true("array" %in% class(res$betamatrix.all))
195195
}
196196
expect_length(res$sematrix.all, 9)
197-
if (base::getRversion() < 4.0)
197+
if (base::getRversion() < '4.0.0')
198198
{
199199
expect_length(class(res$sematrix.all), 1)
200200
expect_true("matrix" %in% class(res$sematrix.all))
@@ -206,7 +206,7 @@ test_that("check slope formulae - 2", {
206206
expect_true("array" %in% class(res$sematrix.all))
207207
}
208208
expect_length(res$betamatrix.valid, 9)
209-
if (base::getRversion() < 4.0)
209+
if (base::getRversion() < '4.0.0')
210210
{
211211
expect_length(class(res$betamatrix.valid), 1)
212212
expect_true("matrix" %in% class(res$betamatrix.valid))
@@ -218,7 +218,7 @@ test_that("check slope formulae - 2", {
218218
expect_true("array" %in% class(res$betamatrix.valid))
219219
}
220220
expect_length(res$sematrix.valid, 9)
221-
if (base::getRversion() < 4.0)
221+
if (base::getRversion() < '4.0.0')
222222
{
223223
expect_length(class(res$sematrix.valid), 1)
224224
expect_true("matrix" %in% class(res$sematrix.valid))
@@ -230,7 +230,7 @@ test_that("check slope formulae - 2", {
230230
expect_true("array" %in% class(res$sematrix.valid))
231231
}
232232
expect_length(res$SLMA.pooled.ests.matrix, 18)
233-
if (base::getRversion() < 4.0)
233+
if (base::getRversion() < '4.0.0')
234234
{
235235
expect_length(class(res$SLMA.pooled.ests.matrix), 1)
236236
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))

‎tests/testthat/test-smk-ds.lmerSLMA.R‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ test_that("check slope formulae", {
112112
expect_length(res$num.valid.studies, 1)
113113
expect_equal(class(res$num.valid.studies), "numeric")
114114
expect_length(res$betamatrix.all, 9)
115-
if (base::getRversion() < 4.0)
115+
if (base::getRversion() < '4.0.0')
116116
{
117117
expect_length(class(res$betamatrix.all), 1)
118118
expect_true("matrix" %in% class(res$betamatrix.all))
@@ -124,7 +124,7 @@ test_that("check slope formulae", {
124124
expect_true("array" %in% class(res$betamatrix.all))
125125
}
126126
expect_length(res$sematrix.all, 9)
127-
if (base::getRversion() < 4.0)
127+
if (base::getRversion() < '4.0.0')
128128
{
129129
expect_length(class(res$sematrix.all), 1)
130130
expect_true("matrix" %in% class(res$sematrix.all))
@@ -136,7 +136,7 @@ test_that("check slope formulae", {
136136
expect_true("array" %in% class(res$sematrix.all))
137137
}
138138
expect_length(res$betamatrix.valid, 9)
139-
if (base::getRversion() < 4.0)
139+
if (base::getRversion() < '4.0.0')
140140
{
141141
expect_length(class(res$betamatrix.valid), 1)
142142
expect_true("matrix" %in% class(res$betamatrix.valid))
@@ -148,7 +148,7 @@ test_that("check slope formulae", {
148148
expect_true("array" %in% class(res$betamatrix.valid))
149149
}
150150
expect_length(res$sematrix.valid, 9)
151-
if (base::getRversion() < 4.0)
151+
if (base::getRversion() < '4.0.0')
152152
{
153153
expect_length(class(res$sematrix.valid), 1)
154154
expect_true("matrix" %in% class(res$sematrix.valid))
@@ -160,7 +160,7 @@ test_that("check slope formulae", {
160160
expect_true("array" %in% class(res$sematrix.valid))
161161
}
162162
expect_length(res$SLMA.pooled.ests.matrix, 18)
163-
if (base::getRversion() < 4.0)
163+
if (base::getRversion() < '4.0.0')
164164
{
165165
expect_length(class(res$SLMA.pooled.ests.matrix), 1)
166166
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
@@ -184,7 +184,7 @@ test_that("check slope formulae", {
184184
expect_length(res$num.valid.studies, 1)
185185
expect_equal(class(res$num.valid.studies), "numeric")
186186
expect_length(res$betamatrix.all, 9)
187-
if (base::getRversion() < 4.0)
187+
if (base::getRversion() < '4.0.0')
188188
{
189189
expect_length(class(res$betamatrix.all), 1)
190190
expect_true("matrix" %in% class(res$betamatrix.all))
@@ -196,7 +196,7 @@ test_that("check slope formulae", {
196196
expect_true("array" %in% class(res$betamatrix.all))
197197
}
198198
expect_length(res$sematrix.all, 9)
199-
if (base::getRversion() < 4.0)
199+
if (base::getRversion() < '4.0.0')
200200
{
201201
expect_length(class(res$sematrix.all), 1)
202202
expect_true("matrix" %in% class(res$sematrix.all))
@@ -208,7 +208,7 @@ test_that("check slope formulae", {
208208
expect_true("array" %in% class(res$sematrix.all))
209209
}
210210
expect_length(res$betamatrix.valid, 9)
211-
if (base::getRversion() < 4.0)
211+
if (base::getRversion() < '4.0.0')
212212
{
213213
expect_length(class(res$betamatrix.valid), 1)
214214
expect_true("matrix" %in% class(res$betamatrix.valid))
@@ -220,7 +220,7 @@ test_that("check slope formulae", {
220220
expect_true("array" %in% class(res$betamatrix.valid))
221221
}
222222
expect_length(res$sematrix.valid, 9)
223-
if (base::getRversion() < 4.0)
223+
if (base::getRversion() < '4.0.0')
224224
{
225225
expect_length(class(res$sematrix.valid), 1)
226226
expect_true("matrix" %in% class(res$sematrix.valid))
@@ -232,7 +232,7 @@ test_that("check slope formulae", {
232232
expect_true("array" %in% class(res$sematrix.valid))
233233
}
234234
expect_length(res$SLMA.pooled.ests.matrix, 18)
235-
if (base::getRversion() < 4.0)
235+
if (base::getRversion() < '4.0.0')
236236
{
237237
expect_length(class(res$SLMA.pooled.ests.matrix), 1)
238238
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))

0 commit comments

Comments
 (0)