Merge branch 'master' of github.com:hadley/testthat

Author: hadley

.travis.yml

@@ -3,8 +3,9 @@
 language: r
 cache: packages
 sudo: false
-r_github_packages:
-  - jimhester/covr@v2
+
+r_packages:
+  - covr
 
 after_success:
   - Rscript -e 'covr::codecov(line_exclusions = c("inst/include/testthat/testthat.h", "inst/include/testthat/vendor/catch.h"))'

NEWS.md

@@ -22,7 +22,7 @@ factor("a") %>%
 The exception to this rule are the expectations that evaluate (i.e.
 for messages, warnings, errors, output etc), which invisibly return `NULL`. These functions are now more consistent: using `NA` will cause a failure if there is a errors/warnings/mesages/output (i.e. they're not missing), and will `NULL` fail if there aren't any errors/warnings/mesages/output. This previously didn't work for `expect_output()` (#323), and the error messages were confusing with `expect_error(..., NA)` (#342, @nealrichardson + @krlmlr, #317).
 
-Another change is that `expect_output()` now requires you to explicit print the output if you want to test a print method: `expect_output("a", "a")` will fail, `expect_output(print("a"), "a")` will succeed.
+Another change is that `expect_output()` now requires you to explicitly print the output if you want to test a print method: `expect_output("a", "a")` will fail, `expect_output(print("a"), "a")` will succeed.
 
 There are six new expectations:
 

inst/include/testthat/testthat.h

@@ -13,10 +13,14 @@
  * TESTTHAT_DISABLED takes precedence.
  * 'testthat' is disabled on Solaris by default.
  */
-#if !defined(__sun) && !defined(__SVR4)
+#if defined(__GNUC__) || defined(__clang__)
 # define TESTTHAT_ENABLED
 #endif
 
+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__sun) || defined(__SVR4)
+# define TESTTHAT_DISABLED
+#endif
+
 #ifndef TESTTHAT_ENABLED
 # define TESTTHAT_DISABLED
 #endif
@@ -30,22 +34,20 @@
 #  define CATCH_CONFIG_RUNNER
 # endif
 
-// Catch has calls to 'exit' on failure, which upset R CMD check.
-// We won't bump into them during normal test execution so just temporarily
-// hide it when we include 'catch'. Make sure we get 'exit' from the normal
-// places first, though.
-# include <cstddef> // std::size_t
-# include <cstdlib> // exit
+# include <climits> // CHAR_MAX
 # include <cstdio>  // EOF
-extern "C" inline void testthat_exit_override(int status) throw() {}
 
 # ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wparentheses"
 # endif
 
-# define exit testthat_exit_override
+// Catch has calls to 'exit' on failure, which upsets R CMD check.
+// We won't bump into them during normal test execution so just override
+// it in the Catch namespace before we include 'catch'.
+namespace Catch {
+inline void exit(int status) throw() {}
+}
 # include "vendor/catch.h"
-# undef exit
 
 // Implement an output stream that avoids writing to stdout / stderr.
 extern "C" void Rprintf(const char*, ...);
@@ -61,12 +63,22 @@ class r_streambuf : public std::streambuf {
 protected:
 
   virtual std::streamsize xsputn(const char* s, std::streamsize n) {
-    Rprintf("%.*s", n, s);
+
+    if (n == 1)
+      Rprintf("%c", *s);
+    else
+      Rprintf("%.*s", n, s);
+
     return n;
+
   }
 
   virtual int overflow(int c = EOF) {
-    if (c != EOF) Rprintf("%.1s", &c);
+    if (c == EOF)
+      return c;
+    if (c > CHAR_MAX)
+      return c;
+    Rprintf("%c", (char) c);
     return c;
   }
 
@@ -78,15 +90,8 @@ class r_streambuf : public std::streambuf {
 };
 
 class r_ostream : public std::ostream {
-
 public:
-
-  r_ostream() :
-    std::ostream(new r_streambuf), pBuffer(static_cast<r_streambuf*>(rdbuf()))
-  {}
-
-private:
-  r_streambuf* pBuffer;
+  r_ostream() : std::ostream(new r_streambuf) {}
 
 };
 

tests/test-catch.R

@@ -2,21 +2,25 @@ library(testthat)
 
 local({
 
+  if (!requireNamespace("devtools", quietly = TRUE))
+    return()
+
+  devel <- try(devtools::has_devel(), silent = TRUE)
+  if (!isTRUE(devel))
+    return()
+
   quietly <- function(expr) {
     suppressMessages(capture.output(result <- expr))
     result
   }
 
-  if (!requireNamespace("devtools", quietly = TRUE))
-    skip("'devtools' not available")
-
   owd <- setwd(tempdir())
   on.exit(setwd(owd), add = TRUE)
 
   pkgName <- "testthatclient"
   pkgPath <- file.path(tempdir(), pkgName)
   libPath <- file.path(tempdir(), "rlib")
-  if (!dir.exists(libPath))
+  if (!utils::file_test("-d", libPath))
     dir.create(libPath)
   .libPaths(c(libPath, .libPaths()))
 
@@ -26,7 +30,7 @@ local({
   }, add = TRUE)
 
   quietly(devtools::create(pkgPath))
-  quietly(use_catch(pkgPath))
+  quietly(testthat::use_catch(pkgPath))
 
   cat("LinkingTo: testthat",
       file = file.path(pkgPath, "DESCRIPTION"),