Changeset 7117

Timestamp:

06/25/07 18:22:31 (2 years ago)

Author:

bitsweat

Message:

Improve various test coverage. Closes #8676 [kamal]

Files:

• trunk/activesupport/test/clean_logger_test.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/blank_test.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/class_test.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/numeric_ext_test.rb (modified) (1 diff)
• trunk/activesupport/test/json/decoding_test.rb (modified) (1 diff)
• trunk/activesupport/test/time_zone_test.rb (modified) (2 diffs)

trunk/activesupport/test/clean_logger_test.rb

@@ -46 +46 @@
-    @logger.datetime_format = "%Y-%m-%d"
-    @logger.debug 'debug'
+    assert_equal "%Y-%m-%d", @logger.datetime_format
-    assert_match(/D, \[\d\d\d\d-\d\d-\d\d#\d+\] DEBUG -- : debug/, @out.string)
-  end

trunk/activesupport/test/core_ext/blank_test.rb

@@ -4 +4 @@
-  BLANK = [nil, false, '', '   ', "  \n\t  \r ", [], {}]
-  NOT   = [true, 0, 1, 'a', [nil], { nil => 0 }]
+  
+  class EmptyObject
+    def empty?
+      true
+    end
+    alias :strip :empty?
+  end
+  class NoStripObject < EmptyObject; undef :strip; end
+  class NoEmptyStripObject < NoStripObject; undef :empty?; end
-
-  def test_blank
-    BLANK.each { |v| assert v.blank?  }
-    NOT.each   { |v| assert !v.blank? }
+    assert EmptyObject.new.blank?
+    assert NoStripObject.new.blank?
+    assert !NoEmptyStripObject.new.blank?
-  end
-end

trunk/activesupport/test/core_ext/class_test.rb

@@ -34 +34 @@
-    assert_raises(NameError) { Y::Z::C.is_a?(Class) }
-  end
+  
+  def test_retrieving_subclasses
+    @parent   = eval("class D; end; D")
+    @sub      = eval("class E < D; end; E")
+    @subofsub = eval("class F < E; end; F")
+    assert @parent.subclasses.all? { |i| [@sub.to_s, @subofsub.to_s].include?(i) }
+    assert_equal 2, @parent.subclasses.size
+    assert_equal [@subofsub.to_s], @sub.subclasses
+    assert_equal [], @subofsub.subclasses
+  end
-end

trunk/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb

@@ -206 +206 @@
-    assert_equal 0, @klass.a.keys.size
-  end
+  
+  def test_reset_inheritable_attributes
+    @klass.class_inheritable_accessor :a
+    @klass.a = 'a'
+
+    @sub = eval("class Inheriting < @klass; end; Inheriting")
+
+    assert_equal 'a', @klass.a
+    assert_equal 'a', @sub.a
+
+    @klass.reset_inheritable_attributes
+    @sub = eval("class NotInheriting < @klass; end; NotInheriting")
+
+    assert_equal nil, @klass.a
+    assert_equal nil, @sub.a
+  end
-end

trunk/activesupport/test/core_ext/numeric_ext_test.rb

@@ -105 +105 @@
-  def test_unit_in_terms_of_another
-    relationships = {
+        1024.bytes     =>   1.kilobyte,
-        1024.kilobytes =>   1.megabyte,
-      3584.0.kilobytes => 3.5.megabytes,

trunk/activesupport/test/json/decoding_test.rb

@@ -26 +26 @@
-    end
-  end
+  
+  def test_failed_json_decoding
+    assert_raises(ActiveSupport::JSON::ParseError) { ActiveSupport::JSON.decode(%({: 1})) }
+  end
-end

trunk/activesupport/test/time_zone_test.rb

@@ -81 +81 @@
-    assert_nil TimeZone["bogus"]
-    assert_not_nil TimeZone["Central Time (US & Canada)"]
+    assert_not_nil TimeZone[8]
+    assert_raises(ArgumentError) { TimeZone[false] }
-  end
-
+
-  def test_new
-    a = TimeZone.new("Berlin")
@@ -89 +91 @@
-    assert_nil TimeZone.new("bogus")
-  end
+  
+  def test_us_zones
+    assert TimeZone.us_zones.include?(TimeZone["Hawaii"])
+    assert !TimeZone.us_zones.include?(TimeZone["Kuala Lumpur"])
+  end 
-end