Skip to content

Commit aa9fb8f

Browse files
StuartWheaterStuartWheater
committed
Updates for context() + copyright
1 parent 3563df7 commit aa9fb8f

93 files changed

Lines changed: 583 additions & 500 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎tests/testthat/perf_files/default_perf_profile.csv‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"refer_name","rate","lower_tolerance","upper_tolerance"
2-
"meanDS::perf::numeric::0","2998.9844","0.5","2"
3-
"meanDS::perf::numberAndNA::0","3027.3963","0.5","2"
4-
"varDS::perf::numeric::0","3124.4088","0.5","2"
5-
"varDS::perf::numberAndNA::0","3146.532","0.5","2"
2+
"meanDS::perf::numeric::0","11557.1204746495","0.5","2"
3+
"meanDS::perf::numberAndNA::0","11718.8520447749","0.5","2"
4+
"varDS::perf::numeric::0","12758.5511531009","0.5","2"
5+
"varDS::perf::numberAndNA::0","12545.8819532662","0.5","2"

‎tests/testthat/perf_files/hp-laptop_quay.csv‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"refer_name","rate","lower_tolerance","upper_tolerance"
2-
"meanDS::perf::numeric::0","8874.24924669612","0.5","2"
3-
"meanDS::perf::numberAndNA::0","8946.22935183172","0.5","2"
4-
"varDS::perf::numeric::0","10029.1022487173","0.5","2"
5-
"varDS::perf::numberAndNA::0","10014.7789085673","0.5","2"
2+
"meanDS::perf::numeric::0","11557.1204746495","0.5","2"
3+
"meanDS::perf::numberAndNA::0","11718.8520447749","0.5","2"
4+
"varDS::perf::numeric::0","12758.5511531009","0.5","2"
5+
"varDS::perf::numberAndNA::0","12545.8819532662","0.5","2"

‎tests/testthat/setup.R‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#-------------------------------------------------------------------------------
22
# Copyright (c) 2019-2022 University of Newcastle upon Tyne. All rights reserved.
3+
# Copyright (c) 2022-2025 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
34
#
45
# This program and the accompanying materials
56
# are made available under the terms of the GNU Public License v3.0.
@@ -11,7 +12,7 @@
1112
# Datashield test suite set up
1213
#
1314

14-
context("setup - start")
15+
# context("setup - start")
1516

1617
library(RANN)
1718
library(stringr)
@@ -22,4 +23,4 @@ source("random/set_random_seed_settings.R")
2223

2324
source("perf_tests/perf_rate.R")
2425

25-
context("setup - done")
26+
# context("setup - done")

‎tests/testthat/teardown.R‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#-------------------------------------------------------------------------------
22
# Copyright (c) 2018-2022 University of Newcastle upon Tyne. All rights reserved.
3+
# Copyright (c) 2022-2025 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
34
#
45
# This program and the accompanying materials
56
# are made available under the terms of the GNU Public License v3.0.
@@ -8,6 +9,6 @@
89
# along with this program. If not, see <http://www.gnu.org/licenses/>.
910
#-------------------------------------------------------------------------------
1011

11-
context("teardown - start")
12+
# context("teardown - start")
1213

13-
context("teardown - done")
14+
# context("teardown - done")

‎tests/testthat/test-arg-asIntegerDS.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#-------------------------------------------------------------------------------
2-
# Copyright (c) 2024 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
2+
# Copyright (c) 2024-2025 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
33
#
44
# This program and the accompanying materials
55
# are made available under the terms of the GNU Public License v3.0.
@@ -12,13 +12,13 @@
1212
# Set up
1313
#
1414

15-
context("asIntegerDS::arg::setup")
15+
# context("asIntegerDS::arg::setup")
1616

1717
#
1818
# Tests
1919
#
2020

21-
context("asIntegerDS::arg::direct input numeric")
21+
# context("asIntegerDS::arg::direct input numeric")
2222
test_that("simple asIntegerDS non-input", {
2323
expect_error(asIntegerDS(1.0), "ERROR: x.name must be specified as a character string", fixed = TRUE)
2424
})
@@ -27,6 +27,6 @@ test_that("simple asIntegerDS non-input", {
2727
# Done
2828
#
2929

30-
context("asIntegerDS::arg::shutdown")
30+
# context("asIntegerDS::arg::shutdown")
3131

32-
context("asIntegerDS::arg::done")
32+
# context("asIntegerDS::arg::done")

‎tests/testthat/test-arg-asLogicalDS.R‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#-------------------------------------------------------------------------------
22
# Copyright (c) 2019-2022 University of Newcastle upon Tyne. All rights reserved.
3+
# Copyright (c) 2022-2025 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
34
#
45
# This program and the accompanying materials
56
# are made available under the terms of the GNU Public License v3.0.
@@ -12,25 +13,25 @@
1213
# Set up
1314
#
1415

15-
context("asLogicalDS::arg::setup")
16+
# context("asLogicalDS::arg::setup")
1617

1718
#
1819
# Tests
1920
#
2021

21-
context("asLogicalDS::arg::direct input numeric")
22+
# context("asLogicalDS::arg::direct input numeric")
2223
test_that("simple asLogicalDS non-input", {
2324
expect_error(asLogicalDS(1.0), "ERROR: x.name must be specified as a character string", fixed = TRUE)
2425
})
2526

26-
context("asLogicalDS::arg::input NULL")
27+
# context("asLogicalDS::arg::input NULL")
2728
test_that("simple asLogicalDS NULL", {
2829
input <- NULL
2930

3031
expect_error(asLogicalDS("input"), "ERROR: for ds.asLogical function, x.name must specify an input object of class numeric, integer, character or matrix", fixed = TRUE)
3132
})
3233

33-
context("asLogicalDS::arg::input NA")
34+
# context("asLogicalDS::arg::input NA")
3435
test_that("simple asLogicalDS NA", {
3536
input <- NA
3637

@@ -41,6 +42,6 @@ test_that("simple asLogicalDS NA", {
4142
# Done
4243
#
4344

44-
context("asLogicalDS::arg::shutdown")
45+
# context("asLogicalDS::arg::shutdown")
4546

46-
context("asLogicalDS::arg::done")
47+
# context("asLogicalDS::arg::done")

‎tests/testthat/test-arg-dataFrameFillDS.R‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#-------------------------------------------------------------------------------
22
# Copyright (c) 2019-2022 University of Newcastle upon Tyne. All rights reserved.
3+
# Copyright (c) 2022-2025 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
34
#
45
# This program and the accompanying materials
56
# are made available under the terms of the GNU Public License v3.0.
@@ -12,13 +13,13 @@
1213
# Set up
1314
#
1415

15-
context("dataFrameFillDS::arg::setup")
16+
# context("dataFrameFillDS::arg::setup")
1617

1718
#
1819
# Tests
1920
#
2021

21-
context("dataFrameFillDS::arg")
22+
# context("dataFrameFillDS::arg")
2223
test_that("simple dataFrameFillDS, ascending, numeric", {
2324
df <- data.frame(v1 = c(-2.0, -3.0, 4.0, 2.0, 1.0, 0.0, -1.0, 3.0), v2 = c(0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0))
2425
allNames.transmit <- "v1,v2,v3,v4,v5,v6,v7"
@@ -45,10 +46,10 @@ test_that("simple dataFrameFillDS, ascending, numeric", {
4546
# Shutdown
4647
#
4748

48-
context("dataFrameFillDS::arg::shutdown")
49+
# context("dataFrameFillDS::arg::shutdown")
4950

5051
#
5152
# Done
5253
#
5354

54-
context("dataFrameFillDS::arg::done")
55+
# context("dataFrameFillDS::arg::done")

‎tests/testthat/test-arg-dataFrameSortDS.R‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#-------------------------------------------------------------------------------
22
# Copyright (c) 2019-2022 University of Newcastle upon Tyne. All rights reserved.
3+
# Copyright (c) 2022-2025 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
34
#
45
# This program and the accompanying materials
56
# are made available under the terms of the GNU Public License v3.0.
@@ -12,15 +13,15 @@
1213
# Set up
1314
#
1415

15-
context("dataFrameSortDS::arg::setup")
16+
# context("dataFrameSortDS::arg::setup")
1617

1718
set.standard.disclosure.settings()
1819

1920
#
2021
# Tests
2122
#
2223

23-
context("dataFrameSortDS::arg")
24+
# context("dataFrameSortDS::arg")
2425
test_that("simple dataFrameSortDS, factor error check", {
2526
df <- data.frame(v1 = as.factor(c("a", "b", "c", "d", "b", "e", "f", "f")), v2 = c(0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0))
2627
sort.key.name <- "df$v1"
@@ -34,10 +35,10 @@ test_that("simple dataFrameSortDS, factor error check", {
3435
# Shutdown
3536
#
3637

37-
context("dataFrameSortDS::arg::shutdown")
38+
# context("dataFrameSortDS::arg::shutdown")
3839

3940
#
4041
# Done
4142
#
4243

43-
context("dataFrameSortDS::arg::done")
44+
# context("dataFrameSortDS::arg::done")

‎tests/testthat/test-arg-uniqueDS.R‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#-------------------------------------------------------------------------------
22
# Copyright (c) 2019-2022 University of Newcastle upon Tyne. All rights reserved.
3+
# Copyright (c) 2022-2025 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
34
#
45
# This program and the accompanying materials
56
# are made available under the terms of the GNU Public License v3.0.
@@ -12,29 +13,29 @@
1213
# Set up
1314
#
1415

15-
context("uniqueDS::arg::setup")
16+
# context("uniqueDS::arg::setup")
1617

1718
#
1819
# Tests
1920
#
2021

21-
context("uniqueDS::arg::simple null argument")
22+
# context("uniqueDS::arg::simple null argument")
2223
test_that("simple uniqueDS for NULL", {
2324
expect_error(uniqueDS(NULL), "Variable's name can't be NULL", fixed = TRUE)
2425
})
2526

26-
context("uniqueDS::arg::null value")
27+
# context("uniqueDS::arg::null value")
2728
test_that("simple uniqueDS for NULL", {
2829
input <- NULL
2930
expect_error(uniqueDS("input"), "Variable can't be NULL", fixed = TRUE)
3031
})
3132

32-
context("uniqueDS::arg::not character value")
33+
# context("uniqueDS::arg::not character value")
3334
test_that("simple uniqueDS for NULL", {
3435
expect_error(uniqueDS(17), "Variable's name isn't a single character vector", fixed = TRUE)
3536
})
3637

37-
context("uniqueDS::arg::missing value")
38+
# context("uniqueDS::arg::missing value")
3839
test_that("simple uniqueDS for NULL", {
3940
expect_error(uniqueDS("input"), "object 'input' not found", fixed = TRUE)
4041
})
@@ -43,6 +44,6 @@ test_that("simple uniqueDS for NULL", {
4344
# Done
4445
#
4546

46-
context("uniqueDS::arg::shutdown")
47+
# context("uniqueDS::arg::shutdown")
4748

48-
context("uniqueDS::arg::done")
49+
# context("uniqueDS::arg::done")

‎tests/testthat/test-disc-meanDS.R‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#-------------------------------------------------------------------------------
22
# Copyright (c) 2019-2022 University of Newcastle upon Tyne. All rights reserved.
3+
# Copyright (c) 2022-2025 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
34
#
45
# This program and the accompanying materials
56
# are made available under the terms of the GNU Public License v3.0.
@@ -12,15 +13,15 @@
1213
# Set up
1314
#
1415

15-
context("meanDS::disc::setup")
16+
# context("meanDS::disc::setup")
1617

1718
set.standard.disclosure.settings()
1819

1920
#
2021
# Tests
2122
#
2223

23-
context("meanDS::disc::numeric with below nfilter.tab values")
24+
# context("meanDS::disc::numeric with below nfilter.tab values")
2425
test_that("numeric meanDS, with below nfilter.tab values", {
2526
input <- c(NA, NA, 2.0, NA, 4.0)
2627

@@ -31,6 +32,6 @@ test_that("numeric meanDS, with below nfilter.tab values", {
3132
# Done
3233
#
3334

34-
context("meanDS::disc::shutdown")
35+
# context("meanDS::disc::shutdown")
3536

36-
context("meanDS::disc::done")
37+
# context("meanDS::disc::done")

0 commit comments

Comments
 (0)