Skip to content
Browse files

- Merge [5047].

  • Loading branch information...
1 parent 3c4b6f0 commit 2c677e62ac27aac5a3ee645361679cb281e4dd6a @sebastianbergmann committed Jul 31, 2009
Showing with 58 additions and 58 deletions.
  1. +1 −1 PHPUnit/Tests/Regression/578.phpt
  2. +1 −1 PHPUnit/Tests/Regression/684.phpt
  3. +1 −1 PHPUnit/Tests/Regression/783.phpt
  4. +1 −1 PHPUnit/Tests/TextUI/abstract-test-class.phpt
  5. +1 −1 PHPUnit/Tests/TextUI/concrete-test-class.phpt
  6. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-class-extended-isolation.phpt
  7. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-class-extended.phpt
  8. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-class-isolation.phpt
  9. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-class.phpt
  10. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-isolation.phpt
  11. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-method-isolation.phpt
  12. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-method.phpt
  13. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-not-private-isolation.phpt
  14. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-not-private.phpt
  15. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-not-protected-isolation.phpt
  16. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-not-protected.phpt
  17. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-not-public-isolation.phpt
  18. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-not-public.phpt
  19. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-private-isolation.phpt
  20. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-private.phpt
  21. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-protected-isolation.phpt
  22. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-protected.phpt
  23. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-public-isolation.phpt
  24. +1 −1 PHPUnit/Tests/TextUI/coverage-clover-public.phpt
  25. +1 −1 PHPUnit/Tests/TextUI/coverage-clover.phpt
  26. +1 −1 PHPUnit/Tests/TextUI/coverage-source.phpt
  27. +1 −1 PHPUnit/Tests/TextUI/dataprovider-log-xml-isolation.phpt
  28. +1 −1 PHPUnit/Tests/TextUI/dataprovider-log-xml.phpt
  29. +1 −1 PHPUnit/Tests/TextUI/debug.phpt
  30. +1 −1 PHPUnit/Tests/TextUI/default-isolation.phpt
  31. +1 −1 PHPUnit/Tests/TextUI/default.phpt
  32. +1 −1 PHPUnit/Tests/TextUI/dependencies-isolation.phpt
  33. +1 −1 PHPUnit/Tests/TextUI/dependencies.phpt
  34. +1 −1 PHPUnit/Tests/TextUI/dependencies2-isolation.phpt
  35. +1 −1 PHPUnit/Tests/TextUI/dependencies2.phpt
  36. +1 −1 PHPUnit/Tests/TextUI/dependencies3-isolation.phpt
  37. +1 −1 PHPUnit/Tests/TextUI/dependencies3.phpt
  38. +1 −1 PHPUnit/Tests/TextUI/exclude-group-isolation.phpt
  39. +1 −1 PHPUnit/Tests/TextUI/exclude-group.phpt
  40. +1 −1 PHPUnit/Tests/TextUI/failure-isolation.phpt
  41. +1 −1 PHPUnit/Tests/TextUI/failure-verbose-isolation.phpt
  42. +1 −1 PHPUnit/Tests/TextUI/failure-verbose.phpt
  43. +1 −1 PHPUnit/Tests/TextUI/failure.phpt
  44. +1 −1 PHPUnit/Tests/TextUI/filter-class-isolation.phpt
  45. +1 −1 PHPUnit/Tests/TextUI/filter-class.phpt
  46. +1 −1 PHPUnit/Tests/TextUI/filter-method-isolation.phpt
  47. +1 −1 PHPUnit/Tests/TextUI/filter-method.phpt
  48. +1 −1 PHPUnit/Tests/TextUI/group-isolation.phpt
  49. +1 −1 PHPUnit/Tests/TextUI/group.phpt
  50. +1 −1 PHPUnit/Tests/TextUI/log-graphviz.phpt
  51. +1 −1 PHPUnit/Tests/TextUI/log-json.phpt
  52. +1 −1 PHPUnit/Tests/TextUI/log-tap.phpt
  53. +1 −1 PHPUnit/Tests/TextUI/log-xml.phpt
  54. +1 −1 PHPUnit/Tests/TextUI/skeleton.phpt
  55. +1 −1 PHPUnit/Tests/TextUI/testdox-html.phpt
  56. +1 −1 PHPUnit/Tests/TextUI/testdox-text.phpt
  57. +1 −1 PHPUnit/Tests/TextUI/verbose-isolation.phpt
  58. +1 −1 PHPUnit/Tests/TextUI/verbose.phpt
View
2 PHPUnit/Tests/Regression/578.phpt
@@ -14,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann.
EEE
-Time: %i seconds
+Time: %i %s
There were 3 errors:
View
2 PHPUnit/Tests/Regression/684.phpt
@@ -14,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann.
F
-Time: %i seconds
+Time: %i %s
There was 1 failure:
View
2 PHPUnit/Tests/Regression/783.phpt
@@ -16,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
..
-Time: %i seconds
+Time: %i %s
OK (2 tests, 0 assertions)
View
2 PHPUnit/Tests/TextUI/abstract-test-class.phpt
@@ -14,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann.
F
-Time: %i seconds
+Time: %i %s
There was 1 failure:
View
2 PHPUnit/Tests/TextUI/concrete-test-class.phpt
@@ -14,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann.
..
-Time: %i seconds
+Time: %i %s
OK (2 tests, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-class-extended-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-class-extended.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-class-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-class.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-method-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-method.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-not-private-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-not-private.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-not-protected-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-not-protected.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-not-public-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-not-public.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-private-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-private.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-protected-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-protected.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-public-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover-public.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 0 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-clover.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/coverage-source.phpt
@@ -29,7 +29,7 @@ PHPUnit %s by Sebastian Bergmann.
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/dataprovider-log-xml-isolation.phpt
@@ -34,7 +34,7 @@ Failed asserting that <integer:2> matches expected <integer:3>.
</testsuites>
-Time: %i seconds
+Time: %i %s
There was 1 failure:
View
2 PHPUnit/Tests/TextUI/dataprovider-log-xml.phpt
@@ -34,7 +34,7 @@ Failed asserting that &lt;integer:2&gt; matches expected &lt;integer:3&gt;.
</testsuites>
-Time: %i seconds
+Time: %i %s
There was 1 failure:
View
2 PHPUnit/Tests/TextUI/debug.phpt
@@ -21,6 +21,6 @@ Starting test 'BankAccountTest::testBalanceCannotBecomeNegative'.
Starting test 'BankAccountTest::testBalanceCannotBecomeNegative2'.
.
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/default-isolation.phpt
@@ -15,6 +15,6 @@ PHPUnit %s by Sebastian Bergmann.
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/default.phpt
@@ -14,6 +14,6 @@ PHPUnit %s by Sebastian Bergmann.
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/dependencies-isolation.phpt
@@ -21,7 +21,7 @@ Test Dependencies
DependencyFailureTest
FSS
-Time: %i seconds
+Time: %i %s
There was 1 failure:
View
2 PHPUnit/Tests/TextUI/dependencies.phpt
@@ -20,7 +20,7 @@ Test Dependencies
DependencyFailureTest
FSS
-Time: %i seconds
+Time: %i %s
There was 1 failure:
View
2 PHPUnit/Tests/TextUI/dependencies2-isolation.phpt
@@ -15,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann.
..
-Time: %i seconds
+Time: %i %s
OK (2 tests, 5 assertions)
View
2 PHPUnit/Tests/TextUI/dependencies2.phpt
@@ -14,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann.
..
-Time: %i seconds
+Time: %i %s
OK (2 tests, 5 assertions)
View
2 PHPUnit/Tests/TextUI/dependencies3-isolation.phpt
@@ -15,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann.
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 2 assertions)
View
2 PHPUnit/Tests/TextUI/dependencies3.phpt
@@ -14,6 +14,6 @@ PHPUnit %s by Sebastian Bergmann.
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 2 assertions)
View
2 PHPUnit/Tests/TextUI/exclude-group-isolation.phpt
@@ -17,6 +17,6 @@ PHPUnit %s by Sebastian Bergmann.
..
-Time: %i seconds
+Time: %i %s
OK (2 tests, 2 assertions)
View
2 PHPUnit/Tests/TextUI/exclude-group.phpt
@@ -16,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
..
-Time: %i seconds
+Time: %i %s
OK (2 tests, 2 assertions)
View
2 PHPUnit/Tests/TextUI/failure-isolation.phpt
@@ -15,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann.
FFFFFFFFFF
-Time: %i seconds
+Time: %i %s
There were 10 failures:
View
2 PHPUnit/Tests/TextUI/failure-verbose-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
FailureTest
FFFFFFFFFF
-Time: %i seconds
+Time: %i %s
There were 10 failures:
View
2 PHPUnit/Tests/TextUI/failure-verbose.phpt
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
FailureTest
FFFFFFFFFF
-Time: %i seconds
+Time: %i %s
There were 10 failures:
View
2 PHPUnit/Tests/TextUI/failure.phpt
@@ -14,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann.
FFFFFFFFFF
-Time: %i seconds
+Time: %i %s
There were 10 failures:
View
2 PHPUnit/Tests/TextUI/filter-class-isolation.phpt
@@ -17,6 +17,6 @@ PHPUnit %s by Sebastian Bergmann.
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/filter-class.phpt
@@ -16,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/filter-method-isolation.phpt
@@ -17,6 +17,6 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 1 assertion)
View
2 PHPUnit/Tests/TextUI/filter-method.phpt
@@ -16,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 1 assertion)
View
2 PHPUnit/Tests/TextUI/group-isolation.phpt
@@ -17,6 +17,6 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 1 assertion)
View
2 PHPUnit/Tests/TextUI/group.phpt
@@ -16,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
.
-Time: %i seconds
+Time: %i %s
OK (1 test, 1 assertion)
View
2 PHPUnit/Tests/TextUI/log-graphviz.phpt
@@ -32,6 +32,6 @@ The --log-graphviz functionality is deprecated and will be removed in the future
}
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/log-json.phpt
@@ -16,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
{"event":"suiteStart","suite":"BankAccountTest","tests":3}.{"event":"test","suite":"BankAccountTest","test":"BankAccountTest::testBalanceIsInitiallyZero","status":"pass","time":%f,"trace":[],"message":""}.{"event":"test","suite":"BankAccountTest","test":"BankAccountTest::testBalanceCannotBecomeNegative","status":"pass","time":%f,"trace":[],"message":""}.{"event":"test","suite":"BankAccountTest","test":"BankAccountTest::testBalanceCannotBecomeNegative2","status":"pass","time":%f,"trace":[],"message":""}
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/log-tap.phpt
@@ -21,6 +21,6 @@ TAP version 13
1..3
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/log-xml.phpt
@@ -24,6 +24,6 @@ PHPUnit %s by Sebastian Bergmann.
</testsuites>
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/skeleton.phpt
@@ -14,6 +14,6 @@ PHPUnit %s by Sebastian Bergmann.
....
-Time: %i seconds
+Time: %i %s
OK (4 tests, 4 assertions)
View
2 PHPUnit/Tests/TextUI/testdox-html.phpt
@@ -16,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
<html><body><h2 id="BankAccountTest">BankAccount</h2><ul>...<li>Balance is initially zero</li><li>Balance cannot become negative</li></ul></body></html>
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/testdox-text.phpt
@@ -20,6 +20,6 @@ BankAccount
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/verbose-isolation.phpt
@@ -17,6 +17,6 @@ PHPUnit %s by Sebastian Bergmann.
BankAccountTest
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)
View
2 PHPUnit/Tests/TextUI/verbose.phpt
@@ -16,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
BankAccountTest
...
-Time: %i seconds
+Time: %i %s
OK (3 tests, 3 assertions)

0 comments on commit 2c677e6

Please sign in to comment.
Something went wrong with that request. Please try again.