From 95b55994c2d4d391c345b0ecffb2c626de71a32b Mon Sep 17 00:00:00 2001
From: bms63 <ben.x.straub@gsk.com>
Date: Tue, 23 Aug 2022 12:44:18 +0000
Subject: [PATCH] Updated is_valid_dtc, fixed test, removed empty test.

---
 R/is.R                         | 18 ++++++++----------
 tests/testthat/test-quo.R      |  4 ----
 tests/testthat/test-warnings.R |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/R/is.R b/R/is.R
index d63e4750..f557f10b 100644
--- a/R/is.R
+++ b/R/is.R
@@ -304,16 +304,14 @@ on_failure(is_order_vars) <- function(call, env) {
 #' @family is
 #'
 is_valid_dtc <- function(arg) {
-  pattern <- paste(
-    "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2}).(\\d{3})$",
-    "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})$",
-    "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2})$",
-    "^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2})$",
-    "^(\\d{4})-(\\d{2})-(\\d{2})$",
-    "^(\\d{4})-(\\d{2})$",
-    "^(\\d{4})$",
-    "^(\\d{4})---(\\d{2})$",
-    sep = "|"
+  twod <- "(\\d{2}|-)"
+  pattern <- paste0(
+    "^(\\d{4}|-)?",
+    "(-", twod, ")?",
+    "(-", twod, ")?",
+    "(T", twod, ")?",
+    "(:", twod, ")?",
+    "(:", twod, "(.(\\d{1,5}))?)?$"
   )
 
   grepl(pattern, arg) | arg == "" | is.na(arg)
diff --git a/tests/testthat/test-quo.R b/tests/testthat/test-quo.R
index 3f56ba7f..88171777 100644
--- a/tests/testthat/test-quo.R
+++ b/tests/testthat/test-quo.R
@@ -13,7 +13,3 @@ test_that("Test 11 : `quo_not_missing` throws and Error if missing argument", {
   }
   expect_error(test_fun()) # missing argument -> throws error
 })
-
-test_that("Test 11 : `quo_not_missing` throws and Error if missing argument", {
- # quo_c test here
-})
diff --git a/tests/testthat/test-warnings.R b/tests/testthat/test-warnings.R
index d548a0c0..d786325c 100644
--- a/tests/testthat/test-warnings.R
+++ b/tests/testthat/test-warnings.R
@@ -23,7 +23,7 @@ test_that("A warning is issued when a variable to be derived already exists in t
 
 test_that("A warning is issued when a vector contain unknown datetime format", {
   expect_warning(
-    warn_if_invalid_dtc(dtc = "2021-04-06T-:30:30")
+    warn_if_invalid_dtc(dtc = "20210406T12:30:30")
   )
 })