From 0cb382cb6f51fbde8b22f6597b92d9bebb3445e7 Mon Sep 17 00:00:00 2001 From: Daniel Schierbeck Date: Sun, 21 Sep 2008 14:59:31 +0200 Subject: Moved test object instantiation to a setup method. Signed-off-by: Michael Koziarski --- activesupport/test/core_ext/module_test.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'activesupport/test/core_ext/module_test.rb') diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb index 46d63748bc..7fe5d0faee 100644 --- a/activesupport/test/core_ext/module_test.rb +++ b/activesupport/test/core_ext/module_test.rb @@ -62,6 +62,10 @@ end EOF class ModuleTest < Test::Unit::TestCase + def setup + @david = Someone.new("David", Somewhere.new("Paulina", "Chicago")) + end + def test_included_in_classes assert One.included_in_classes.include?(Ab) assert One.included_in_classes.include?(Xy::Bc) @@ -70,14 +74,12 @@ class ModuleTest < Test::Unit::TestCase end def test_delegation_to_methods - david = Someone.new("David", Somewhere.new("Paulina", "Chicago")) - assert_equal "Paulina", david.street - assert_equal "Chicago", david.city + assert_equal "Paulina", @david.street + assert_equal "Chicago", @david.city end def test_delegation_down_hierarchy - david = Someone.new("David", Somewhere.new("Paulina", "Chicago")) - assert_equal "CHICAGO", david.upcase + assert_equal "CHICAGO", @david.upcase end def test_delegation_to_instance_variable @@ -91,16 +93,14 @@ class ModuleTest < Test::Unit::TestCase end def test_delegation_prefix - david = Someone.new("David", Somewhere.new("Paulina", "Chicago")) - invoice = Invoice.new(david) + invoice = Invoice.new(@david) assert_equal invoice.client_name, "David" assert_equal invoice.client_street, "Paulina" assert_equal invoice.client_city, "Chicago" end def test_delegation_custom_prefix - david = Someone.new("David", Somewhere.new("Paulina", "Chicago")) - invoice = Invoice.new(david) + invoice = Invoice.new(@david) assert_equal invoice.customer_name, "David" assert_equal invoice.customer_street, "Paulina" assert_equal invoice.customer_city, "Chicago" -- cgit v1.2.3