From 2de2b2ab2fef313a21826c514bb05d908d00b9b1 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 27 Jan 2011 14:24:24 +0000 Subject: merges a half of revision 5937 and 5939 in MiniTest's repository into ruby_1_9_2. -- - Fixed some of the assertion default messages git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/minitest/unit.rb | 5 ++--- version.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index aa5890eb4a..5a69064578 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -91,15 +91,14 @@ module MiniTest # Fails unless the block returns a true value. def assert_block msg = nil - msg = message(msg) { "Expected block to return true value" } - assert yield, msg + assert yield, "Expected block to return true value." end ## # Fails unless +obj+ is empty. def assert_empty obj, msg = nil - msg = message(msg) { "Expected #{obj.inspect} to be empty" } + msg = message(msg) { "Expected #{mu_pp(obj)} to be empty" } assert_respond_to obj, :empty? assert obj.empty?, msg end diff --git a/version.h b/version.h index a7123eff4b..d10c55824e 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 161 +#define RUBY_PATCHLEVEL 162 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3