Merge branch 'feature/error-in-message-demo' into feature/error-in-me…

…ssage Includes an update of the test results.
r-lib · Mar 4, 2016 · 1150225 · 1150225
2 parents 27536b7 + 51df2e8
commit 1150225
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/tests/testthat/reporters/check.txt b/tests/testthat/reporters/check.txt
@@ -28,7 +28,7 @@ stop
 4: stop("!") at reporters/tests.R:34
 
 testthat results ================================================================
-OK: 5 SKIPPED: 2 FAILED: 6
+OK: 7 SKIPPED: 2 FAILED: 6
 1. Failure: Failure:1 (@tests.R#8) 
 2. Failure: Failure:2a (@tests.R#12) 
 3. Failure: Failure:2b (@tests.R#15) 

diff --git a/tests/testthat/reporters/minimal.txt b/tests/testthat/reporters/minimal.txt
@@ -1 +1 @@
-.FFFF.EESSWWW
+.FFFF.EESSWWW..
diff --git a/tests/testthat/reporters/summary.txt b/tests/testthat/reporters/summary.txt
@@ -2,6 +2,7 @@ Expectations: .1234.
 Errors: 56
 Skips: SS
 Warnings: WWW
+Promises: ..
 
 Skipped --------------------------------------------------------------------
 1. Skip:1 (@tests.R#42) - skip

diff --git a/tests/testthat/reporters/tap.txt b/tests/testthat/reporters/tap.txt
@@ -1,4 +1,4 @@
-1..13
+1..15
 # Context Expectations 
 ok 1 Success 
 not ok 2 Failure:1 
@@ -33,3 +33,6 @@ ok 10 # SKIP skip
 ok 11 # WARNING abc 
 ok 12 # WARNING def 
 ok 13 # WARNING ghi 
+# Context Promises 
+ok 14 Promises:1 
+ok 15 Promises:1 
diff --git a/tests/testthat/reporters/teamcity.txt b/tests/testthat/reporters/teamcity.txt
@@ -77,3 +77,14 @@
 ##teamcity[testSuiteFinished name='Warnings']
 
 
+##teamcity[testSuiteStarted name='Promises']
+##teamcity[testSuiteStarted name='Promises:1']
+##teamcity[testStarted name='expectation 1']
+##teamcity[testFinished name='expectation 1']
+##teamcity[testStarted name='expectation 2']
+##teamcity[testFinished name='expectation 2']
+##teamcity[testSuiteFinished name='Promises:1']
+
+##teamcity[testSuiteFinished name='Promises']
+
+
diff --git a/tests/testthat/reporters/tests.R b/tests/testthat/reporters/tests.R
@@ -57,3 +57,9 @@ test_that("Warning:2", {
   warning("def")
   warning("ghi")
 })
+
+context("Promises")
+
+test_that("Promises:1", {
+  expect_output(expect_false(FALSE), NA)
+})