summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-15 14:44:50 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-15 14:44:50 +0000
commit4f8090c71cca18a8f7c1b923f398cc9d6712f810 (patch)
tree01b4bfc92bc88b62cc643894fce55fa5b99bf6ad
parentd0a5dfecd8b1ce9e7da966645622309d6bde7f1e (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_struct.rb10
-rw-r--r--version.h2
2 files changed, 7 insertions, 5 deletions
diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb
index 19e6056c82..ee8bf3184a 100644
--- a/test/ruby/test_struct.rb
+++ b/test/ruby/test_struct.rb
@@ -316,14 +316,16 @@ module TestStruct
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
diff --git a/version.h b/version.h
index 4cc90d7483..4cd7aecb74 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#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