Merge branch 'datashield:v6.3.6-dev' into v6.3.6-dev

Author: StuartWheater

tests/testthat/test-smk-ds.elspline.R

@@ -56,7 +56,7 @@ test_that("elspline", {
     expect_equal(res.mod$errorMessage[3], "No errors")
     expect_equal(res.mod$nsubs, 7477)
     expect_equal(res.mod$iter, 3)
-    expect_true("family" %in% class(res.mod$family))
+    expect_true("character" %in% class(res.mod$family))
     expect_equal(res.mod$formula, "D$LAB_TRIG ~ elsplineDS")
     expect_true("matrix" %in% class(res.mod$coefficients))
     expect_true("array" %in% class(res.mod$coefficients))
@@ -106,7 +106,7 @@ test_that("elspline", {
     expect_equal(res.mod$errorMessage[3], "No errors")
     expect_equal(res.mod$nsubs, 7477)
     expect_equal(res.mod$iter, 3)
-    expect_true("family" %in% class(res.mod$family))
+    expect_true("character" %in% class(res.mod$family))
     expect_equal(res.mod$formula, "D$LAB_TRIG ~ elsplineDS2")
     expect_true("matrix" %in% class(res.mod$coefficients))
     expect_true("array" %in% class(res.mod$coefficients))

tests/testthat/test-smk-ds.glm-binomial.R

@@ -43,7 +43,7 @@ test_that("glm_binomial", {
     expect_equal(res$errorMessage[3], "No errors")
     expect_equal(res$nsubs, 7485)
     expect_equal(res$iter, 9)
-    expect_true("family" %in% class(res$family))
+    expect_true("character" %in% class(res$family))
     expect_equal(res$formula, "D$DIS_DIAB ~ D$GENDER * D$PM_BMI_CONTINUOUS + D$LAB_HDL")
     expect_true("matrix" %in% class(res$coefficients))
     expect_equal(res$dev, 1036.031, tolerance=0.00001)
@@ -69,7 +69,7 @@ test_that("glm_binomial, with check", {
     expect_equal(res$errorMessage[3], "No errors")
     expect_equal(res$nsubs, 7485)
     expect_equal(res$iter, 9)
-    expect_true("family" %in% class(res$family))
+    expect_true("character" %in% class(res$family))
     expect_equal(res$formula, "D$DIS_DIAB ~ D$GENDER * D$PM_BMI_CONTINUOUS + D$LAB_HDL")
     expect_true("matrix" %in% class(res$coefficients))
     expect_equal(res$dev, 1036.031, tolerance=0.00001)

tests/testthat/test-smk-ds.glm-gaussian.R

@@ -43,7 +43,7 @@ test_that("glm_gaussian", {
     expect_equal(res$errorMessage[3], "No errors")
     expect_equal(res$nsubs, 7800)
     expect_equal(res$iter, 3)
-    expect_true("family" %in% class(res$family))
+    expect_true("character" %in% class(res$family))
     expect_equal(res$formula, "D$LAB_TSC ~ D$LAB_TRIG")
     expect_true("matrix" %in% class(res$coefficients))
     expect_equal(res$dev, 8936.32, tolerance=0.00001)
@@ -69,7 +69,7 @@ test_that("glm_gaussian, with check", {
     expect_equal(res$errorMessage[3], "No errors")
     expect_equal(res$nsubs, 7800)
     expect_equal(res$iter, 3)
-    expect_true("family" %in% class(res$family))
+    expect_true("character" %in% class(res$family))
     expect_equal(res$formula, "D$LAB_TSC ~ D$LAB_TRIG")
     expect_true("matrix" %in% class(res$coefficients))
     expect_equal(res$dev, 8936.32, tolerance=0.00001)

tests/testthat/test-smk-ds.glm-poisson.R

@@ -43,7 +43,7 @@ test_that("glm_gaussian", {
     expect_equal(res$errorMessage[3], "No errors")
     expect_equal(res$nsubs, 6299)
     expect_equal(res$iter, 5)
-    expect_true("family" %in% class(res$family))
+    expect_true("character" %in% class(res$family))
     expect_equal(res$formula, "D$survtime ~ 1 + D$time.id + D$female")
     expect_true("matrix" %in% class(res$coefficients))
     expect_equal(res$dev, 3522.598, tolerance=0.00001)
@@ -69,7 +69,7 @@ test_that("glm_gaussian, which check", {
     expect_equal(res$errorMessage[3], "No errors")
     expect_equal(res$nsubs, 6299)
     expect_equal(res$iter, 5)
-    expect_true("family" %in% class(res$family))
+    expect_true("character" %in% class(res$family))
     expect_equal(res$formula, "D$survtime ~ 1 + D$time.id + D$female")
     expect_true("matrix" %in% class(res$coefficients))
     expect_equal(res$dev, 3522.598, tolerance=0.00001)

tests/testthat/test-smk-ds.lspline.R

@@ -56,7 +56,7 @@ test_that("lspline", {
     expect_equal(res.mod$errorMessage[3], "No errors")
     expect_equal(res.mod$nsubs, 7477)
     expect_equal(res.mod$iter, 3)
-    expect_true("family" %in% class(res.mod$family))
+    expect_true("character" %in% class(res.mod$family))
     expect_equal(res.mod$formula, "D$LAB_TRIG ~ lsplineDS")
     expect_true("matrix" %in% class(res.mod$coefficients))
     expect_true("array" %in% class(res.mod$coefficients))

tests/testthat/test-smk-ds.ns.R

@@ -60,7 +60,7 @@ test_that("ns", {
     expect_equal(res.mod$errorMessage[3], "No errors")
     expect_equal(res.mod$nsubs, 7477)
     expect_equal(res.mod$iter, 3)
-    expect_true("family" %in% class(res.mod$family))
+    expect_true("character" %in% class(res.mod$family))
     expect_equal(res.mod$formula, "D$LAB_TRIG ~ nsDS")
     expect_true("matrix" %in% class(res.mod$coefficients))
     expect_true("array" %in% class(res.mod$coefficients))

tests/testthat/test-smk-ds.qlspline.R

@@ -56,7 +56,7 @@ test_that("qlspline", {
     expect_equal(res.mod$errorMessage[3], "No errors")
     expect_equal(res.mod$nsubs, 7477)
     expect_equal(res.mod$iter, 3)
-    expect_true("family" %in% class(res.mod$family))
+    expect_true("character" %in% class(res.mod$family))
     expect_equal(res.mod$formula, "D$LAB_TRIG ~ qlsplineDS")
     expect_true("matrix" %in% class(res.mod$coefficients))
     expect_true("array" %in% class(res.mod$coefficients))
@@ -108,7 +108,7 @@ test_that("qlspline", {
     expect_equal(res.mod$errorMessage[3], "No errors")
     expect_equal(res.mod$nsubs, 7477)
     expect_equal(res.mod$iter, 3)
-    expect_true("family" %in% class(res.mod$family))
+    expect_true("character" %in% class(res.mod$family))
     expect_equal(res.mod$formula, "D$LAB_TRIG ~ qlsplineDS2")
     expect_true("matrix" %in% class(res.mod$coefficients))
     expect_true("array" %in% class(res.mod$coefficients))