Merge pull request #98 from rOpenGov/development

Development

.travis.yml

@@ -1,6 +1,9 @@
 # Native R Travis Github
 
 language: r
+r:
+  - release
+  - devel
 sudo: required
 
 # Be strict when checking our package

R/oin.R

@@ -31,7 +31,8 @@ as.oin <- function(oin){
         !is.na(as.numeric(substr(oin,1,6))) & 
         grepl(pattern = "-", substr(oin,7,7)) &
         !is.na(as.numeric(substr(oin,8,11))) &
-        as.numeric(substr(oin,3,3)) >= 2
+        as.numeric(substr(oin,3,3)) >= 2 &
+        nchar(oin) == 11
   )
   newoin <- oin
   newoin[!correct] <- NA

tests/testthat/test-as.pin.R

@@ -63,8 +63,8 @@ test_that(desc="error expected",{
   expect_warning(as.pin("196418233234"))
   expect_warning(as.pin("196408333234"))
 
-  test_pin <- c("196408233234", tomorrow_pin, "AA6408323234", "19640823323", "1964083332349", "196408333234", "19640823-334")
-  test_pin_res <- c(TRUE, rep(FALSE, 6))
+  test_pin <- c("196408233234", tomorrow_pin, "AA6408323234", "19640823323", "1964083332349", "196408333234", "19640823-334", "19640823")
+  test_pin_res <- c(TRUE, rep(FALSE, 7))
   suppressWarnings(expect_equal(!is.na(as.pin(test_pin)), test_pin_res))
 
   non_relevant_class <- lm(1:10~rep(1:5,2))

tests/testthat/test-oin_ctrl.R

@@ -27,3 +27,14 @@ test_that(desc="Expect that NA don't cause error",{
   expect_that(oin_ctrl(num_to_check), not(throws_error()))
 })
 
+test_that(desc="Expect wrong input lenght",{
+  test_oin <- c("556000-4615", "556000-461", "556000-46", "556000-4", "556000-", "556000","556000-46155")
+  test_oin_res <- rep(NA, 7)
+  test_oin_res[1] <- TRUE
+  test_oin_res_logi <- rep(FALSE, 7)
+  test_oin_res_logi[1] <- TRUE
+
+  expect_equal(oin_ctrl(oin = test_oin), expected = test_oin_res)
+  expect_is(oin_ctrl(oin = test_oin, force_logical=TRUE), "logical")
+  expect_equal(oin_ctrl(oin = test_oin, force_logical=TRUE), expected = test_oin_res_logi)
+})