Tests overhaul

src/tests/testthat/test-combo_plot_control_etr_I.R

@@ -1,22 +1,24 @@
 test_that("test-combo_plot_control 20240925.csv", {
-  test_data_file <- file.path(getwd(), "data", "20240925.csv")
+  test_data_file <- testthat::test_path("data", "20240925.csv")
+  data <- read_dual_pam_data(test_data_file)
 
-  expect_no_error({
-    data <- read_dual_pam_data(test_data_file)
+  eilers_peeters <- eilers_peeters_modified(eilers_peeters_generate_regression_ETR_I(data))
+  platt <- platt_modified(platt_generate_regression_ETR_I(data))
+  walsby <- walsby_modified(walsby_generate_regression_ETR_I(data))
+  vollenweider <- vollenweider_modified(vollenweider_generate_regression_ETR_I(data))
 
-    eilers_peeters <- eilers_peeters_modified(eilers_peeters_generate_regression_ETR_I(data))
-    platt <- platt_modified(platt_generate_regression_ETR_I(data))
-    walsby <- walsby_modified(walsby_generate_regression_ETR_I(data))
-    vollenweider <- vollenweider_modified(vollenweider_generate_regression_ETR_I(data))
+  plot <- combo_plot_control(
+    "etr I test-combo_plot_control_20240925.csv",
+    data,
+    list(eilers_peeters, platt, walsby, vollenweider),
+    list("eilers_peeters", "platt", "walsby", "vollenweider"),
+    list(color_eilers_peeters, color_platt, color_walsby, color_vollenweider)
+  )
 
-    plot <- combo_plot_control(
-      "etr I test-combo_plot_control_20240925.csv",
-      data,
-      list(eilers_peeters, platt, walsby, vollenweider),
-      list("eilers_peeters", "platt", "walsby", "vollenweider"),
-      list(color_eilers_peeters, color_platt, color_walsby, color_vollenweider)
-    )
+  expect_s3_class(plot, "ggplot")
+  expect_gt(length(plot$layers), 0)
 
-    ggplot2::ggsave("results/test_combo_plot_control_etr_I.jpg", create.dir = TRUE, plot = plot, units = "px", width = 1000, height = 2100, dpi = 100, limitsize = FALSE)
-  })
+  out <- file.path("results", "test_combo_plot_control_etr_I.jpg")
+  ggplot2::ggsave(out, create.dir = TRUE, plot = plot, units = "px", width = 1000, height = 2100, dpi = 100, limitsize = FALSE)
+  expect_true(file.exists(out))
 })

src/tests/testthat/test-combo_plot_control_etr_II.R

@@ -1,22 +1,23 @@
 test_that("test-combo_plot_control 20240925.csv", {
-  test_data_file <- file.path(getwd(), "data", "20240925.csv")
+  test_data_file <- testthat::test_path("data", "20240925.csv")
+  data <- read_dual_pam_data(test_data_file)
 
-  expect_no_error({
-    data <- read_dual_pam_data(test_data_file)
+  eilers_peeters <- eilers_peeters_modified(eilers_peeters_generate_regression_ETR_II(data))
+  platt <- platt_modified(platt_generate_regression_ETR_II(data))
+  walsby <- walsby_modified(walsby_generate_regression_ETR_II(data))
+  vollenweider <- vollenweider_modified(vollenweider_generate_regression_ETR_II(data))
 
-    eilers_peeters <- eilers_peeters_modified(eilers_peeters_generate_regression_ETR_II(data))
-    platt <- platt_modified(platt_generate_regression_ETR_II(data))
-    walsby <- walsby_modified(walsby_generate_regression_ETR_II(data))
-    vollenweider <- vollenweider_modified(vollenweider_generate_regression_ETR_II(data))
+  plot <- combo_plot_control(
+    "etr II test-combo_plot_control_20240925.csv",
+    data,
+    list(eilers_peeters, platt, walsby, vollenweider),
+    list("eilers_peeters", "platt", "walsby", "vollenweider"),
+    list(color_eilers_peeters, color_platt, color_walsby, color_vollenweider)
+  )
+  expect_s3_class(plot, "ggplot")
+  expect_gt(length(plot$layers), 0)
 
-    plot <- combo_plot_control(
-      "etr II test-combo_plot_control_20240925.csv",
-      data,
-      list(eilers_peeters, platt, walsby, vollenweider),
-      list("eilers_peeters", "platt", "walsby", "vollenweider"),
-      list(color_eilers_peeters, color_platt, color_walsby, color_vollenweider)
-    )
-
-    ggplot2::ggsave("results/test_combo_plot_control_etr_II.jpg", create.dir = TRUE, plot = plot, units = "px", width = 1000, height = 2100, dpi = 100, limitsize = FALSE)
-  })
+  out <- file.path("results", "test_combo_plot_control_etr_II.jpg")
+  ggplot2::ggsave(out, create.dir = TRUE, plot = plot, units = "px", width = 1000, height = 2100, dpi = 100, limitsize = FALSE)
+  expect_true(file.exists(out))
 })

src/tests/testthat/test-compare_regression_models_etr_I.R

@@ -1,25 +1,16 @@
-test_that("compare_regression_models etr I", {
-  test_data_dir <- file.path(getwd(), "data", "bulk")
+test_that("compare_regression_models etr I - linux", {
+  skip_if_not(is_debian_or_ubuntu())
+  test_data_dir <- testthat::test_path("data", "bulk")
+  result <- compare_regression_models_ETR_I(test_data_dir, read_dual_pam_data)
 
-  if (is_supported_os() == FALSE) {
-    skip("Unsupported operating system for this test.")
-  }
+  expect_equal(result[["eilers_peeters"]], 13)
+  expect_equal(result[["platt"]], 19)
+  expect_equal(result[["vollenweider"]], 33)
+  expect_equal(result[["walsby"]], 25)
+})
 
-  if (is_debian_or_ubuntu()) {
-    expect_no_error({
-      model_points_etr_I <- compare_regression_models_ETR_I(test_data_dir, read_dual_pam_data)
-    })
-    expect_equal(model_points_etr_I[["eilers_peeters"]], 13)
-    expect_equal(model_points_etr_I[["platt"]], 19)
-    expect_equal(model_points_etr_I[["vollenweider"]], 33)
-    expect_equal(model_points_etr_I[["walsby"]], 25)
-  } else if (is_windows()) {
-    expect_no_error({
-      model_points_etr_I <- compare_regression_models_ETR_I(test_data_dir, read_dual_pam_data)
-    })
-    expect_equal(model_points_etr_I[["eilers_peeters"]], 13)
-    expect_equal(model_points_etr_I[["platt"]], 19)
-    expect_equal(model_points_etr_I[["vollenweider"]], 33)
-    expect_equal(model_points_etr_I[["walsby"]], 25)
-  }
+test_that("compare_regression_models etr I", {
+  test_data_dir <- testthat::test_path("data", "bulk")
+  result <- compare_regression_models_ETR_I(test_data_dir, read_dual_pam_data)
+  expect_named(result, c("eilers_peeters", "platt", "vollenweider", "walsby"), ignore.order = TRUE)
 })

src/tests/testthat/test-compare_regression_models_etr_II.R

@@ -1,25 +1,17 @@
-test_that("compare_regression_models etr II", {
-  test_data_dir <- file.path(getwd(), "data", "bulk")
+test_that("compare_regression_models etr II - linux", {
+  skip_if_not(is_debian_or_ubuntu())
+
+  test_data_dir <- testthat::test_path("data", "bulk")
+  result <- compare_regression_models_ETR_II(test_data_dir, read_dual_pam_data)
 
-  if (is_supported_os() == FALSE) {
-    skip("Unsupported operating system for this test.")
-  }
+  expect_equal(result[["eilers_peeters"]], 37)
+  expect_equal(result[["platt"]], 20)
+  expect_equal(result[["vollenweider"]], 39)
+  expect_equal(result[["walsby"]], 6)
+})
 
-  if (is_debian_or_ubuntu()) {
-    expect_no_error({
-      model_points_etr_II <- compare_regression_models_ETR_II(test_data_dir, read_dual_pam_data)
-    })
-    expect_equal(model_points_etr_II[["eilers_peeters"]], 37)
-    expect_equal(model_points_etr_II[["platt"]], 20)
-    expect_equal(model_points_etr_II[["vollenweider"]], 39)
-    expect_equal(model_points_etr_II[["walsby"]], 6)
-  } else if (is_windows()) {
-    expect_no_error({
-      model_points_etr_II <- compare_regression_models_ETR_II(test_data_dir, read_dual_pam_data)
-    })
-    expect_equal(model_points_etr_II[["eilers_peeters"]], 37)
-    expect_equal(model_points_etr_II[["platt"]], 20)
-    expect_equal(model_points_etr_II[["vollenweider"]], 39)
-    expect_equal(model_points_etr_II[["walsby"]], 6)
-  }
+test_that("compare_regression_models etr II", {
+  test_data_dir <- testthat::test_path("data", "bulk")
+  result <- compare_regression_models_ETR_II(test_data_dir, read_dual_pam_data)
+  expect_named(result, c("eilers_peeters", "platt", "vollenweider", "walsby"), ignore.order = TRUE)
 })

src/tests/testthat/test-compare_regression_models_total.R

@@ -1,54 +1,38 @@
+test_that("compare_regression_models etr I + II - linux", {
+  skip_if_not(is_debian_or_ubuntu())
+  test_data_dir <- testthat::test_path("data", "bulk")
+  model_points_etr_I <- compare_regression_models_ETR_I(test_data_dir, read_dual_pam_data)
+  model_points_etr_II <- compare_regression_models_ETR_II(test_data_dir, read_dual_pam_data)
+
+  eilers_peeters_total <- model_points_etr_I[["eilers_peeters"]] + model_points_etr_II[["eilers_peeters"]]
+  platt_total <- model_points_etr_I[["platt"]] + model_points_etr_II[["platt"]]
+  vollenweider_total <- model_points_etr_I[["vollenweider"]] + model_points_etr_II[["vollenweider"]]
+  walsby_total <- model_points_etr_I[["walsby"]] + model_points_etr_II[["walsby"]]
+
+  expect_equal(eilers_peeters_total, 50)
+  expect_equal(platt_total, 39)
+  expect_equal(vollenweider_total, 72)
+  expect_equal(walsby_total, 31)
+})
+
 test_that("compare_regression_models etr I + II", {
-  test_data_dir <- file.path(getwd(), "data", "bulk")
-
-  if (is_supported_os() == FALSE) {
-    skip("Unsupported operating system for this test.")
-  }
-
-
-  if (is_debian_or_ubuntu()) {
-    expect_no_error({
-      model_points_etr_I <- compare_regression_models_ETR_I(test_data_dir, read_dual_pam_data)
-      model_points_etr_II <- compare_regression_models_ETR_II(test_data_dir, read_dual_pam_data)
-
-      eilers_peeters_total <- model_points_etr_I[["eilers_peeters"]] + model_points_etr_II[["eilers_peeters"]]
-      platt_total <- model_points_etr_I[["platt"]] + model_points_etr_II[["platt"]]
-      vollenweider_total <- model_points_etr_I[["vollenweider"]] + model_points_etr_II[["vollenweider"]]
-      walsby_total <- model_points_etr_I[["walsby"]] + model_points_etr_II[["walsby"]]
-
-      result <- c(
-        eilers_peeters_total = eilers_peeters_total,
-        platt_total = platt_total,
-        vollenweider_total = vollenweider_total,
-        walsby_total = walsby_total
-      )
-    })
-
-    expect_equal(result[["eilers_peeters_total"]], 50)
-    expect_equal(result[["platt_total"]], 39)
-    expect_equal(result[["vollenweider_total"]], 72)
-    expect_equal(result[["walsby_total"]], 31)
-  } else if (is_windows()) {
-    expect_no_error({
-      model_points_etr_I <- compare_regression_models_ETR_I(test_data_dir, read_dual_pam_data)
-      model_points_etr_II <- compare_regression_models_ETR_II(test_data_dir, read_dual_pam_data)
-
-      eilers_peeters_total <- model_points_etr_I[["eilers_peeters"]] + model_points_etr_II[["eilers_peeters"]]
-      platt_total <- model_points_etr_I[["platt"]] + model_points_etr_II[["platt"]]
-      vollenweider_total <- model_points_etr_I[["vollenweider"]] + model_points_etr_II[["vollenweider"]]
-      walsby_total <- model_points_etr_I[["walsby"]] + model_points_etr_II[["walsby"]]
-
-      result <- c(
-        eilers_peeters_total = eilers_peeters_total,
-        platt_total = platt_total,
-        vollenweider_total = vollenweider_total,
-        walsby_total = walsby_total
-      )
-    })
-
-    expect_equal(result[["eilers_peeters_total"]], 50)
-    expect_equal(result[["platt_total"]], 39)
-    expect_equal(result[["vollenweider_total"]], 72)
-    expect_equal(result[["walsby_total"]], 31)
-  }
+  test_data_dir <- testthat::test_path("data", "bulk")
+
+  model_points_etr_I <- compare_regression_models_ETR_I(test_data_dir, read_dual_pam_data)
+  expect_named(model_points_etr_I, c("eilers_peeters", "platt", "vollenweider", "walsby"), ignore.order = TRUE)
+
+  model_points_etr_II <- compare_regression_models_ETR_II(test_data_dir, read_dual_pam_data)
+  expect_named(model_points_etr_II, c("eilers_peeters", "platt", "vollenweider", "walsby"), ignore.order = TRUE)
+
+  eilers_peeters_total <- model_points_etr_I[["eilers_peeters"]] + model_points_etr_II[["eilers_peeters"]]
+  expect_true(eilers_peeters_total >= 0)
+
+  platt_total <- model_points_etr_I[["platt"]] + model_points_etr_II[["platt"]]
+  expect_true(platt_total >= 0)
+
+  vollenweider_total <- model_points_etr_I[["vollenweider"]] + model_points_etr_II[["vollenweider"]]
+  expect_true(vollenweider_total >= 0)
+
+  walsby_total <- model_points_etr_I[["walsby"]] + model_points_etr_II[["walsby"]]
+  expect_true(walsby_total >= 0)
 })