summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/ruby/envutil.rb5
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 18567e3610..9c577fb1e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 17 16:04:23 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * test/ruby/envutil.rb (Test::Unit::Assersions#assert_warn):
+ new assersion to assert that a particular warning message is
+ displayed.
+ forwardport from branches/ruby_1_9_2@29795.
+
Wed Nov 17 15:16:48 2010 NARUSE, Yui <naruse@ruby-lang.org>
* regint.h (OnigOpInfoType): constify name.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 8d7a1eef24..7b235106cb 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -173,6 +173,11 @@ module Test
assert(status.success?, m)
end
+ def assert_warn(msg)
+ stderr = EnvUtil.verbose_warning { yield }
+ assert(msg === stderr, "warning message #{stderr.inspect} is expected to match #{msg.inspect}")
+ end
+
end
end
end