Merge pull request #101 from tidyverse/fix-testthat-breaking-change

- Establish compatibility with development version of testthat (#101, @lionel-).
tidyverse · Sep 26, 2021 · ca3f4f5 · ca3f4f5
2 parents d3f4b40 + 037d4ce
commit ca3f4f5
Showing 1 changed file with 30 additions and 14 deletions.
diff --git a/tests/testthat/test-coercion-deprecated.R b/tests/testthat/test-coercion-deprecated.R
@@ -1,24 +1,40 @@
 test_that("coercion in", {
-  expect_identical(expect_deprecated(as.hms(0.5 * 86400)), hms(hours = 12))
-  expect_identical(expect_deprecated(as.hms(-0.25 * 86400)), hms(hours = -6))
-  expect_hms_equal(expect_deprecated(as.hms("12:34:56")), hms(56, 34, 12))
-  expect_hms_equal(
-    expect_deprecated(as.hms(strptime("12:34:56", format = "%H:%M:%S", tz = "UTC"), tz = "UTC")),
-    hms(56, 34, 12)
+  expect_deprecated(
+    expect_identical(as.hms(0.5 * 86400), hms(hours = 12))
   )
-  expect_hms_equal(
-    expect_deprecated(as.hms(strptime("12:34:56", format = "%H:%M:%S", tz = "CEST"), tz = "CEST")),
-    hms(56, 34, 12)
+  expect_deprecated(
+    expect_identical(as.hms(-0.25 * 86400), hms(hours = -6))
   )
-  expect_hms_equal(
-    expect_deprecated(as.hms(strptime("12:34:56", format = "%H:%M:%S", tz = "PST8PDT"), tz = "PST8PDT")),
-    hms(56, 34, 12)
+  expect_deprecated(
+    expect_hms_equal(as.hms("12:34:56"), hms(56, 34, 12))
+  )
+  expect_deprecated(
+    expect_hms_equal(
+      as.hms(strptime("12:34:56", format = "%H:%M:%S", tz = "UTC"), tz = "UTC"),
+      hms(56, 34, 12)
+    )
+  )
+  expect_deprecated(
+    expect_hms_equal(
+      as.hms(strptime("12:34:56", format = "%H:%M:%S", tz = "CEST"), tz = "CEST"),
+      hms(56, 34, 12)
+    )
+  )
+  expect_deprecated(
+    expect_hms_equal(
+      as.hms(strptime("12:34:56", format = "%H:%M:%S", tz = "PST8PDT"), tz = "PST8PDT"),
+      hms(56, 34, 12)
+    )
   )
 
   now <- Sys.time()
   now_lt <- as.POSIXlt(now)
-  expect_hms_equal(expect_deprecated(as.hms(now)), hms(now_lt$sec, now_lt$min, now_lt$hour))
-  expect_hms_equal(expect_deprecated(as.hms(now_lt)), as_hms(now))
+  expect_deprecated(
+    expect_hms_equal(as.hms(now), hms(now_lt$sec, now_lt$min, now_lt$hour))
+  )
+  expect_deprecated(
+    expect_hms_equal(as.hms(now_lt), as_hms(now))
+  )
 
   expect_error(expect_deprecated(as.hms(FALSE)))
 })