param_test 0.0.1 → 0.0.2

data/lib/active_support/testing/parametrized.rb

@@ -28,6 +28,13 @@ module ActiveSupport
       #   end
       #
       def param_test(description_template, parameters, &block)
+        param_count = format_sequence_count(description_template)
+
+        if param_count != block.arity
+          raise ArgumentError, "Number of arguments expected in description template " +
+            "'#{description_template}', doesn't match number of argument to block (#{block.arity})"
+        end
+
         parameters.each do |param_set|
           # Replacing nil values with 'nil' string because nil values will
           # get converted to an empty string within a test name.
@@ -36,17 +43,16 @@ module ActiveSupport
               param.nil? ? 'nil' : param
             end
           else
-            sanitized_param_set = param_set.nil? ? 'nil' : param_set
+            sanitized_param_set = param_set.nil? ? ['nil'] : [param_set]
           end
 
-          begin
-            description = description_template % sanitized_param_set
-          rescue ArgumentError
-            raise ArgumentError, "Parameter set #{param_set} doesn't match number " +
+          if param_count != sanitized_param_set.size
+            raise ArgumentError, "Parameter set #{sanitized_param_set} doesn't match number " +
               "of arguments expected by description template '#{description_template}'"
           end
 
           # Make sure the description generates a unique test method name.
+          description = description_template % sanitized_param_set
           unique_description = description
           if instance_methods.include? generate_test_name(unique_description)
             count = 1
@@ -71,6 +77,13 @@ module ActiveSupport
         sanitized_description = description.gsub(/\s+/,'_')
         "test_#{sanitized_description}".to_sym
       end
+
+      def format_sequence_count(format_string)
+        sequences = format_string.scan(/%+/).select do |match|
+          match.size.odd?
+        end
+        sequences.size
+      end
     end
   end
 end

data/param_test.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'param_test'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Nik Haldimann']
   s.email       = ['nhaldimann@gmail.com']

data/test/param_test_meta_test.rb

@@ -13,7 +13,7 @@ class ParamTestMetaTest < ActiveSupport::TestCase
 
   test "empty parameters adds no tests" do
     test_case = Class.new ActiveSupport::TestCase do
-      param_test "adds no tests", [] do |param| end
+      param_test "adds no tests", [] do || end
     end
     assert_test_method_count test_case, 0
   end
@@ -44,11 +44,32 @@ class ParamTestMetaTest < ActiveSupport::TestCase
     assert_has_test_method test_case, :test_with_two_params_43_44
   end
 
-  test "uneven parameter lists fails" do
+  param_test "mismatching parameter list %s fails for %s", [
+    [[[43]], "%s %s"],
+    [[[41, 42, 43]], "%s %s"],
+  ] do |params, description|
+    assert_raise ArgumentError do
+      Class.new ActiveSupport::TestCase do
+        param_test description,
+          params do |first, second| end
+      end
+    end
+  end
+
+  test "wrong block arity fails" do
+    assert_raise ArgumentError do
+      Class.new ActiveSupport::TestCase do
+        param_test "%s %s",
+          [[41, 42]] do |first| end
+      end
+    end
+  end
+
+  test "more wrong block arity fails" do
     assert_raise ArgumentError do
       Class.new ActiveSupport::TestCase do
         param_test "%s %s",
-          [[41, 42], [43], [44, 45]] do |first, second| end
+          [[41, 42]] do |first, second, third| end
       end
     end
   end
@@ -56,7 +77,7 @@ class ParamTestMetaTest < ActiveSupport::TestCase
   test "substitutes nil string for nil" do
     test_case = Class.new ActiveSupport::TestCase do
       param_test "params %s %s",
-        [[nil, nil]] do |param| end
+        [[nil, nil]] do |first, second| end
     end
     assert_test_method_count test_case, 1
     assert_has_test_method test_case, :test_params_nil_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: param_test
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport