Skip to content

Commit 84be8a6

Browse files
Merge pull request #247 from StuartWheater/v6.1-dev
Added missing functions
2 parents a85fa0b + 61c58e1 commit 84be8a6

3 files changed

Lines changed: 17 additions & 11 deletions

File tree

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ jobs:
335335
junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml");
336336
progress_rep <- ProgressReporter$new(max_failures = 999999);
337337
multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
338-
testthat::test_package("$(projectName)", filter = "smk_dgr-|math_dgr-",reporter = multi_rep, stop_on_failure = FALSE)
338+
testthat::test_package("$(projectName)", filter = "smk_dgr-",reporter = multi_rep, stop_on_failure = FALSE)
339339
'"'"'
340340
)
341341
);
@@ -353,8 +353,8 @@ jobs:
353353
write.csv(
354354
coverage_to_list(
355355
c(dsbase.res, dsdanger.res)
356-
"coveragelist.csv"
357-
)
356+
),
357+
"coveragelist.csv"
358358
)'
359359
360360
# display the test console output

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ test_that("check results", {
5656
"ds.exists",
5757
"ds.exp",
5858
"ds.glm",
59+
"ds.glmerSLMA",
60+
"ds.glmPredict",
5961
"ds.glmSLMA",
62+
"ds.glmSummary",
6063
"ds.heatmapPlot",
6164
"ds.histogram",
6265
"ds.isNA",
@@ -70,6 +73,7 @@ test_that("check results", {
7073
"ds.listDisclosureSettings",
7174
"ds.listOpals",
7275
"ds.listServersideFunctions",
76+
"ds.lmerSLMA",
7377
"ds.log",
7478
"ds.look",
7579
"ds.ls",
@@ -102,6 +106,7 @@ test_that("check results", {
102106
"ds.rowColCalc",
103107
"ds.rPois",
104108
"ds.rUnif",
109+
"ds.sample",
105110
"ds.scatterPlot",
106111
"ds.seq",
107112
"ds.setDefaultOpals",

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,25 @@ test_that("check results", {
2424
"BooleDS", "as.character", "as.null", "as.numeric", "asCharacterDS", "asDataMatrixDS",
2525
"asFactorDS", "asFactorDS2", "asIntegerDS", "asListDS", "asLogicalDS", "asMatrixDS",
2626
"asMatrixDS", "asNumericDS", "attach", "c", "cDS", "cbind",
27-
"cbindDS", "changeRefGroupDS", "completeCasesDS", "complete.cases", "dataFrameDS", "dataFrameSortDS", "dataFrameSubsetDS2",
28-
"dataFrameDS", "exp", "lexisDS2", "lexisDS3", "list",
29-
"listDS", "log", "matrixDS", "matrixDetDS2", "matrixDiagDS", "matrixDimnamesDS", "matrixInvertDS",
27+
"cbindDS", "changeRefGroupDS", "completeCasesDS", "complete.cases", "dataFrameDS", "dataFrameFillDS", "dataFrameSortDS",
28+
"dataFrameSubsetDS2", "dataFrameDS", "exp", "glmPredictDS.as", "glmSLMADS.assign", "glmSummaryDS.as",
29+
"lexisDS2", "lexisDS3", "list", "listDS", "log",
30+
"matrixDS", "matrixDetDS2", "matrixDiagDS", "matrixDimnamesDS", "matrixInvertDS",
3031
"matrixMultDS", "matrixTransposeDS", "mergeDS", "rBinomDS", "rNormDS", "rPoisDS",
3132
"rUnifDS", "rbindDS", "reShapeDS", "recodeLevelsDS", "recodeValuesDS2", "repDS", "rep",
32-
"replaceNaDS", "rowColCalcDS", "seedDS", "seqDS", "subsetByClassDS", "subsetDS", "sum",
33+
"replaceNaDS", "rowColCalcDS", "seedDS", "seqDS", "subsetByClassDS", "subsetDS", "sum", "sampleDS",
3334
"tableDS.assign", "tapplyDS.assign", "unlist", "unListDS"
3435
))
3536
aggregate.functions <- factor(c(
3637
"NROW", "asFactorDS1", "asListDS",
37-
"checkNegValueDS", "classDS", "colnamesDS", "corTestDS",
38+
"checkNegValueDS", "classDS", "colnamesDS", "corDS", "corTestDS",
3839
"covDS", "dataFrameSubsetDS1",
3940
"densityGridDS", "dimDS",
4041
"exists", "glmDS1", "glmDS1", "glmDS2",
41-
"glmDS2", "glmSLMADS2", "histogramDS1", "is.character",
42-
"is.factor", "is.list", "is.null", "is.numeric",
42+
"glmDS2", "glmerSLMADS2", "glmPredictDS.ag", "glmSLMADS1", "glmSLMADS2", "glmSummaryDS.ag",
43+
"heatmapPlotDS", "histogramDS1", "histogramDS2", "is.character", "is.factor", "is.list", "is.null", "is.numeric",
4344
"isNaDS", "isValidDS", "kurtosisDS1", "kurtosisDS2", "lengthDS",
44-
"levelsDS", "lexisDS1", "listDisclosureSettingsDS",
45+
"levelsDS", "lexisDS1", "listDisclosureSettingsDS", "lmerSLMADS2", "lsDS",
4546
"matrixDetDS1", "meanDS", "meanSdGpDS", "messageDS",
4647
"namesDS", "numNaDS", "quantileMeanDS", "rangeDS",
4748
"recodeValuesDS1", "rmDS", "skewnessDS1", "skewnessDS2", "scatterPlotDS",

0 commit comments

Comments
 (0)