merge with local tweaks

3 files changed, 101 insertions, 4 deletions

diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
index 7563be44f8..62a1f61d53 100644
--- a/activesupport/test/core_ext/array_ext_test.rb
+++ b/activesupport/test/core_ext/array_ext_test.rb
@@ -99,7 +99,7 @@ class ArrayExtToSTests < Test::Unit::TestCase
 end
 
 class ArrayExtGroupingTests < Test::Unit::TestCase
-  def test_group_by_with_perfect_fit
+  def test_in_groups_of_with_perfect_fit
     groups = []
     ('a'..'i').to_a.in_groups_of(3) do |group|
       groups << group
@@ -109,7 +109,7 @@ class ArrayExtGroupingTests < Test::Unit::TestCase
     assert_equal [%w(a b c), %w(d e f), %w(g h i)], ('a'..'i').to_a.in_groups_of(3)
   end
 
-  def test_group_by_with_padding
+  def test_in_groups_of_with_padding
     groups = []
     ('a'..'g').to_a.in_groups_of(3) do |group|
       groups << group
@@ -118,7 +118,7 @@ class ArrayExtGroupingTests < Test::Unit::TestCase
     assert_equal [%w(a b c), %w(d e f), ['g', nil, nil]], groups
   end
 
-  def test_group_by_pads_with_specified_values
+  def test_in_groups_of_pads_with_specified_values
     groups = []
 
     ('a'..'g').to_a.in_groups_of(3, 'foo') do |group|
@@ -128,7 +128,7 @@ class ArrayExtGroupingTests < Test::Unit::TestCase
     assert_equal [%w(a b c), %w(d e f), ['g', 'foo', 'foo']], groups
   end
 
-  def test_group_without_padding
+  def test_in_groups_of_without_padding
     groups = []
 
     ('a'..'g').to_a.in_groups_of(3, false) do |group|
@@ -137,6 +137,48 @@ class ArrayExtGroupingTests < Test::Unit::TestCase
 
     assert_equal [%w(a b c), %w(d e f), ['g']], groups
   end
+
+  def test_in_groups_returned_array_size
+    array = (1..7).to_a
+
+    1.upto(array.size + 1) do |number|
+      assert_equal number, array.in_groups(number).size
+    end
+  end
+
+  def test_in_groups_with_empty_array
+    assert_equal [[], [], []], [].in_groups(3)
+  end
+
+  def test_in_groups_with_block
+    array = (1..9).to_a
+    groups = []
+
+    array.in_groups(3) do |group|
+      groups << group
+    end
+
+    assert_equal array.in_groups(3), groups
+  end
+
+  def test_in_groups_with_perfect_fit
+    assert_equal [[1, 2, 3], [4, 5, 6], [7, 8, 9]],
+      (1..9).to_a.in_groups(3)
+  end
+
+  def test_in_groups_with_padding
+    array = (1..7).to_a
+
+    assert_equal [[1, 2, 3], [4, 5, nil], [6, 7, nil]],
+      array.in_groups(3)
+    assert_equal [[1, 2, 3], [4, 5, 'foo'], [6, 7, 'foo']],
+      array.in_groups(3, 'foo')
+  end
+
+  def test_in_groups_without_padding
+    assert_equal [[1, 2, 3], [4, 5], [6, 7]],
+      (1..7).to_a.in_groups(3, false)
+  end
 end
 
 class ArraySplitTests < Test::Unit::TestCase
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index ac52a1be0b..dfe04485be 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -320,8 +320,11 @@ class TimeWithZoneTest < Test::Unit::TestCase
       marshal_str = Marshal.dump(@twz)
       mtime = Marshal.load(marshal_str)
       assert_equal Time.utc(2000, 1, 1, 0), mtime.utc
+      assert mtime.utc.utc?
       assert_equal ActiveSupport::TimeZone['Eastern Time (US & Canada)'], mtime.time_zone
       assert_equal Time.utc(1999, 12, 31, 19), mtime.time
+      assert mtime.time.utc?
+      assert_equal @twz.inspect, mtime.inspect
     end
   end
 
@@ -331,8 +334,11 @@ class TimeWithZoneTest < Test::Unit::TestCase
       marshal_str = Marshal.dump(twz)
       mtime = Marshal.load(marshal_str)
       assert_equal Time.utc(2000, 1, 1, 0), mtime.utc
+      assert mtime.utc.utc?
       assert_equal 'America/New_York', mtime.time_zone.name
       assert_equal Time.utc(1999, 12, 31, 19), mtime.time
+      assert mtime.time.utc?
+      assert_equal @twz.inspect, mtime.inspect
     end
   end
 
diff --git a/activesupport/test/memoizable_test.rb b/activesupport/test/memoizable_test.rb
new file mode 100644
index 0000000000..fc24a2942d
--- /dev/null
+++ b/activesupport/test/memoizable_test.rb
@@ -0,0 +1,49 @@
+require 'abstract_unit'
+
+uses_mocha 'Memoizable' do
+  class MemoizableTest < Test::Unit::TestCase
+    class Person
+      include ActiveSupport::Memoizable
+
+      def name
+        fetch_name_from_floppy
+      end
+      memoize :name
+
+      def age
+        nil
+      end
+      memoize :age
+
+      private
+        def fetch_name_from_floppy
+          "Josh"
+        end
+    end
+
+    def test_memoization
+      person = Person.new
+      assert_equal "Josh", person.name
+
+      person.expects(:fetch_name_from_floppy).never
+      2.times { assert_equal "Josh", person.name }
+    end
+
+    def test_memoized_methods_are_frozen
+      person = Person.new
+      person.freeze
+      assert_equal "Josh", person.name
+      assert_equal true, person.name.frozen?
+    end
+
+    def test_memoization_frozen_with_nil_value
+      person = Person.new
+      person.freeze
+      assert_equal nil, person.age
+    end
+
+    def test_double_memoization
+      assert_raise(RuntimeError) { Person.memoize :name }
+    end
+  end
+end