Merge pull request #343 from krlmlr/234-skip-summary

Summary of skipped tests

R/reporter-check.R

@@ -78,6 +78,14 @@ CheckReporter <- setRefClass("CheckReporter", contains = "Reporter",
   )
 )
 
+skip_summary <- function(x, label) {
+  header <- paste0(label, ". ", x$test)
+
+  paste0(
+    colourise(header, "skipped"), " - ", x$failure_msg
+  )
+}
+
 failure_summary <- function(x, label, width = getOption("width")) {
   header <- paste0(label, ". ", failure_header(x))
   linewidth <- ifelse(nchar(header) > width, 0, width - nchar(header))
@@ -90,7 +98,10 @@ failure_summary <- function(x, label, width = getOption("width")) {
 }
 
 failure_header <- function(x) {
-  type <- if (x$error) "Error" else "Failure"
+  if (x$error)
+    type <- "Error"
+  else
+    type <- "Failure"
 
   ref <- x$srcref
   if (is.null(ref)) {

R/reporter-summary.r

@@ -23,6 +23,7 @@ NULL
 SummaryReporter <- setRefClass("SummaryReporter", contains = "Reporter",
   fields = list(
     "failures" = "list",
+    "skips" = "list",
     "n" = "integer",
     "has_tests" = "logical",
     "max_reports" = "numeric",
@@ -45,6 +46,7 @@ SummaryReporter <- setRefClass("SummaryReporter", contains = "Reporter",
 
     start_reporter = function() {
       failures <<- list()
+      skips <<- list()
       has_tests <<- FALSE
       n <<- 0L
     },
@@ -53,6 +55,8 @@ SummaryReporter <- setRefClass("SummaryReporter", contains = "Reporter",
       callSuper(result)
       has_tests <<- TRUE
       if (result$skipped) {
+        result$test <- if (is.null(test)) "(unknown)" else test
+        skips <<- c(skips, list(result))
         cat(colourise("S", "skipped"))
         return()
       }
@@ -75,6 +79,12 @@ SummaryReporter <- setRefClass("SummaryReporter", contains = "Reporter",
       if (n == 0) {
         if (!has_tests)
           return()
+
+        if (length(skips) > 0L) {
+          cat(colourise("\nSkip:", "skipped"), "\n\n")
+          cat_reports(skips, skip_summary, "\n")
+        }
+
         cat("\n")
         if (show_praise && runif(1) < 0.1) {
           cat(colourise(praise(), "passed"), "\n")