From 1472bf273d9f61208d3096fc42aa507be6184b45 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 11 Sep 2005 06:25:17 +0000 Subject: Fix tests git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2187 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/mixin_test.rb | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'activerecord') diff --git a/activerecord/test/mixin_test.rb b/activerecord/test/mixin_test.rb index 69789a0cec..4fcc6b6fba 100644 --- a/activerecord/test/mixin_test.rb +++ b/activerecord/test/mixin_test.rb @@ -249,9 +249,24 @@ class TreeTest < Test::Unit::TestCase assert mixins(:tree_1).children.include?(mixins(:tree_4)) end + def test_ancestors + assert_equal [], mixins(:tree_1).ancestors + assert_equal [mixins(:tree_1)], mixins(:tree_2).ancestors + assert_equal [mixins(:tree_2), mixins(:tree_1)], mixins(:tree_3).ancestors + assert_equal [mixins(:tree_1)], mixins(:tree_4).ancestors + assert_equal [], mixins(:tree2_1).ancestors + assert_equal [], mixins(:tree3_1).ancestors + end + def test_root assert_equal mixins(:tree_1), TreeMixin.root - end + assert_equal mixins(:tree_1), mixins(:tree_1).root + assert_equal mixins(:tree_1), mixins(:tree_2).root + assert_equal mixins(:tree_1), mixins(:tree_3).root + assert_equal mixins(:tree_1), mixins(:tree_4).root + assert_equal mixins(:tree2_1), mixins(:tree2_1).root + assert_equal mixins(:tree3_1), mixins(:tree3_1).root + end def test_roots assert_equal [mixins(:tree_1), mixins(:tree2_1), mixins(:tree3_1)], TreeMixin.roots @@ -316,22 +331,4 @@ class TouchTest < Test::Unit::TestCase Mixin.record_timestamps = true end - def test_ancestors - assert_equal [], mixins(:tree_1).ancestors - assert_equal [mixins(:tree_1)], mixins(:tree_2).ancestors - assert_equal [mixins(:tree_2), mixins(:tree_1)], mixins(:tree_3).ancestors - assert_equal [mixins(:tree_1)], mixins(:tree_4).ancestors - assert_equal [], mixins(:tree2_1).ancestors - assert_equal [], mixins(:tree3_1).ancestors - end - - def test_root - assert_equal mixins(:tree_1), TreeMixin.root - assert_equal mixins(:tree_1), mixins(:tree_1).root - assert_equal mixins(:tree_1), mixins(:tree_2).root - assert_equal mixins(:tree_1), mixins(:tree_3).root - assert_equal mixins(:tree_1), mixins(:tree_4).root - assert_equal mixins(:tree2_1), mixins(:tree2_1).root - assert_equal mixins(:tree3_1), mixins(:tree3_1).root - end end -- cgit v1.2.3