ensure as_logger_config returns lists with "logger_config" subclass

Author: s-fleck

R/logger_config.R

@@ -75,7 +75,7 @@ logger_config <- function(
       exception_handler = exception_handler,
       propagate = propagate
     ),
-    CLASS = c("logger_config", "list")
+    class = c("logger_config", "list")
   )
 }
 
@@ -123,12 +123,7 @@ as_logger_config.character <- function(
 
   res <- resolve_r6_ctors(dd)
 
-  assert(
-    is_Logger(res),
-    "If `x` is a YAML file or string, it must contain a single logger object"
-  )
-
-  res
+  as_logger_config(res)
 }
 
 
@@ -137,7 +132,13 @@ as_logger_config.character <- function(
 #' @param x
 #' @rdname as_logger_config
 as_logger_config.Logger <- function(x){
-  x
+  logger_config(
+    appenders = x$appenders,
+    threshold = x$threshold,
+    exception_handler = x$exception_handler,
+    filters = x$filters,
+    propagate = x$propagate
+  )
 }
 
 
@@ -147,7 +148,6 @@ resolve_r6_ctors <- function(x){
 
   ctors <- lapply(names(x), get0_R6Class)
 
-
   for (i in seq_along(x)){
     if (length(ctors) && !is.null(ctors[[i]])){
 

tests/testthat/test_logger_config.R

@@ -2,64 +2,61 @@ context("logger_config")
 
 
 test_that("logger_config works as expected", {
-
   cfg <- logger_config(
     appenders = Appender$new(),
     propagate = FALSE,
     exception_handler = default_exception_handler,
     threshold = NA,
     filters = FilterForceLevel$new("info")
   )
+  expect_s3_class(cfg, "logger_config")
 
   tl <- get_logger("test")$config(cfg)
-
   expect_true(inherits(tl$appenders[[1]], "Appender"))
+  expect_false(is_virgin_Logger(tl))
 
-  tl <- get_logger$config(basic_config())
-
-
+  tl <- get_logger("test")$config(logger_config())
+  expect_true(is_virgin_Logger(tl))
 })
 
 
 
-test_that("as_logger_config works as expected", {
+
+test_that("as_logger_config works as expected with YAML file", {
   ty <- rprojroot::find_testthat_root_file("testdata", "lg_full.yaml")
   cfg <- as_logger_config(ty)
+  expect_s3_class(cfg, "logger_config")
 
   expect_identical(cfg$appenders[[1]]$layout$fmt, "%L %t - %m")
-  expect_true(is_Logger(cfg))
+  expect_s3_class(cfg, "logger_config")
 })
 
 
 
 
-test_that("setting logger$config works as expected", {
+test_that("setting logger$config fails if yaml file is passed to `text` instead of `file`", {
   ty <- rprojroot::find_testthat_root_file("testdata", "lg_full.yaml")
   lg <- get_logger("test")
-
-  lg$config(ty)
-  lg$config(file = ty)
   expect_error(lg$config(text = ty), "YAML")
 })
 
 
 
 
-test_that("logger_config works for simplified logger config", {
+test_that("as_logger_config works for simplified yaml logger config", {
   ty <- rprojroot::find_testthat_root_file("testdata", "lg_simple.yaml")
   cfg <- as_logger_config(ty)
+  expect_s3_class(cfg, "logger_config")
 
   expect_identical(cfg$appenders[[1]]$layout$fmt, "%L %t - %m")
-  expect_true(is_Logger(cfg))
+  expect_s3_class(cfg, "logger_config")
 })
 
 
 
 
-test_that("resolve_r6_ctors", {
-
+test_that("resolve_r6_ctors works as expected", {
   tf <- tempfile()
-
   x <- list(
     "Logger" = list(
       name = "test",
@@ -70,14 +67,13 @@ test_that("resolve_r6_ctors", {
       )
     )
   )
-
   res <- resolve_r6_ctors(x)
   expect_true(is_Logger(res))
+  expect_s3_class(as_logger_config(res), "logger_config")
   expect_identical(res$appenders[[1]]$file, tf)
 
 
   tf <- tempfile()
-
   x <- list(
     "Logger" = list(
       name = "test2",
@@ -96,5 +92,6 @@ test_that("resolve_r6_ctors", {
 
   res <- resolve_r6_ctors(x)
   expect_true(is_Logger(res))
+  expect_s3_class(as_logger_config(res), "logger_config")
   expect_identical(res$appenders[[1]]$appenders[[1]]$file, tf)
 })