Skip to content

Commit 1e69d2a

Browse files
StuartWheaterStuartWheater
authored
Merge pull request #293 from StuartWheater/v6.1-dev
Modified for R3.6 behavior
2 parents 2315365 + 77e69b6 commit 1e69d2a

2 files changed

Lines changed: 220 additions & 60 deletions

File tree

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

Lines changed: 110 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -112,25 +112,65 @@ test_that("check slope formulae - 1", {
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-
expect_length(class(res$betamatrix.all), 2)
116-
expect_true("matrix" %in% class(res$betamatrix.all))
117-
expect_true("array" %in% class(res$betamatrix.all))
115+
if (base::getRversion() < 4.0)
116+
{
117+
expect_length(class(res$betamatrix.all), 1)
118+
expect_true("matrix" %in% class(res$betamatrix.all))
119+
}
120+
else
121+
{
122+
expect_length(class(res$betamatrix.all), 2)
123+
expect_true("matrix" %in% class(res$betamatrix.all))
124+
expect_true("array" %in% class(res$betamatrix.all))
125+
}
118126
expect_length(res$sematrix.all, 9)
119-
expect_length(class(res$sematrix.all), 2)
120-
expect_true("matrix" %in% class(res$sematrix.all))
121-
expect_true("array" %in% class(res$sematrix.all))
127+
if (base::getRversion() < 4.0)
128+
{
129+
expect_length(class(res$sematrix.all), 1)
130+
expect_true("matrix" %in% class(res$sematrix.all))
131+
}
132+
else
133+
{
134+
expect_length(class(res$sematrix.all), 2)
135+
expect_true("matrix" %in% class(res$sematrix.all))
136+
expect_true("array" %in% class(res$sematrix.all))
137+
}
122138
expect_length(res$betamatrix.valid, 9)
123-
expect_length(class(res$betamatrix.valid), 2)
124-
expect_true("matrix" %in% class(res$betamatrix.valid))
125-
expect_true("array" %in% class(res$betamatrix.valid))
139+
if (base::getRversion() < 4.0)
140+
{
141+
expect_length(class(res$betamatrix.valid), 1)
142+
expect_true("matrix" %in% class(res$betamatrix.valid))
143+
}
144+
else
145+
{
146+
expect_length(class(res$betamatrix.valid), 2)
147+
expect_true("matrix" %in% class(res$betamatrix.valid))
148+
expect_true("array" %in% class(res$betamatrix.valid))
149+
}
126150
expect_length(res$sematrix.valid, 9)
127-
expect_length(class(res$sematrix.valid), 2)
128-
expect_true("matrix" %in% class(res$sematrix.valid))
129-
expect_true("array" %in% class(res$sematrix.valid))
151+
if (base::getRversion() < 4.0)
152+
{
153+
expect_length(class(res$sematrix.valid), 1)
154+
expect_true("matrix" %in% class(res$sematrix.valid))
155+
}
156+
else
157+
{
158+
expect_length(class(res$sematrix.valid), 2)
159+
expect_true("matrix" %in% class(res$sematrix.valid))
160+
expect_true("array" %in% class(res$sematrix.valid))
161+
}
130162
expect_length(res$SLMA.pooled.ests.matrix, 18)
131-
expect_length(class(res$SLMA.pooled.ests.matrix), 2)
132-
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
133-
expect_true("array" %in% class(res$SLMA.pooled.ests.matrix))
163+
if (base::getRversion() < 4.0)
164+
{
165+
expect_length(class(res$SLMA.pooled.ests.matrix), 1)
166+
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
167+
}
168+
else
169+
{
170+
expect_length(class(res$SLMA.pooled.ests.matrix), 2)
171+
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
172+
expect_true("array" %in% class(res$SLMA.pooled.ests.matrix))
173+
}
134174
expect_length(res$Convergence.error.message, 3)
135175
expect_equal(class(res$Convergence.error.message), "character")
136176
})
@@ -144,25 +184,65 @@ test_that("check slope formulae - 2", {
144184
expect_length(res$num.valid.studies, 1)
145185
expect_equal(class(res$num.valid.studies), "numeric")
146186
expect_length(res$betamatrix.all, 9)
147-
expect_length(class(res$betamatrix.all), 2)
148-
expect_true("matrix" %in% class(res$betamatrix.all))
149-
expect_true("array" %in% class(res$betamatrix.all))
187+
if (base::getRversion() < 4.0)
188+
{
189+
expect_length(class(res$betamatrix.all), 1)
190+
expect_true("matrix" %in% class(res$betamatrix.all))
191+
}
192+
else
193+
{
194+
expect_length(class(res$betamatrix.all), 2)
195+
expect_true("matrix" %in% class(res$betamatrix.all))
196+
expect_true("array" %in% class(res$betamatrix.all))
197+
}
150198
expect_length(res$sematrix.all, 9)
151-
expect_length(class(res$sematrix.all), 2)
152-
expect_true("matrix" %in% class(res$sematrix.all))
153-
expect_true("array" %in% class(res$sematrix.all))
199+
if (base::getRversion() < 4.0)
200+
{
201+
expect_length(class(res$sematrix.all), 1)
202+
expect_true("matrix" %in% class(res$sematrix.all))
203+
}
204+
else
205+
{
206+
expect_length(class(res$sematrix.all), 2)
207+
expect_true("matrix" %in% class(res$sematrix.all))
208+
expect_true("array" %in% class(res$sematrix.all))
209+
}
154210
expect_length(res$betamatrix.valid, 9)
155-
expect_length(class(res$betamatrix.valid), 2)
156-
expect_true("matrix" %in% class(res$betamatrix.valid))
157-
expect_true("array" %in% class(res$betamatrix.valid))
211+
if (base::getRversion() < 4.0)
212+
{
213+
expect_length(class(res$betamatrix.valid), 1)
214+
expect_true("matrix" %in% class(res$betamatrix.valid))
215+
}
216+
else
217+
{
218+
expect_length(class(res$betamatrix.valid), 2)
219+
expect_true("matrix" %in% class(res$betamatrix.valid))
220+
expect_true("array" %in% class(res$betamatrix.valid))
221+
}
158222
expect_length(res$sematrix.valid, 9)
159-
expect_length(class(res$sematrix.valid), 2)
160-
expect_true("matrix" %in% class(res$sematrix.valid))
161-
expect_true("array" %in% class(res$sematrix.valid))
223+
if (base::getRversion() < 4.0)
224+
{
225+
expect_length(class(res$sematrix.valid), 1)
226+
expect_true("matrix" %in% class(res$sematrix.valid))
227+
}
228+
else
229+
{
230+
expect_length(class(res$sematrix.valid), 2)
231+
expect_true("matrix" %in% class(res$sematrix.valid))
232+
expect_true("array" %in% class(res$sematrix.valid))
233+
}
162234
expect_length(res$SLMA.pooled.ests.matrix, 18)
163-
expect_length(class(res$SLMA.pooled.ests.matrix), 2)
164-
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
165-
expect_true("array" %in% class(res$SLMA.pooled.ests.matrix))
235+
if (base::getRversion() < 4.0)
236+
{
237+
expect_length(class(res$SLMA.pooled.ests.matrix), 1)
238+
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
239+
}
240+
else
241+
{
242+
expect_length(class(res$SLMA.pooled.ests.matrix), 2)
243+
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
244+
expect_true("array" %in% class(res$SLMA.pooled.ests.matrix))
245+
}
166246
expect_length(res$Convergence.error.message, 3)
167247
expect_equal(class(res$Convergence.error.message), "character")
168248
})

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

Lines changed: 110 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -112,25 +112,65 @@ 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-
expect_length(class(res$betamatrix.all), 2)
116-
expect_true("matrix" %in% class(res$betamatrix.all))
117-
expect_true("array" %in% class(res$betamatrix.all))
115+
if (base::getRversion() < 4.0)
116+
{
117+
expect_length(class(res$betamatrix.all), 1)
118+
expect_true("matrix" %in% class(res$betamatrix.all))
119+
}
120+
else
121+
{
122+
expect_length(class(res$betamatrix.all), 2)
123+
expect_true("matrix" %in% class(res$betamatrix.all))
124+
expect_true("array" %in% class(res$betamatrix.all))
125+
}
118126
expect_length(res$sematrix.all, 9)
119-
expect_length(class(res$sematrix.all), 2)
120-
expect_true("matrix" %in% class(res$sematrix.all))
121-
expect_true("array" %in% class(res$sematrix.all))
127+
if (base::getRversion() < 4.0)
128+
{
129+
expect_length(class(res$sematrix.all), 1)
130+
expect_true("matrix" %in% class(res$sematrix.all))
131+
}
132+
else
133+
{
134+
expect_length(class(res$sematrix.all), 2)
135+
expect_true("matrix" %in% class(res$sematrix.all))
136+
expect_true("array" %in% class(res$sematrix.all))
137+
}
122138
expect_length(res$betamatrix.valid, 9)
123-
expect_length(class(res$betamatrix.valid), 2)
124-
expect_true("matrix" %in% class(res$betamatrix.valid))
125-
expect_true("array" %in% class(res$betamatrix.valid))
139+
if (base::getRversion() < 4.0)
140+
{
141+
expect_length(class(res$betamatrix.valid), 1)
142+
expect_true("matrix" %in% class(res$betamatrix.valid))
143+
}
144+
else
145+
{
146+
expect_length(class(res$betamatrix.valid), 2)
147+
expect_true("matrix" %in% class(res$betamatrix.valid))
148+
expect_true("array" %in% class(res$betamatrix.valid))
149+
}
126150
expect_length(res$sematrix.valid, 9)
127-
expect_length(class(res$sematrix.valid), 2)
128-
expect_true("matrix" %in% class(res$sematrix.valid))
129-
expect_true("array" %in% class(res$sematrix.valid))
151+
if (base::getRversion() < 4.0)
152+
{
153+
expect_length(class(res$sematrix.valid), 1)
154+
expect_true("matrix" %in% class(res$sematrix.valid))
155+
}
156+
else
157+
{
158+
expect_length(class(res$sematrix.valid), 2)
159+
expect_true("matrix" %in% class(res$sematrix.valid))
160+
expect_true("array" %in% class(res$sematrix.valid))
161+
}
130162
expect_length(res$SLMA.pooled.ests.matrix, 18)
131-
expect_length(class(res$SLMA.pooled.ests.matrix), 2)
132-
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
133-
expect_true("array" %in% class(res$SLMA.pooled.ests.matrix))
163+
if (base::getRversion() < 4.0)
164+
{
165+
expect_length(class(res$SLMA.pooled.ests.matrix), 1)
166+
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
167+
}
168+
else
169+
{
170+
expect_length(class(res$SLMA.pooled.ests.matrix), 2)
171+
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
172+
expect_true("array" %in% class(res$SLMA.pooled.ests.matrix))
173+
}
134174
expect_length(res$Convergence.error.message, 3)
135175
expect_equal(class(res$Convergence.error.message), "character")
136176
})
@@ -144,25 +184,65 @@ test_that("check slope formulae", {
144184
expect_length(res$num.valid.studies, 1)
145185
expect_equal(class(res$num.valid.studies), "numeric")
146186
expect_length(res$betamatrix.all, 9)
147-
expect_length(class(res$betamatrix.all), 2)
148-
expect_true("matrix" %in% class(res$betamatrix.all))
149-
expect_true("array" %in% class(res$betamatrix.all))
187+
if (base::getRversion() < 4.0)
188+
{
189+
expect_length(class(res$betamatrix.all), 1)
190+
expect_true("matrix" %in% class(res$betamatrix.all))
191+
}
192+
else
193+
{
194+
expect_length(class(res$betamatrix.all), 2)
195+
expect_true("matrix" %in% class(res$betamatrix.all))
196+
expect_true("array" %in% class(res$betamatrix.all))
197+
}
150198
expect_length(res$sematrix.all, 9)
151-
expect_length(class(res$sematrix.all), 2)
152-
expect_true("matrix" %in% class(res$sematrix.all))
153-
expect_true("array" %in% class(res$sematrix.all))
199+
if (base::getRversion() < 4.0)
200+
{
201+
expect_length(class(res$sematrix.all), 1)
202+
expect_true("matrix" %in% class(res$sematrix.all))
203+
}
204+
else
205+
{
206+
expect_length(class(res$sematrix.all), 2)
207+
expect_true("matrix" %in% class(res$sematrix.all))
208+
expect_true("array" %in% class(res$sematrix.all))
209+
}
154210
expect_length(res$betamatrix.valid, 9)
155-
expect_length(class(res$betamatrix.valid), 2)
156-
expect_true("matrix" %in% class(res$betamatrix.valid))
157-
expect_true("array" %in% class(res$betamatrix.valid))
211+
if (base::getRversion() < 4.0)
212+
{
213+
expect_length(class(res$betamatrix.valid), 1)
214+
expect_true("matrix" %in% class(res$betamatrix.valid))
215+
}
216+
else
217+
{
218+
expect_length(class(res$betamatrix.valid), 2)
219+
expect_true("matrix" %in% class(res$betamatrix.valid))
220+
expect_true("array" %in% class(res$betamatrix.valid))
221+
}
158222
expect_length(res$sematrix.valid, 9)
159-
expect_length(class(res$sematrix.valid), 2)
160-
expect_true("matrix" %in% class(res$sematrix.valid))
161-
expect_true("array" %in% class(res$sematrix.valid))
223+
if (base::getRversion() < 4.0)
224+
{
225+
expect_length(class(res$sematrix.valid), 1)
226+
expect_true("matrix" %in% class(res$sematrix.valid))
227+
}
228+
else
229+
{
230+
expect_length(class(res$sematrix.valid), 2)
231+
expect_true("matrix" %in% class(res$sematrix.valid))
232+
expect_true("array" %in% class(res$sematrix.valid))
233+
}
162234
expect_length(res$SLMA.pooled.ests.matrix, 18)
163-
expect_length(class(res$SLMA.pooled.ests.matrix), 2)
164-
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
165-
expect_true("array" %in% class(res$SLMA.pooled.ests.matrix))
235+
if (base::getRversion() < 4.0)
236+
{
237+
expect_length(class(res$SLMA.pooled.ests.matrix), 1)
238+
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
239+
}
240+
else
241+
{
242+
expect_length(class(res$SLMA.pooled.ests.matrix), 2)
243+
expect_true("matrix" %in% class(res$SLMA.pooled.ests.matrix))
244+
expect_true("array" %in% class(res$SLMA.pooled.ests.matrix))
245+
}
166246
expect_length(res$Convergence.error.message, 3)
167247
expect_equal(class(res$Convergence.error.message), "character")
168248
})

0 commit comments

Comments
 (0)