nagachika	2014-02-15 23:44:50 +0900 (Sat, 15 Feb 2014)

  New Revision: 44974

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

  Log:
    merge revision(s) r44046:
    
    test_struct.rb: use assert_same
    
    * test/ruby/test_struct.rb (test_question_mark_in_member): true value
      has no meanings itself.  use assert_same instead.
    
    * test/ruby/test_struct.rb (test_bang_mark_in_member): ditto.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/test_struct.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44973)
+++ ruby_2_0_0/version.h	(revision 44974)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-02-15"
-#define RUBY_PATCHLEVEL 408
+#define RUBY_PATCHLEVEL 409
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_0_0/test/ruby/test_struct.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_struct.rb	(revision 44973)
+++ ruby_2_0_0/test/ruby/test_struct.rb	(revision 44974)
@@ -316,14 +316,16 @@ module TestStruct https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_struct.rb#L316
 
   def test_question_mark_in_member
     klass = @Struct.new(:a, :b?)
-    o = klass.new("test", true)
-    assert_predicate(o, :b?)
+    x = Object.new
+    o = klass.new("test", x)
+    assert_same(x, o.b?)
   end
 
   def test_bang_mark_in_member
     klass = @Struct.new(:a, :b!)
-    o = klass.new("test", true)
-    assert_predicate(o, :b!)
+    x = Object.new
+    o = klass.new("test", x)
+    assert_same(x, o.b!)
   end
 
   class TopStruct < Test::Unit::TestCase

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44046


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