Skip to content

Commit 3edd081

Browse files
StuartWheaterStuartWheater
authored
Merge pull request #69 from datashield/v6.3.6-dev
Updates to v6.4.0 from v6.3.6 - 20260610
2 parents 10d90fd + 99d23a5 commit 3edd081

7 files changed

Lines changed: 115 additions & 106 deletions

File tree

‎tests/testthat/connection_to_datasets/init_discordant_datasets.R‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ init.discordant.dataset.simple <- function(variables)
55
if (ds.test_env$driver == "OpalDriver")
66
{
77
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
8-
builder$append(server = "discordant1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "DISCORDANT.DISCORDANT_STUDY1", options=ds.test_env$options_1)
9-
builder$append(server = "discordant2", url = ds.test_env$ip_address_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "DISCORDANT.DISCORDANT_STUDY2", options=ds.test_env$options_2)
10-
builder$append(server = "discordant3", url = ds.test_env$ip_address_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "DISCORDANT.DISCORDANT_STUDY3", options=ds.test_env$options_3)
8+
builder$append(server = "discordant1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "DISCORDANT.DISCORDANT_STUDY1", options=ds.test_env$options_1)
9+
builder$append(server = "discordant2", url = ds.test_env$server_url_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "DISCORDANT.DISCORDANT_STUDY2", options=ds.test_env$options_2)
10+
builder$append(server = "discordant3", url = ds.test_env$server_url_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "DISCORDANT.DISCORDANT_STUDY3", options=ds.test_env$options_3)
1111
ds.test_env$login.data <- builder$build()
1212
}
1313
else if (ds.test_env$driver == "ArmadilloDriver")
1414
{
1515
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
16-
builder$append(server = "discordant1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "datashield/discordant/DISCORDANT_STUDY1", driver = "ArmadilloDriver")
17-
builder$append(server = "discordant2", url = ds.test_env$ip_address_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "datashield/discordant/DISCORDANT_STUDY2", driver = "ArmadilloDriver")
18-
builder$append(server = "discordant3", url = ds.test_env$ip_address_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "datashield/discordant/DISCORDANT_STUDY3", driver = "ArmadilloDriver")
16+
builder$append(server = "discordant1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "datashield/discordant/DISCORDANT_STUDY1", driver = "ArmadilloDriver")
17+
builder$append(server = "discordant2", url = ds.test_env$server_url_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "datashield/discordant/DISCORDANT_STUDY2", driver = "ArmadilloDriver")
18+
builder$append(server = "discordant3", url = ds.test_env$server_url_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "datashield/discordant/DISCORDANT_STUDY3", driver = "ArmadilloDriver")
1919
ds.test_env$login.data <- builder$build()
2020
}
2121
else

‎tests/testthat/connection_to_datasets/init_local_settings.R‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
1-
#this file stores some settings for the continuous integration and local testing.
1+
#
2+
# The file "connection_to_datasets/local_settings.csv" (within the directory "tests/testthat") contains, if present,
3+
# values which can be used to affect the behavious of the continuous integration.
4+
#
5+
# The server URL is in a CVS file, being the value of the first column, first row.
6+
#
27

3-
init.ip.address <- function()
8+
init.server.url <- function()
49
{
510
file.name <- init.local.settings()
611
if (file.exists(file.name))
712
{
8-
content <- read.csv(file.name, header = FALSE)
9-
ip.address <- as.character(content[[1]][1])
13+
content <- read.csv(file.name, header = FALSE)
14+
server.url <- as.character(content[[1]][1])
1015
}
1116
else
1217
{
13-
# ip.address <- "127.0.0.1"
14-
ip.address <- "localhost"
18+
# server.url <- "http://127.0.0.1:8080/"
19+
server.url <- "http://localhost:8080/"
1520
}
16-
return (ip.address)
21+
return (server.url)
1722
}
1823

1924

2025

2126
init.local.settings <- function()
2227
{
23-
path <- getwd()
28+
path <- getwd()
2429
sub.folder.name <- "/connection_to_datasets/"
25-
file.name <- "local_settings.csv"
26-
return(paste(path, sub.folder.name,file.name, sep=""))
27-
30+
file.name <- "local_settings.csv"
31+
32+
return(paste(path, sub.folder.name, file.name, sep=""))
2833
}

‎tests/testthat/connection_to_datasets/init_mediation_datasets.R‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ init.mediation.dataset.upb <- function(variables)
55
if (ds.test_env$driver == "OpalDriver")
66
{
77
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
8-
builder$append(server = "study1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.UPBdata1", options=ds.test_env$options_1)
9-
builder$append(server = "study2", url = ds.test_env$ip_address_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "MEDIATION.UPBdata2", options=ds.test_env$options_2)
10-
builder$append(server = "study3", url = ds.test_env$ip_address_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "MEDIATION.UPBdata3", options=ds.test_env$options_3)
8+
builder$append(server = "study1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.UPBdata1", options=ds.test_env$options_1)
9+
builder$append(server = "study2", url = ds.test_env$server_url_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "MEDIATION.UPBdata2", options=ds.test_env$options_2)
10+
builder$append(server = "study3", url = ds.test_env$server_url_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "MEDIATION.UPBdata3", options=ds.test_env$options_3)
1111
ds.test_env$login.data <- builder$build()
1212
}
1313
else
@@ -25,7 +25,7 @@ init.mediation.dataset.student <- function(variables)
2525
if (ds.test_env$driver == "OpalDriver")
2626
{
2727
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
28-
builder$append(server = "study1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.student", options=ds.test_env$options_1)
28+
builder$append(server = "study1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.student", options=ds.test_env$options_1)
2929
ds.test_env$login.data <- builder$build()
3030
}
3131
else
@@ -43,7 +43,7 @@ init.mediation.dataset.framing <- function(variables)
4343
if (ds.test_env$driver == "OpalDriver")
4444
{
4545
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
46-
builder$append(server = "study1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.framing", options=ds.test_env$options_1)
46+
builder$append(server = "study1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.framing", options=ds.test_env$options_1)
4747
ds.test_env$login.data <- builder$build()
4848
}
4949
else
@@ -61,7 +61,7 @@ init.mediation.dataset.vv2015 <- function(variables)
6161
if (ds.test_env$driver == "OpalDriver")
6262
{
6363
builder <- DSI::newDSLoginBuilder(.silent = TRUE)
64-
builder$append(server = "study1", url = ds.test_env$ip_address_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.vv2015", options=ds.test_env$options_1)
64+
builder$append(server = "study1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "MEDIATION.vv2015", options=ds.test_env$options_1)
6565
ds.test_env$login.data <- builder$build()
6666
}
6767
else

0 commit comments

Comments
 (0)