Renamed YieldParameter related classes.

lib/mocha/multiple_yield_parameter_group.rb → lib/mocha/multiple_yields.rb

@@ -1,6 +1,6 @@
 module Mocha # :nodoc:
 
-  class MultipleYieldParameterGroup # :nodoc:
+  class MultipleYields # :nodoc:
 
     attr_reader :parameter_groups
 

lib/mocha/null_yield_parameter_group.rb → lib/mocha/no_yields.rb

@@ -1,6 +1,6 @@
 module Mocha # :nodoc:
 
-  class NullYieldParameterGroup # :nodoc:
+  class NoYields # :nodoc:
 
     def each
     end

lib/mocha/single_yield_parameter_group.rb → lib/mocha/single_yield.rb

@@ -1,6 +1,6 @@
 module Mocha # :nodoc:
 
-  class SingleYieldParameterGroup # :nodoc:
+  class SingleYield # :nodoc:
 
     attr_reader :parameters
 

lib/mocha/yield_parameters.rb

@@ -1,6 +1,6 @@
-require 'mocha/single_yield_parameter_group'
-require 'mocha/null_yield_parameter_group'
-require 'mocha/multiple_yield_parameter_group'
+require 'mocha/no_yields'
+require 'mocha/single_yield'
+require 'mocha/multiple_yields'
 
 module Mocha # :nodoc:
 
@@ -12,18 +12,18 @@ def initialize
 
     def next_invocation
       case @parameter_groups.size
-      when 0: NullYieldParameterGroup.new
+      when 0: NoYields.new
       when 1: @parameter_groups.first
       else @parameter_groups.shift
       end
     end
 
     def add(*parameters)
-      @parameter_groups << SingleYieldParameterGroup.new(*parameters)
+      @parameter_groups << SingleYield.new(*parameters)
     end
 
     def multiple_add(*parameter_groups)
-      @parameter_groups << MultipleYieldParameterGroup.new(*parameter_groups)
+      @parameter_groups << MultipleYields.new(*parameter_groups)
     end
 
   end

test/unit/multiple_yield_parameter_group_test.rb → test/unit/multiple_yields_test.rb

@@ -1,13 +1,13 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 
-require 'mocha/multiple_yield_parameter_group'
+require 'mocha/multiple_yields'
 
-class MultipleYieldParameterGroupTest < Test::Unit::TestCase
+class MultipleYieldsTest < Test::Unit::TestCase
 
   include Mocha
 
   def test_should_provide_parameters_for_multiple_yields_in_single_invocation
-    parameter_group = MultipleYieldParameterGroup.new([1, 2, 3], [4, 5])
+    parameter_group = MultipleYields.new([1, 2, 3], [4, 5])
     parameter_groups = []
     parameter_group.each do |parameters|
       parameter_groups << parameters

test/unit/null_yield_parameter_group_test.rb → test/unit/no_yield_test.rb

@@ -1,13 +1,13 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 
-require 'mocha/null_yield_parameter_group'
+require 'mocha/no_yields'
 
-class NullYieldParameterGroupTest < Test::Unit::TestCase
+class NoYieldsTest < Test::Unit::TestCase
 
   include Mocha
 
   def test_should_provide_parameters_for_no_yields_in_single_invocation
-    parameter_group = NullYieldParameterGroup.new
+    parameter_group = NoYields.new
     parameter_groups = []
     parameter_group.each do |parameters|
       parameter_groups << parameters

test/unit/single_yield_parameter_group_test.rb → test/unit/single_yield_test.rb

@@ -1,13 +1,13 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 
-require 'mocha/single_yield_parameter_group'
+require 'mocha/single_yield'
 
-class SingleYieldParameterGroupTest < Test::Unit::TestCase
+class SingleYieldTest < Test::Unit::TestCase
 
   include Mocha
 
   def test_should_provide_parameters_for_single_yield_in_single_invocation
-    parameter_group = SingleYieldParameterGroup.new(1, 2, 3)
+    parameter_group = SingleYield.new(1, 2, 3)
     parameter_groups = []
     parameter_group.each do |parameters|
       parameter_groups << parameters

test/unit/yield_parameters_test.rb

@@ -1,21 +1,24 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 
 require 'mocha/yield_parameters'
+require 'mocha/no_yields'
+require 'mocha/single_yield'
+require 'mocha/multiple_yields'
 
 class YieldParametersTest < Test::Unit::TestCase
 
   include Mocha
 
   def test_should_return_null_yield_parameter_group_by_default
     yield_parameters = YieldParameters.new
-    assert yield_parameters.next_invocation.is_a?(NullYieldParameterGroup)
+    assert yield_parameters.next_invocation.is_a?(NoYields)
   end
 
   def test_should_return_single_yield_parameter_group
     yield_parameters = YieldParameters.new
     yield_parameters.add(1, 2, 3)
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYieldParameterGroup)
+    assert parameter_group.is_a?(SingleYield)
     assert_equal [1, 2, 3], parameter_group.parameters
   end
 
@@ -24,10 +27,10 @@ def test_should_keep_returning_single_yield_parameter_group
     yield_parameters.add(1, 2, 3)
     yield_parameters.next_invocation
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYieldParameterGroup)
+    assert parameter_group.is_a?(SingleYield)
     assert_equal [1, 2, 3], parameter_group.parameters
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYieldParameterGroup)
+    assert parameter_group.is_a?(SingleYield)
     assert_equal [1, 2, 3], parameter_group.parameters
   end
 
@@ -36,18 +39,18 @@ def test_should_return_consecutive_single_yield_parameter_groups
     yield_parameters.add(1, 2, 3)
     yield_parameters.add(4, 5)
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYieldParameterGroup)
+    assert parameter_group.is_a?(SingleYield)
     assert_equal [1, 2, 3], parameter_group.parameters
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYieldParameterGroup)
+    assert parameter_group.is_a?(SingleYield)
     assert_equal [4, 5], parameter_group.parameters
   end
 
   def test_should_return_multiple_yield_parameter_group
     yield_parameters = YieldParameters.new
     yield_parameters.multiple_add([1, 2, 3], [4, 5])
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYieldParameterGroup)
+    assert parameter_group.is_a?(MultipleYields)
     assert_equal [[1, 2, 3], [4, 5]], parameter_group.parameter_groups
   end
 
@@ -56,10 +59,10 @@ def test_should_keep_returning_multiple_yield_parameter_group
     yield_parameters.multiple_add([1, 2, 3], [4, 5])
     yield_parameters.next_invocation
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYieldParameterGroup)
+    assert parameter_group.is_a?(MultipleYields)
     assert_equal [[1, 2, 3], [4, 5]], parameter_group.parameter_groups
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYieldParameterGroup)
+    assert parameter_group.is_a?(MultipleYields)
     assert_equal [[1, 2, 3], [4, 5]], parameter_group.parameter_groups
   end
 
@@ -68,10 +71,10 @@ def test_should_return_consecutive_multiple_yield_parameter_groups
     yield_parameters.multiple_add([1, 2, 3], [4, 5])
     yield_parameters.multiple_add([6, 7], [8, 9, 0])
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYieldParameterGroup)
+    assert parameter_group.is_a?(MultipleYields)
     assert_equal [[1, 2, 3], [4, 5]], parameter_group.parameter_groups
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYieldParameterGroup)
+    assert parameter_group.is_a?(MultipleYields)
     assert_equal [[6, 7], [8, 9, 0]], parameter_group.parameter_groups
   end
 
@@ -80,10 +83,10 @@ def test_should_return_consecutive_single_and_multiple_yield_parameter_groups
     yield_parameters.add(1, 2, 3)
     yield_parameters.multiple_add([4, 5, 6], [7, 8])
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(SingleYieldParameterGroup)
+    assert parameter_group.is_a?(SingleYield)
     assert_equal [1, 2, 3], parameter_group.parameters
     parameter_group = yield_parameters.next_invocation
-    assert parameter_group.is_a?(MultipleYieldParameterGroup)
+    assert parameter_group.is_a?(MultipleYields)
     assert_equal [[4, 5, 6], [7, 8]], parameter_group.parameter_groups
   end