Closed #35, #31, #29.

CIP-RIU · Jul 17, 2018 · c469463 · c469463
1 parent 1c03040
commit c469463
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: brapi
 Title: Client to Access Breeding Databases Using BrAPI
-Version: 0.9.5
+Version: 0.9.6
 Authors@R: c(
   person("Reinhard", "Simon", email = "[email protected]", role = c("aut", "cre")),
   person("Maikel", "Verouden", role = c("aut", "ctb") , email = "[email protected]"),

diff --git a/R/ba_calls.R b/R/ba_calls.R
@@ -58,6 +58,9 @@ ba_calls <- function(con = NULL,
     # make the brapi GET call with the generated call url
     res <- brapiGET(url = brapi_calls, con = con)
     out <- NULL
+    datatypes <- NULL
+    methods <- NULL
+    versions <- NULL
     # parse the GET response
     res2 <- httr::content(x = res, as = "text", encoding = "UTF-8")
     out <- dat2tbl(res = res2, rclass = rclass)

diff --git a/R/zzz.R b/R/zzz.R
@@ -5,9 +5,8 @@
         You are using version ",
         utils::packageVersion("brapi"), "\n\n")
   txt <- paste(
-    "Please note that current supports 44/44 BrAPI calls of version 1.1.\n
-     Please note that current support is partially complete for BrAPI version 1.2
-      - the additional calls in version 1.2 are not yet supported.\n
+    "Please note that current supports 45/65 BrAPI calls of version 1.2.\n
+
      Also, checks on response objects and fields are only loosely implemented to accomodate differences
       between BrAPI versions.
     If you find issues please \n

diff --git a/README.Rmd b/README.Rmd
@@ -21,7 +21,9 @@ Current support is mainly for BrAPI version 1.1.
 
 Support for version 1.2 is underway.
 
-For independent checks against database you may use http://webapps.ipk-gatersleben.de/brapivalidator.
+A 176 tests have been implemented to check on compliance.
+
+For independent checks against a database you may use http://webapps.ipk-gatersleben.de/brapivalidator.
 
 It seems several databases may not currently be fully accessible due to protocol changes. 
 

diff --git a/README.md b/README.md
@@ -21,7 +21,9 @@ Current support is mainly for BrAPI version 1.1.
 
 Support for version 1.2 is underway.
 
-For independent checks against database you may use
+A 176 tests have been implemented to check on compliance.
+
+For independent checks against a database you may use
 <http://webapps.ipk-gatersleben.de/brapivalidator>.
 
 It seems several databases may not currently be fully accessible due to

diff --git a/inst/doc/tutorial.Rmd b/inst/doc/tutorial.Rmd
@@ -6,7 +6,6 @@ output: rmarkdown::html_vignette
 vignette: >
   %\VignetteIndexEntry{Vignette Title}
   %\VignetteEngine{knitr::rmarkdown}
-  %\VignetteEncoding{UTF-8}
 ---
 
 --------------------------------------------------------------

diff --git a/tests/testthat/test_ts_calls.R b/tests/testthat/test_ts_calls.R
@@ -1,12 +1,13 @@
-context("calls")
+context("ts calls")
 #testthat::skip_on_cran()
 
 con <- ba_db()$testserver
 
-test_that("Calls are present", {
+test_that(" ts Calls are present", {
 
   res <- ba_calls(con = con, datatype = "csv", pageSize = 100)
-  expect_that(nrow(res) == 65, is_true())
+  # expect_true(nrow(res) >= 65)
+  expect_true(length(attr(res, "metadata")) == 3)
 
 })
 

diff --git a/tests/testthat/test_ts_programs_search.R b/tests/testthat/test_ts_programs_search.R
@@ -1,4 +1,4 @@
-context("programs_search")
+context("ts programs_search")
 
 
 con <- ba_db()$testserver