shyouhei	2009-11-25 17:41:36 +0900 (Wed, 25 Nov 2009)

  New Revision: 25917

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25917

  Log:
    merge revision(s) 22372:
    * test/ostruct/test_ostruct.rb (test_frozen): added assertions.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/test/ostruct/test_ostruct.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 25916)
+++ ruby_1_8_7/ChangeLog	(revision 25917)
@@ -1,3 +1,7 @@
+Wed Nov 25 17:39:28 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/ostruct/test_ostruct.rb (test_frozen): added assertions.
+
 Wed Nov 25 16:43:24 2009  NAKAMURA, Hiroshi  <nahi@r...>
 
 	* lib/monitor.rb (MonitorMixin.mon_release): ensure the scheduled
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 25916)
+++ ruby_1_8_7/version.h	(revision 25917)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-11-25"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091125
-#define RUBY_PATCHLEVEL 223
+#define RUBY_PATCHLEVEL 224
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/test/ostruct/test_ostruct.rb
===================================================================
--- ruby_1_8_7/test/ostruct/test_ostruct.rb	(revision 25916)
+++ ruby_1_8_7/test/ostruct/test_ostruct.rb	(revision 25917)
@@ -41,7 +41,11 @@
     assert_equal("#<OpenStruct>", foo.inspect)
     foo.bar = 1
     foo.baz = 2
-    assert_equal("#<OpenStruct bar=1, baz=2>", foo.inspect)
+    foo.foo = 0
+    assert_match(/\A#<OpenStruct (?:(?:foo=0|bar=1|baz=2)(?:, (?!>))?)+>\z/, foo.inspect)
+    assert_match(/ foo=0(?:, |>\z)/, foo.inspect)
+    assert_match(/ bar=1(?:, |>\z)/, foo.inspect)
+    assert_match(/ baz=2(?:, |>\z)/, foo.inspect)
 
     foo = OpenStruct.new
     foo.bar = OpenStruct.new
@@ -56,5 +60,7 @@
     o.freeze
     assert_raise(TypeError) {o.b = 'b'}
     assert_not_respond_to(o, :b)
+    assert_raise(TypeError) {o.a = 'z'}
+    assert_equal('a', o.a)
   end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/