Enabling srcref argument in reporter$start_test

kubajal · kubajal · commit 4be00d6df41d · 2025-08-15T17:03:38.000+02:00
diff --git a/R/parallel.R b/R/parallel.R
@@ -377,10 +377,10 @@ SubprocessReporter <- R6::R6Class(
       private$filename <- filename
       private$event("start_file", filename)
     },
-    start_test = function(context, test) {
+    start_test = function(context, test, srcref=NULL) {
       private$context <- context
       private$test <- test
-      private$event("start_test", context, test)
+      private$event("start_test", context, test, srcref)
     },
     start_context = function(context) {
       private$context <- context
diff --git a/R/reporter-junit.R b/R/reporter-junit.R
@@ -69,7 +69,7 @@ JunitReporter <- R6::R6Class(
       self$file_name <- file
     },
 
-    start_test = function(context, test) {
+    start_test = function(context, test, srcref=NULL) {
       if (is.null(context)) {
         context_start_file(self$file_name)
       }
diff --git a/R/reporter-list.R b/R/reporter-list.R
@@ -24,7 +24,7 @@ ListReporter <- R6::R6Class(
       self$results <- Stack$new()
     },
 
-    start_test = function(context, test) {
+    start_test = function(context, test, srcref=NULL) {
       if (
         !identical(self$current_context, context) ||
           !identical(self$current_test, test)
diff --git a/R/reporter-location.R b/R/reporter-location.R
@@ -10,8 +10,14 @@ LocationReporter <- R6::R6Class(
   "LocationReporter",
   inherit = Reporter,
   public = list(
-    start_test = function(context, test) {
-      self$cat_line("Start test: ", test)
+    start_test = function(context, test, srcref=NULL) {
+      if (!is.null(srcref)) {
+          filename <- attr(srcref, "srcfile")$filename
+          line_number <- as.integer(srcref[[1]])
+          self$cat_line("Start test: '", test, "' at ", filename, ":", line_number)
+      } else {
+        self$cat_line("Start test: ", test)
+      }
     },
 
     add_result = function(context, test, result) {
diff --git a/R/reporter-multi.R b/R/reporter-multi.R
@@ -26,8 +26,8 @@ MultiReporter <- R6::R6Class(
     start_context = function(context) {
       o_apply(self$reporters, "start_context", context)
     },
-    start_test = function(context, test) {
-      o_apply(self$reporters, "start_test", context, test)
+    start_test = function(context, test, srcref=NULL) {
+      o_apply(self$reporters, "start_test", context, test, srcref)
     },
     add_result = function(context, test, result) {
       o_apply(
diff --git a/R/reporter-slow.R b/R/reporter-slow.R
@@ -38,7 +38,7 @@ SlowReporter <- R6::R6Class(
       self$current_file <- file
     },
 
-    start_test = function(context, test) {
+    start_test = function(context, test, srcref=NULL) {
       self$current_test_start <- proc.time()[[3]]
     },
 
diff --git a/R/reporter-stop.R b/R/reporter-stop.R
@@ -31,7 +31,7 @@ StopReporter <- R6::R6Class(
       self$stop_reporter <- stop_reporter
     },
 
-    start_test = function(context, test) {
+    start_test = function(context, test, srcref=NULL) {
       self$issues <- Stack$new()
     },
 
diff --git a/R/reporter-teamcity.R b/R/reporter-teamcity.R
@@ -27,7 +27,7 @@ TeamcityReporter <- R6::R6Class(
       self$cat_line()
     },
 
-    start_test = function(context, test) {
+    start_test = function(context, test, srcref=NULL) {
       private$report_event("testSuiteStarted", test)
       self$i <- 1L
     },
diff --git a/R/reporter-timing.R b/R/reporter-timing.R
@@ -31,7 +31,7 @@ SlowReporter <- R6::R6Class(
       self$current_file <- file
     },
 
-    start_test = function(context, test) {
+    start_test = function(context, test, srcref=NULL) {
       self$current_test_start <- proc.time()[[3]]
     },
 
diff --git a/R/reporter.R b/R/reporter.R
@@ -29,7 +29,7 @@ Reporter <- R6::R6Class(
     capabilities = list(parallel_support = FALSE, parallel_updates = FALSE),
     start_reporter = function() {},
     start_context = function(context) {},
-    start_test = function(context, test) {},
+    start_test = function(context, test, srcref=NULL) {},
     start_file = function(filename) {},
     add_result = function(context, test, result) {},
     end_test = function(context, test) {},
diff --git a/R/snapshot-reporter-parallel.R b/R/snapshot-reporter-parallel.R
@@ -34,10 +34,10 @@ SubprocessSnapshotReporter <- R6::R6Class(
       super$end_test(context, test)
     },
 
-    start_test = function(context, test) {
+    start_test = function(context, test, srcref=NULL) {
       private$context <- context
       private$test <- test
-      super$start_test(context, test)
+      super$start_test(context, test, srcref)
     },
 
     announce_file_snapshot = function(name) {
diff --git a/R/snapshot-reporter.R b/R/snapshot-reporter.R
@@ -36,7 +36,7 @@ SnapshotReporter <- R6::R6Class(
       }
     },
 
-    start_test = function(context, test) {
+    start_test = function(context, test, srcref=NULL) {
       if (is.null(test)) {
         return()
       }
diff --git a/R/test-that.R b/R/test-that.R
@@ -51,7 +51,8 @@ test_code <- function(code, env, reporter = NULL, skip_on_empty = TRUE) {
 
   test <- test_description()
   if (!is.null(test)) {
-    reporter$start_test(context = reporter$.context, test = test)
+    srcref = attr(code, "srcref")[[1]]
+    reporter$start_test(context = reporter$.context, test = test, srcref = srcref)
     withr::defer(reporter$end_test(context = reporter$.context, test = test))
   }
 
diff --git a/tests/testthat/test-context.R b/tests/testthat/test-context.R
@@ -15,7 +15,7 @@ CountReporter <- R6::R6Class(
       self$context_i <- self$context_i - 1
       stopifnot(self$context_i >= 0)
     },
-    start_test = function(context, test) {
+    start_test = function(context, test, srcref=NULL) {
       self$test_count <- self$test_count + 1
       self$test_i <- self$test_i + 1
     },

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ JunitReporter <- R6::R6Class(`
`69`	`69`	`self$file_name <- file`
`70`	`70`	`},`
`71`	`71`
`72`		`- start_test = function(context, test) {`
	`72`	`+ start_test = function(context, test, srcref=NULL) {`
`73`	`73`	`if (is.null(context)) {`
`74`	`74`	`context_start_file(self$file_name)`
`75`	`75`	`}`