Skip to content

Commit 9160862

Browse files
StuartWheaterStuartWheater
committed
Updates for context() + copyright
1 parent 816fc5d commit 9160862

303 files changed

Lines changed: 1648 additions & 1228 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/setup.R‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
#-------------------------------------------------------------------------------
22
# Copyright (c) 2019-2022 University of Newcastle upon Tyne. All rights reserved.
3-
# Copyright (c) 2022 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
3+
# Copyright (c) 2022-2025 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
44
#
55
# This program and the accompanying materials
66
# are made available under the terms of the GNU Public License v3.0.
77
#
88
# You should have received a copy of the GNU General Public License
99
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1010
#-------------------------------------------------------------------------------
11+
1112
#
1213
# Datashield test suite set up
1314
#
1415

15-
context("setup - start")
16+
# context("setup - start")
1617

1718
# Convert 'warnings' to 'errors'
1819
# options(warn = 2)
@@ -33,4 +34,4 @@ source("connection_to_datasets/init_studies_datasets.R")
3334
source("connection_to_datasets/init_discordant_datasets.R")
3435
source("connection_to_datasets/init_mediation_datasets.R")
3536

36-
context("setup - done")
37+
# 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")
12+
# context("teardown")
1213

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

‎tests/testthat/test-_-vm-test.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,7 +13,7 @@
1213
# Set up
1314
#
1415

15-
context("vm-test::_::setup")
16+
# context("vm-test::_::setup")
1617

1718
init.testing.datasets()
1819

@@ -21,7 +22,7 @@ init.testing.datasets()
2122
#
2223

2324
#connect to a server
24-
context("vm-test::_::tests::vm")
25+
# context("vm-test::_::tests::vm")
2526

2627
test_that("The virtual machine is loaded. ",
2728
{
@@ -33,11 +34,11 @@ test_that("The virtual machine is loaded. ",
3334
# Shutdown
3435
#
3536

36-
context("vm-test::_::shutdown")
37+
# context("vm-test::_::shutdown")
3738

3839
#
3940
# Done
4041
#
4142

42-
context("vm-test::_::done")
43+
# context("vm-test::_::done")
4344

‎tests/testthat/test-arg-ds.Boole.R‎

Lines changed: 2 additions & 1 deletion
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.
@@ -18,7 +19,7 @@ connect.studies.dataset.cnsim(list("LAB_TSC", "LAB_TRIG"))
1819
# Tests
1920
#
2021

21-
context("ds.Boole::arg::test errors")
22+
# context("ds.Boole::arg::test errors")
2223
test_that("Boole_erros", {
2324
expect_error(ds.Boole(), "Please provide the name of the column or scalar that holds V1!", fixed=TRUE)
2425
expect_error(ds.Boole(V1="D$LAB_TSC"), "Please provide the name of a column or scalar holding V2 or declare a scalar in character format: eg '3'", fixed=TRUE)

‎tests/testthat/test-arg-ds.asCharacter.R‎

Lines changed: 2 additions & 1 deletion
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.
@@ -18,7 +19,7 @@ connect.discordant.dataset.simple(list("A", "B", "C"))
1819
# Tests
1920
#
2021

21-
context("ds.asCharacter::arg::test errors")
22+
# context("ds.asCharacter::arg::test errors")
2223
test_that("asCharacter_erros", {
2324
expect_error(ds.asCharacter(), "Please provide the name of the input vector!", fixed=TRUE)
2425
})

‎tests/testthat/test-arg-ds.asDataMatrix.R‎

Lines changed: 2 additions & 1 deletion
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.
@@ -18,7 +19,7 @@ connect.studies.dataset.cnsim(list("LAB_TSC"))
1819
# Tests
1920
#
2021

21-
context("ds.asDataMatrix::arg::test errors")
22+
# context("ds.asDataMatrix::arg::test errors")
2223
test_that("asDataMatrix_erros", {
2324
expect_error(ds.asDataMatrix(), "Please provide the name of the input vector!", fixed=TRUE)
2425
})

‎tests/testthat/test-arg-ds.asFactor.R‎

Lines changed: 2 additions & 1 deletion
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.
@@ -18,7 +19,7 @@ connect.studies.dataset.cnsim(list("LAB_TSC"))
1819
# Tests
1920
#
2021

21-
context("ds.asFactor::arg::test errors")
22+
# context("ds.asFactor::arg::test errors")
2223
test_that("asFactor_erros", {
2324
expect_error(ds.asFactor(), "Please provide the name of the variable that is to be converted to a factor e.g. 'varname'", fixed=TRUE)
2425
expect_error(ds.asFactor(input.var.name=1), "Please provide the name of the variable that is to be converted to a factor in character format e.g. 'varname'", fixed=TRUE)

‎tests/testthat/test-arg-ds.asInteger.R‎

Lines changed: 2 additions & 1 deletion
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.
@@ -18,7 +19,7 @@ connect.studies.dataset.cnsim(list("LAB_TSC"))
1819
# Tests
1920
#
2021

21-
context("ds.asInteger::arg::test errors")
22+
# context("ds.asInteger::arg::test errors")
2223
test_that("asInteger_erros", {
2324
expect_error(ds.asInteger(), "Please provide the name of the input vector!", fixed=TRUE)
2425
})

‎tests/testthat/test-arg-ds.asList.R‎

Lines changed: 2 additions & 1 deletion
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.
@@ -18,7 +19,7 @@ connect.studies.dataset.cnsim(list("LAB_TSC"))
1819
# Tests
1920
#
2021

21-
context("ds.asList::arg::test errors")
22+
# context("ds.asList::arg::test errors")
2223
test_that("asList_erros", {
2324
expect_error(ds.asList(), "Please provide the name of the input vector!", fixed=TRUE)
2425
})

‎tests/testthat/test-arg-ds.asLogical.R‎

Lines changed: 2 additions & 1 deletion
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.
@@ -18,7 +19,7 @@ connect.studies.dataset.cnsim(list("LAB_TSC"))
1819
# Tests
1920
#
2021

21-
context("ds.asLogical::arg::test errors")
22+
# context("ds.asLogical::arg::test errors")
2223
test_that("asLogical_erros", {
2324
expect_error(ds.asLogical(), "Please provide the name of the input vector!", fixed=TRUE)
2425
})

0 commit comments

Comments
 (0)