Added test coverage for Inflector.inflections.clear. Closes #7179. [Rich Collins]. Remove unused code from Duration#inspect. Closes #7180. [Rich Collins]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6022 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 33 insertions, 0 deletions

diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index 7dace1a7a9..d068a9892f 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -327,4 +327,37 @@ class InflectorTest < Test::Unit::TestCase
       assert_equal(lower_camel, Inflector.camelize(underscored, false))
     end
   end
+  
+  %w{plurals singulars uncountables}.each do |inflection_type|
+    class_eval "
+      def test_clear_#{inflection_type}
+        cached_values = Inflector.inflections.#{inflection_type}
+        Inflector.inflections.clear :#{inflection_type}
+        assert Inflector.inflections.#{inflection_type}.empty?, \"#{inflection_type} inflections should be empty after clear :#{inflection_type}\"
+        Inflector.inflections.instance_variable_set :@#{inflection_type}, cached_values
+      end
+    "
+  end
+  
+  def test_clear_all
+    cached_values = Inflector.inflections.plurals, Inflector.inflections.singulars, Inflector.inflections.uncountables
+    Inflector.inflections.clear :all
+    assert Inflector.inflections.plurals.empty?
+    assert Inflector.inflections.singulars.empty?
+    assert Inflector.inflections.uncountables.empty?
+    Inflector.inflections.instance_variable_set :@plurals, cached_values[0]
+    Inflector.inflections.instance_variable_set :@singulars, cached_values[1]
+    Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
+  end
+  
+  def test_clear_with_default
+    cached_values = Inflector.inflections.plurals, Inflector.inflections.singulars, Inflector.inflections.uncountables
+    Inflector.inflections.clear
+    assert Inflector.inflections.plurals.empty?
+    assert Inflector.inflections.singulars.empty?
+    assert Inflector.inflections.uncountables.empty?
+    Inflector.inflections.instance_variable_set :@plurals, cached_values[0]
+    Inflector.inflections.instance_variable_set :@singulars, cached_values[1]
+    Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
+  end
 end