Unify cattr and mattr accessors declarations

2 files changed, 22 insertions, 74 deletions

diff --git a/activesupport/test/core_ext/class/attribute_accessor_test.rb b/activesupport/test/core_ext/class/attribute_accessor_test.rb
deleted file mode 100644
index 3bc948f3a6..0000000000
--- a/activesupport/test/core_ext/class/attribute_accessor_test.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/class/attribute_accessors'
-
-class ClassAttributeAccessorTest < ActiveSupport::TestCase
-  def setup
-    @class = Class.new do
-      cattr_accessor :foo
-      cattr_accessor :bar,  :instance_writer   => false
-      cattr_reader   :shaq, :instance_reader   => false
-      cattr_accessor :camp, :instance_accessor => false
-      cattr_accessor(:defa) { 'default_accessor_value' }
-      cattr_reader(:defr) { 'default_reader_value' }
-      cattr_writer(:defw) { 'default_writer_value' }
-    end
-    @object = @class.new
-  end
-
-  def test_should_use_mattr_default
-    assert_nil @class.foo
-    assert_nil @object.foo
-  end
-
-  def test_should_set_mattr_value
-    @class.foo = :test
-    assert_equal :test, @object.foo
-
-    @object.foo = :test2
-    assert_equal :test2, @class.foo
-  end
-
-  def test_should_not_create_instance_writer
-    assert_respond_to @class, :foo
-    assert_respond_to @class, :foo=
-    assert_respond_to @object, :bar
-    assert !@object.respond_to?(:bar=)
-  end
-
-  def test_should_not_create_instance_reader
-    assert_respond_to @class, :shaq
-    assert !@object.respond_to?(:shaq)
-  end
-
-  def test_should_not_create_instance_accessors
-    assert_respond_to @class, :camp
-    assert !@object.respond_to?(:camp)
-    assert !@object.respond_to?(:camp=)
-  end
-
-  def test_should_raise_name_error_if_attribute_name_is_invalid
-    exception = assert_raises NameError do
-      Class.new do
-        cattr_reader "1nvalid"
-      end
-    end
-    assert_equal "invalid class attribute name: 1nvalid", exception.message
-
-    exception = assert_raises NameError do
-      Class.new do
-        cattr_writer "1nvalid"
-      end
-    end
-    assert_equal "invalid class attribute name: 1nvalid", exception.message
-  end
-
-  def test_should_use_default_value_if_block_passed
-    assert_equal 'default_accessor_value', @class.defa
-    assert_equal 'default_reader_value', @class.defr
-    assert_equal 'default_writer_value', @class.class_variable_get('@@defw')
-  end
-end
diff --git a/activesupport/test/core_ext/module/attribute_accessor_test.rb b/activesupport/test/core_ext/module/attribute_accessor_test.rb
index a577f90bdd..48f3cc579f 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_test.rb
@@ -8,6 +8,11 @@ class ModuleAttributeAccessorTest < ActiveSupport::TestCase
       mattr_accessor :bar, :instance_writer => false
       mattr_reader   :shaq, :instance_reader => false
       mattr_accessor :camp, :instance_accessor => false
+
+      cattr_accessor(:defa) { 'default_accessor_value' }
+      cattr_reader(:defr) { 'default_reader_value' }
+      cattr_writer(:defw) { 'default_writer_value' }
+      cattr_accessor(:quux) { :quux }
     end
     @class = Class.new
     @class.instance_eval { include m }
@@ -27,6 +32,11 @@ class ModuleAttributeAccessorTest < ActiveSupport::TestCase
     assert_equal :test2, @module.foo
   end
 
+  def test_cattr_accessor_default_value
+    assert_equal :quux, @module.quux
+    assert_equal :quux, @object.quux
+  end
+
   def test_should_not_create_instance_writer
     assert_respond_to @module, :foo
     assert_respond_to @module, :foo=
@@ -46,16 +56,24 @@ class ModuleAttributeAccessorTest < ActiveSupport::TestCase
   end
 
   def test_should_raise_name_error_if_attribute_name_is_invalid
-    assert_raises NameError do
+    exception = assert_raises NameError do
       Class.new do
-        mattr_reader "invalid attribute name"
+        cattr_reader "1nvalid"
       end
     end
+    assert_equal "invalid attribute name: 1nvalid", exception.message
 
-    assert_raises NameError do
+    exception = assert_raises NameError do
       Class.new do
-        mattr_writer "invalid attribute name"
+        cattr_writer "1nvalid"
       end
     end
+    assert_equal "invalid attribute name: 1nvalid", exception.message
+  end
+
+  def test_should_use_default_value_if_block_passed
+    assert_equal 'default_accessor_value', @module.defa
+    assert_equal 'default_reader_value', @module.defr
+    assert_equal 'default_writer_value', @module.class_variable_get('@@defw')
   end
 end