Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add input validation for setter and read functions #231

Merged
merged 10 commits into from
Jan 18, 2023
68 changes: 68 additions & 0 deletions tests/test-misc.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
## Copyright 2017 by Felix Prasse <prassefe@fim.uni-passau.de>
## Copyright 2017-2018 by Claus Hunsen <hunsen@fim.uni-passau.de>
## Copyright 2017-2018 by Thomas Bock <bockthom@fim.uni-passau.de>
## Copyright 2023 by Maximilian Löffler <s8maloef@stud.uni-saarland.de>
bockthom marked this conversation as resolved.
Show resolved Hide resolved
## All Rights Reserved.


Expand Down Expand Up @@ -107,6 +108,73 @@ test_that("Match argument or take default.", {
expect_equal(actual.result, expected.result, info = "Multiple choices with ignored default, two choices")
})

##
## Check presence and datatype of column.
bockthom marked this conversation as resolved.
Show resolved Hide resolved
##

test_that("Check presence and datatype of column.", {

user.names = c("John", "Peter", "Maria", "Susanne")

## contains NaN to verify functionality does not break
age = c(42, 50, NaN, 66)

## contains NA to verify functionality does not break
is.male = c(TRUE, TRUE, FALSE, NA)

## construct simple testing dataframe
data.frame = data.frame(user.names, age, is.male)

## 1) Check base functionality (benign use-case)
expect_no_error(verify.data.frame.columns(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change this to expect_error(..., NA, message(...)).
The expect_no_error function is a new feature from testthat but is still experimental. So for now we want to stay at the "old" version. Also please put a comment behind the check with Expect no error.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't know about this, I will do the replacement 😇

data.frame, c("user.names", "age", "is.male"), c("character", "numeric", "logical")),
message = "All columns present and well-typed.")

## 2) Base test with reordered columns
expect_no_error(verify.data.frame.columns(
data.frame, c("is.male", "age", "user.names"), c("logical", "numeric", "character")),
message = "Order of columns does not matter.")

## 3) Specify less columns than present (Allow optional columns)
expect_no_error(verify.data.frame.columns(
data.frame, c("user.names", "age"), c("character", "numeric")),
message = "Optional columns are allowed.")

## 4) Unequal amount of column names and datatypes
expect_error(verify.data.frame.columns(
data.frame, c("user.names", "age", "is.male"), c("character", "numeric")),
message = "More coloumn names specified than datatypes.")
expect_error(verify.data.frame.columns(
data.frame, c("user.names", "age"), c("character", "numeric", "logical")),
message = "More coloumn names specified than datatypes.")

## 5) Datatypes do not match column names
expect_error(verify.data.frame.columns(
data.frame, c("user.names", "age", "is.male"), c("logical", "character", "numeric")),
message = "Column names do not match datatypes.")

## 6) Invalid column / Column not present in dataframe (Typo)
expect_error(verify.data.frame.columns(
data.frame, c("user.name"), c("character")),
message = "Column names do not match datatypes.")
bockthom marked this conversation as resolved.
Show resolved Hide resolved

## 7) No datatypes specified and column names are present
expect_no_error(verify.data.frame.columns(
data.frame, c("user.names", "age", "is.male")),
message = "Column names do not match datatypes.")

## 8) No datatypes specified but column names are not present (Typo)
expect_error(verify.data.frame.columns(
data.frame, c("user.name")),
message = "Column names do not match datatypes.")

## 9) To many column names and no datatypes specified
bockthom marked this conversation as resolved.
Show resolved Hide resolved
expect_error(verify.data.frame.columns(
data.frame, c("user.names", "age", "is.male", "job.orientation")),
message = "Column names do not match datatypes.")

})

## / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
## Date handling -----------------------------------------------------------

Expand Down
5 changes: 3 additions & 2 deletions tests/test-read.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
## Copyright 2021 by Johannes Hostert <s8johost@stud.uni-saarland.de>
## Copyright 2021 by Mirabdulla Yusifli <s8miyusi@stud.uni-saarland.de>
## Copyright 2022 by Jonathan Baumann <joba00002@stud.uni-saarland.de>
## Copyright 2023 by Maximilian Löffler <s8maloef@stud.uni-saarland.de>
## All Rights Reserved.


Expand Down Expand Up @@ -129,7 +130,7 @@ test_that("Read the raw commit data with the file artifact.", {
artifact = c("test.c", "test.c", "test2.c", "test3.c", UNTRACKED.FILE, UNTRACKED.FILE, "test2.c"),
artifact.type = c("File", "File", "File", "File", UNTRACKED.FILE.EMPTY.ARTIFACT.TYPE,
UNTRACKED.FILE.EMPTY.ARTIFACT.TYPE, "File"),
artifact.diff.size = c(1, 1, 1, 1, 0, 0, 1))
artifact.diff.size = as.integer(c(1, 1, 1, 1, 0, 0, 1)))

## check the results
expect_identical(commit.data.read, commit.data.expected, info = "Raw commit data.")
Expand Down Expand Up @@ -243,7 +244,7 @@ test_that("Read the author data.", {

## build the expected data.frame
author.data.expected = data.frame(
author.id = as.integer(c(4936, 4937, 4938, 4939, 4940, 4941, 4942, 4943, 4944)),
author.id = as.character(c(4936, 4937, 4938, 4939, 4940, 4941, 4942, 4943, 4944)),
author.name = c("Thomas", "Olaf", "Björn", "udo", "Fritz fritz@example.org", "georg", "Hans", "Karl", "Max"),
author.email = c("thomas@example.org", "olaf@example.org", "bjoern@example.org", "udo@example.org",
"asd@sample.org", "heinz@example.org", "hans1@example.org", "karl@example.org", "max@example.org"),
Expand Down
30 changes: 30 additions & 0 deletions util-data.R
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
## Copyright 2021 by Johannes Hostert <s8johost@stud.uni-saarland.de>
## Copyright 2021 by Mirabdulla Yusifli <s8miyusi@stud.uni-saarland.de>
## Copyright 2022 by Jonathan Baumann <joba00002@stud.uni-saarland.de>
## Copyright 2023 by Maximilian Löffler <s8maloef@stud.uni-saarland.de>
## All Rights Reserved.


Expand Down Expand Up @@ -1064,6 +1065,9 @@ ProjectData = R6::R6Class("ProjectData",

if (is.null(commit.data)) {
commit.data = create.empty.commits.list()
} else {
## check that dataframe is of correct shape
verify.data.frame.columns(commit.data, COMMITS.LIST.COLUMNS, COMMITS.LIST.DATA.TYPES)
}

## store commit data
Expand Down Expand Up @@ -1145,6 +1149,9 @@ ProjectData = R6::R6Class("ProjectData",

if (is.null(data)) {
data = create.empty.commit.message.list()
} else {
## check that dataframe is of correct shape
verify.data.frame.columns(data, COMMIT.MESSAGE.LIST.COLUMNS, COMMIT.MESSAGE.LIST.DATA.TYPES)
}

## set the actual data
Expand Down Expand Up @@ -1214,6 +1221,9 @@ ProjectData = R6::R6Class("ProjectData",

if (is.null(data)) {
data = create.empty.synchronicity.list()
} else {
## check that dataframe is of correct shape
verify.data.frame.columns(data, SYNCHRONICITY.LIST.COLUMNS, SYNCHRONICITY.LIST.DATA.TYPES)
}

## set the actual data
Expand Down Expand Up @@ -1287,6 +1297,9 @@ ProjectData = R6::R6Class("ProjectData",

if (is.null(data)) {
data = create.empty.pasta.list()
} else {
## check that dataframe is of correct shape
verify.data.frame.columns(data, PASTA.LIST.COLUMNS, PASTA.LIST.DATA.TYPES)
}

## set the actual data
Expand Down Expand Up @@ -1368,6 +1381,9 @@ ProjectData = R6::R6Class("ProjectData",

if (is.null(data)) {
data = create.empty.gender.list()
} else {
## check that dataframe is of correct shape
verify.data.frame.columns(data, GENDER.LIST.COLUMNS, GENDER.LIST.DATA.TYPES)
}

## set the actual data
Expand Down Expand Up @@ -1444,6 +1460,9 @@ ProjectData = R6::R6Class("ProjectData",

if (is.null(mail.data)) {
mail.data = create.empty.mails.list()
} else {
## check that dataframe is of correct shape
verify.data.frame.columns(mail.data, MAILS.LIST.COLUMNS, MAILS.LIST.DATA.TYPES)
}

## store mail data
Expand Down Expand Up @@ -1502,6 +1521,14 @@ ProjectData = R6::R6Class("ProjectData",
set.authors = function(data) {
logging::loginfo("Setting author data.")
private$authors = data

if (is.null(data)) {
data = create.empty.authors.list()
} else {
## check that dataframe is of correct shape
verify.data.frame.columns(data, AUTHORS.LIST.COLUMNS, AUTHORS.LIST.DATA.TYPES)
}

## add gender data if wanted
if (private$project.conf$get.value("gender")) {

Expand Down Expand Up @@ -1606,6 +1633,9 @@ ProjectData = R6::R6Class("ProjectData",

if (is.null(data)) {
data = create.empty.issues.list()
} else {
## check that dataframe is of correct shape
verify.data.frame.columns(data, ISSUES.LIST.COLUMNS, ISSUES.LIST.DATA.TYPES)
}

private$issues.unfiltered = data
Expand Down
71 changes: 71 additions & 0 deletions util-misc.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
## Copyright 2018-2019 by Jakob Kronawitter <kronawij@fim.uni-passau.de>
## Copyright 2021 by Niklas Schneider <s8nlschn@stud.uni-saarland.de>
## Copyright 2022 by Jonathan Baumann <joba00002@stud.uni-saarland.de>
## Copyright 2023 by Maximilian Löffler <s8maloef@stud.uni-saarland.de>
## All Rights Reserved.


Expand Down Expand Up @@ -139,6 +140,76 @@ match.arg.or.default = function(arg, choices, default = NULL, several.ok = FALSE
}
}

#' Check if a dataframe matches a given structure. This includes the dataframe to contain columns
#' which must match the column names in \code{columns} and the datatypes in \code{data.types}
bockthom marked this conversation as resolved.
Show resolved Hide resolved
#'
#' @param data the dataframe under investigation for structural conformity
#' @param columns a character vector containing the column names the data frame should include
#' @param data.types an ordered vector containing the data types corresponding to the columns.
#' This vector must be of same length of the vector of \code{columns}
#' [default: NULL]
bockthom marked this conversation as resolved.
Show resolved Hide resolved
verify.data.frame.columns = function(data, columns, data.types = NULL) {

## every column of the data frame must be one to one mapped to a datatype expected in the column
## therefore if there aren't as many datatypes provided in \code{data.types} as column names have
## been provided in \code{columns} we can stop here already.
if (!is.null(data.types) && length(columns) != length(data.types)) {
error.message = sprintf("If specified, the length of the two given vectors columns and data.types must match.")
bockthom marked this conversation as resolved.
Show resolved Hide resolved
logging::logerror(error.message)
stop(error.message)
}

## obtain vector of all column names included in the dataframe to ease further checks.
data.frame.columns = colnames(data)

## iterate over all columns in \code{columns}
for (i in seq_along(columns)) {

## obtain the column.
column = columns[i]

## stop verification process early if column is not present in the dataframe.
if (!(column %in% data.frame.columns)) {
error.message = sprintf("Column '%s' is missing from the dataframe", column)
logging::logerror(error.message)
stop(error.message)
}

if (!is.null(data.types)) {

## obtain the datatype that should be present in the dataframe column c
## which is currently under investigation.
bockthom marked this conversation as resolved.
Show resolved Hide resolved
expected.type = data.types[i]

## necessary case distinction for special case list where calling \code{base::class}
## removes information about the listing property
bockthom marked this conversation as resolved.
Show resolved Hide resolved
if (expected.type == "list()") {

## column is not a list
if (!is.list(data[[column]])) {
error.message = sprintf("Column '%s' is expected to be a list but it '%s'",
bockthom marked this conversation as resolved.
Show resolved Hide resolved
column, class(received.type))
logging::logerror(error.message)
stop(error.message)
}

} else {
## obtain the datatype that elements of the current column hold in the dataframe.
received.type = class(data[[column]])

## stop verification process early if column type in the dataframe is not matching
## the expected datatype.
if (!(expected.type %in% received.type)) {
error.message = sprintf("Column '%s' has type '%s' in dataframe, expected '%s'",
column, received.type, expected.type)
logging::logerror(error.message)
stop(error.message)
}
}
}
}
}


## / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
## Empty dataframe creation-------------------------------------------------
Expand Down
Loading