Intergation (#41)

Making it compatible with testthat 2.0.0 Minor bug fix Better onLoad
ELToulemonde · May 11, 2018 · 49ea9e5 · 49ea9e5
1 parent ad45172
commit 49ea9e5
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: dataPreparation
 Title: Automated Data Preparation
-Version: 0.3.5
+Version: 0.3.6
 Authors@R: person("Emmanuel-Lin", "Toulemonde", email = "[email protected]", role = c("aut", "cre"))
 Description: Do most of the painful data preparation for a data science project with a minimum amount of code; Take advantages of data.table efficiency and use some algorithmic trick in order to perform data preparation in a time and RAM efficient way.
 Depends:
@@ -17,7 +17,7 @@ Suggests: knitr,
     rmarkdown,
 	kableExtra,
 	pander,
-	testthat
+	testthat (>= 2.0.0)
 VignetteBuilder: knitr
 Imports: data.table
 BugReports: https://github.com/ELToulemonde/dataPreparation/issues
diff --git a/NEWS b/NEWS
@@ -1,3 +1,11 @@
+V 0.3.6
+=======
+- Bug fixes:
+	- *identifyDates* had a weird bug. Solved
+
+- Integration:
+	- Making dataPreparation compatible with testthat 2.0.0
+
 V 0.3.5
 =======
 - New features:

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,11 @@
+V 0.3.6
+=======
+- Bug fixes:
+	- *identifyDates* had a weird bug. Solved
+
+- Integration:
+	- Making dataPreparation compatible with testthat 2.0.0
+
 V 0.3.5
 =======
 - New features:

diff --git a/R/datesManipulations.R b/R/datesManipulations.R
@@ -137,6 +137,7 @@ identifyDates <- function(dataSet, formats = NULL, n_test = 30, ambiguities = "I
 
   ## Initialization
   formats_found <- list()
+  format <- NULL # Initialize format to NULL to avoid considering it by mistake as the function format
   ## Computation
   if (verbose){ 
     pb <- initPB(function_name, names(dataSet))

diff --git a/R/onLoad.R b/R/onLoad.R
@@ -5,7 +5,7 @@
 #' Show the NEWS file of the dataPreparation package.
 #' @export
 dataPrepNews <- function() {
-  newsfile <- file.path(system.file(package="dataPreparation"), "NEWS")
+  newsfile <- system.file("NEWS", package="dataPreparation")
   file.show(newsfile)
 }
 

diff --git a/tests/testthat/test_aggregate.R b/tests/testthat/test_aggregate.R
@@ -1,3 +1,4 @@
+context("test_aggregate.R")
 requireNamespace("data.table")
 verbose <- TRUE
 

diff --git a/tests/testthat/test_datesManipulation.R b/tests/testthat/test_datesManipulation.R
@@ -1,3 +1,4 @@
+context("test_datesManipulation.R")
 requireNamespace("data.table")
 verbose <- TRUE
 Sys.setlocale("LC_TIME", "C")

diff --git a/tests/testthat/test_description.R b/tests/testthat/test_description.R
@@ -1,3 +1,4 @@
+context("test_description.R")
 requireNamespace("data.table")
 verbose <- TRUE
 ## Load data set

diff --git a/tests/testthat/test_discretization.R b/tests/testthat/test_discretization.R
@@ -1,3 +1,4 @@
+context("test_discretization.R")
 verbose = TRUE
 ## build_bins
 # ---------------

diff --git a/tests/testthat/test_factorManipulation.R b/tests/testthat/test_factorManipulation.R
@@ -1,3 +1,4 @@
+context("test_factorManipulations.R")
 requireNamespace("data.table")
 verbose <- TRUE
 ## unFactor

diff --git a/tests/testthat/test_fastFunctions.R b/tests/testthat/test_fastFunctions.R
@@ -1,3 +1,4 @@
+context("test_fastFunctions.R")
 requireNamespace("data.table")
 verbose <- TRUE
 ## fastFilterVariables

diff --git a/tests/testthat/test_generateFromCharacter.R b/tests/testthat/test_generateFromCharacter.R
@@ -1,3 +1,4 @@
+context("test_generateFromCharacter.R")
 requireNamespace("data.table")
 verbose <- TRUE
 ## generateFromCharacter

diff --git a/tests/testthat/test_generateFromDate.R b/tests/testthat/test_generateFromDate.R
@@ -1,3 +1,4 @@
+context("test_generateFromDate.R")
 requireNamespace("data.table")
 Sys.setlocale("LC_TIME", "C")
 verbose <- TRUE

diff --git a/tests/testthat/test_generateFromFactor.R b/tests/testthat/test_generateFromFactor.R
@@ -1,3 +1,4 @@
+context("test_generateFromFactor.R")
 requireNamespace("data.table")
 verbose <- TRUE
 ## generateFromFactor

diff --git a/tests/testthat/test_genericFunctions.R b/tests/testthat/test_genericFunctions.R
@@ -1,3 +1,4 @@
+context("test_genericFunctions.R")
 requireNamespace("data.table")
 verbose <- TRUE
 Sys.setlocale("LC_TIME", "C")

diff --git a/tests/testthat/test_numericsManipulations.R b/tests/testthat/test_numericsManipulations.R
@@ -1,3 +1,4 @@
+context("test_numericsManipulations.R")
 requireNamespace("data.table")
 verbose <- TRUE
 

diff --git a/tests/testthat/test_onLoad.R b/tests/testthat/test_onLoad.R
@@ -1,3 +1,4 @@
+context("test_onLoad.R")
 requireNamespace("data.table")
 verbose <- TRUE
 

diff --git a/tests/testthat/test_prepareSet.R b/tests/testthat/test_prepareSet.R
@@ -1,3 +1,4 @@
+context("test_prepareSet.RR")
 verbose <- TRUE
 
 ## prepareSet

diff --git a/tests/testthat/test_sameShape.R b/tests/testthat/test_sameShape.R
@@ -1,3 +1,4 @@
+context("test_sameShape.R")
 requireNamespace("data.table")
 verbose <- TRUE
 

diff --git a/tests/testthat/test_scale.R b/tests/testthat/test_scale.R
@@ -1,3 +1,4 @@
+context("test_scale.R")
 requireNamespace("data.table")
 verbose <- TRUE
 ## build_scales

diff --git a/tests/testthat/test_setColAs.R b/tests/testthat/test_setColAs.R
@@ -1,3 +1,4 @@
+context("test_setColAs.R")
 requireNamespace("data.table")
 verbose <- TRUE
 ## setColAsNumeric

diff --git a/tests/testthat/test_shapeSet.R b/tests/testthat/test_shapeSet.R
@@ -2,6 +2,7 @@
 #--------------------------------
 # http://r-pkgs.had.co.nz/tests.html
 # http://stat545.com/packages05_foofactors-package-02.html
+context("test_shapeSet.R")
 verbose <- TRUE
 ## prepareSet
 #----------------

diff --git a/tests/testthat/test_whichFunctions.R b/tests/testthat/test_whichFunctions.R
@@ -1,3 +1,4 @@
+context("test_whichFunctions.R")
 requireNamespace("data.table")
 verbose <- TRUE