Recreate testthat (#71)

* added unit testing back to the package

* CRAN did not like the other license file, had to create a separate file for github repo

* finish unit testing for load_maindata

* Update .gitignore

.Rbuildignore

@@ -7,4 +7,5 @@
 ^_pkgdown\.yml$
 ^docs$
 ^pkgdown$
-^\.github$
+^\.github$
+LICENSE.md

.gitignore

@@ -7,4 +7,5 @@ inst/doc
 .Ruserdata
 /doc/
 /Meta/
-_site
+_site
+LICENSE

DESCRIPTION

@@ -96,7 +96,7 @@ Suggests:
     R.matlab,
     readODS,
     rmarkdown,
-    testthat
+    testthat (>= 3.0.0)
 VignetteBuilder: 
     knitr
 BuildVignettes: yes
@@ -105,3 +105,4 @@ devtools: :use_data(MainDataTable)
 Encoding: UTF-8
 RoxygenNote: 7.2.3
 LazyData: true
+Config/testthat/edition: 3

LICENSE

@@ -1,27 +1,2 @@
-# License
-
-This project is work of the [United States government](https://www.usa.gov/) by US federal employees in the Department of Commerce as part of their official duties. Software code created by U.S. Government employees is not subject to copyright in the United States (17 U.S.C. §105). The United States/Department of Commerce reserves all rights to seek and obtain copyright protection in countries other than the United States for Software authored in its entirety by the Department of Commerce. To this end, the Department of Commerce hereby grants to Recipient a royalty-free, nonexclusive license to use, copy, and create derivative works of the Software outside of the United States.
-
-Additionally, we waive copyright and related rights in the work worldwide through the MIT License.
-
-## MIT License
-
-Copyright (c) 2024 NWFSC FRAM
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+YEAR: 2024
+COPYRIGHT HOLDER: NWFSC FRAM

LICENSE.md

@@ -0,0 +1,27 @@
+# License
+
+This project is work of the [United States government](https://www.usa.gov/) by US federal employees in the Department of Commerce as part of their official duties. Software code created by U.S. Government employees is not subject to copyright in the United States (17 U.S.C. §105). The United States/Department of Commerce reserves all rights to seek and obtain copyright protection in countries other than the United States for Software authored in its entirety by the Department of Commerce. To this end, the Department of Commerce hereby grants to Recipient a royalty-free, nonexclusive license to use, copy, and create derivative works of the Software outside of the United States.
+
+Additionally, we waive copyright and related rights in the work worldwide through the MIT License.
+
+## MIT License
+
+Copyright (c) 2024 NWFSC FRAM
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

R/data_parser.R

@@ -555,15 +555,6 @@ load_maindata <- function(dat, project, over_write = FALSE, compare = FALSE, y =
     pass <- FALSE
   }
 
-  # TODO: remove or change these checks, not comprehensive
-  # if (any(grepl("area|zone", names(dataset), ignore.case = TRUE)) == FALSE & 
-  #     (any(grepl("lat", names(dataset), ignore.case = TRUE)) == FALSE |
-  #      any(grepl("lon", names(dataset), ignore.case = TRUE)) ==  FALSE)) {
-  #   
-  #   warning("Neither Latitude/Longitude or Area/Zone variables are included. Data will not be saved.")
-  #   pass <- FALSE
-  # }
-
   if (pass == FALSE) { 
 
     warning('Dataset not saved. Check that column names are case-insensitive ',

tests/testthat.R

@@ -0,0 +1,12 @@
+# This file is part of the standard setup for testthat.
+# It is recommended that you do not modify it.
+#
+# Where should you do additional test configuration?
+# Learn more about the roles of various files in:
+# * https://r-pkgs.org/testing-design.html#sec-tests-files-overview
+# * https://testthat.r-lib.org/articles/special-files.html
+
+library(testthat)
+library(FishSET)
+
+test_check("FishSET")

tests/testthat/test-data_parser.R

@@ -0,0 +1,10 @@
+# Testing functions in data_parser.R
+
+# Test load_maindata
+test_that("Test loading main data works", {
+  # Note: unable to test successful upload due to the use of rstudioapi package
+  # Make sure project names that violate rules throw errors
+  expect_error(load_maindata(dat = FishSET::scallop, over_write = TRUE, project = "test load"))
+  expect_error(load_maindata(dat = FishSET::scallop, over_write = TRUE, project = ""))
+  expect_error(load_maindata(dat = cbind(FishSET::scallop, FishSET::scallop), over_write = TRUE, project = "testload"))
+})