puppet 0.23.2 → 0.24.0

data/test/lib/mocha/parameter_matchers/has_entry.rb

@@ -0,0 +1,39 @@
+module Mocha
+  
+  module ParameterMatchers
+
+    # :call-seq: has_entry(key, value) -> parameter_matcher
+    #
+    # Matches +Hash+ containing entry with +key+ and +value+.
+    #   object = mock()
+    #   object.expects(:method_1).with(has_entry('key_1', 1))
+    #   object.method_1('key_1' => 1, 'key_2' => 2)
+    #   # no error raised
+    #
+    #   object = mock()
+    #   object.expects(:method_1).with(has_entry('key_1', 1))
+    #   object.method_1('key_1' => 2, 'key_2' => 1)
+    #   # error raised, because method_1 was not called with Hash containing entry: 'key_1' => 1
+    def has_entry(key, value)
+      HasEntry.new(key, value)
+    end
+
+    class HasEntry # :nodoc:
+      
+      def initialize(key, value)
+        @key, @value = key, value
+      end
+      
+      def ==(parameter)
+        parameter[@key] == @value
+      end
+      
+      def mocha_inspect
+        "has_entry(#{@key.mocha_inspect}, #{@value.mocha_inspect})"
+      end
+      
+    end
+    
+  end
+  
+end

data/test/lib/mocha/parameter_matchers/has_key.rb

@@ -0,0 +1,39 @@
+module Mocha
+  
+  module ParameterMatchers
+
+    # :call-seq: has_key(key) -> parameter_matcher
+    #
+    # Matches +Hash+ containing +key+.
+    #   object = mock()
+    #   object.expects(:method_1).with(has_key('key_1'))
+    #   object.method_1('key_1' => 1, 'key_2' => 2)
+    #   # no error raised
+    #
+    #   object = mock()
+    #   object.expects(:method_1).with(has_key('key_1'))
+    #   object.method_1('key_2' => 2)
+    #   # error raised, because method_1 was not called with Hash containing key: 'key_1'
+    def has_key(key)
+      HasKey.new(key)
+    end
+
+    class HasKey # :nodoc:
+      
+      def initialize(key)
+        @key = key
+      end
+      
+      def ==(parameter)
+        parameter.keys.include?(@key)
+      end
+      
+      def mocha_inspect
+        "has_key(#{@key.mocha_inspect})"
+      end
+      
+    end
+    
+  end
+  
+end

data/test/lib/mocha/parameter_matchers/has_value.rb

@@ -0,0 +1,39 @@
+module Mocha
+  
+  module ParameterMatchers
+
+    # :call-seq: has_value(value) -> parameter_matcher
+    #
+    # Matches +Hash+ containing +value+.
+    #   object = mock()
+    #   object.expects(:method_1).with(has_value(1))
+    #   object.method_1('key_1' => 1, 'key_2' => 2)
+    #   # no error raised
+    #
+    #   object = mock()
+    #   object.expects(:method_1).with(has_value(1))
+    #   object.method_1('key_2' => 2)
+    #   # error raised, because method_1 was not called with Hash containing value: 1
+    def has_value(value)
+      HasValue.new(value)
+    end
+
+    class HasValue # :nodoc:
+      
+      def initialize(value)
+        @value = value
+      end
+      
+      def ==(parameter)
+        parameter.values.include?(@value)
+      end
+      
+      def mocha_inspect
+        "has_value(#{@value.mocha_inspect})"
+      end
+      
+    end
+    
+  end
+  
+end

data/test/lib/mocha/parameter_matchers/includes.rb

@@ -0,0 +1,37 @@
+module Mocha
+  
+  module ParameterMatchers
+
+    # :call-seq: includes(item) -> parameter_matcher
+    #
+    # Matches any object that responds true to include?(item)
+    #   object = mock()
+    #   object.expects(:method_1).with(includes('foo'))
+    #   object.method_1(['foo', 'bar'])
+    #   # no error raised
+    #
+    #   object.method_1(['baz'])
+    #   # error raised, because ['baz'] does not include 'foo'.
+    def includes(item)
+      Includes.new(item)
+    end
+
+    class Includes # :nodoc:
+
+      def initialize(item)
+        @item = item
+      end
+
+      def ==(parameter)
+        return parameter.include?(@item)
+      end
+
+      def mocha_inspect
+        "includes(#{@item.mocha_inspect})"
+      end
+
+    end
+
+  end
+  
+end

data/test/lib/mocha/return_values.rb

@@ -0,0 +1,31 @@
+require 'mocha/single_return_value'
+
+module Mocha # :nodoc:
+  
+  class ReturnValues # :nodoc:
+    
+    def self.build(*values)
+      new(*values.map { |value| SingleReturnValue.new(value) })
+    end
+    
+    attr_accessor :values
+    
+    def initialize(*values)
+      @values = values
+    end
+    
+    def next
+      case @values.size
+      when 0: nil
+      when 1: @values.first.evaluate
+      else @values.shift.evaluate
+      end
+    end
+    
+    def +(other)
+      self.class.new(*(@values + other.values))
+    end
+    
+  end
+  
+end

data/test/lib/mocha/single_return_value.rb

@@ -0,0 +1,24 @@
+require 'mocha/is_a'
+require 'mocha/deprecation'
+
+module Mocha # :nodoc:
+  
+  class SingleReturnValue # :nodoc:
+    
+    def initialize(value)
+      @value = value
+    end
+    
+    def evaluate
+      if @value.__is_a__(Proc) then
+        message = 'use of Expectation#returns with instance of Proc - see Expectation#returns RDoc for alternatives'
+        Deprecation.warning(message)
+        @value.call
+      else
+        @value
+      end
+    end
+    
+  end
+  
+end

data/test/lib/mocha/single_yield.rb

@@ -0,0 +1,18 @@
+module Mocha # :nodoc:
+  
+  class SingleYield # :nodoc:
+    
+    attr_reader :parameters
+    
+    def initialize(*parameters)
+      @parameters = parameters
+    end
+    
+    def each
+      yield(@parameters)
+    end
+    
+  end
+  
+end
+    

data/test/lib/mocha/standalone.rb

@@ -1,4 +1,5 @@
 require 'mocha/auto_verify'
+require 'mocha/parameter_matchers'
 require 'mocha/setup_and_teardown'
 
 module Mocha
@@ -6,6 +7,7 @@ module Mocha
   module Standalone
     
     include AutoVerify
+    include ParameterMatchers
     include SetupAndTeardown
     
     def mocha_setup

data/test/lib/mocha/stub.rb

@@ -0,0 +1,18 @@
+require 'mocha/expectation'
+
+module Mocha # :nodoc:
+
+  class Stub < Expectation # :nodoc:
+
+    def initialize(mock, method_name, backtrace = nil)
+      super
+      @expected_count = Range.at_least(0)
+    end
+    
+    def verify
+      true
+    end
+
+  end
+
+end

data/test/lib/mocha/test_case_adapter.rb

@@ -22,8 +22,8 @@ module Mocha
               add_failure(e.message, e.backtrace)
             rescue Test::Unit::AssertionFailedError => e
               add_failure(e.message, e.backtrace)
-            rescue StandardError, ScriptError => e
-              add_error(e)
+            rescue StandardError, ScriptError
+              add_error($!)
             ensure
               begin
                 teardown
@@ -46,4 +46,4 @@ module Mocha
     
   end
   
-end
+end

data/test/lib/mocha/yield_parameters.rb

@@ -0,0 +1,31 @@
+require 'mocha/no_yields'
+require 'mocha/single_yield'
+require 'mocha/multiple_yields'
+
+module Mocha # :nodoc:
+  
+  class YieldParameters # :nodoc:
+    
+    def initialize
+      @parameter_groups = []
+    end
+    
+    def next_invocation
+      case @parameter_groups.size
+      when 0: NoYields.new
+      when 1: @parameter_groups.first
+      else @parameter_groups.shift
+      end
+    end
+    
+    def add(*parameters)
+      @parameter_groups << SingleYield.new(*parameters)
+    end
+    
+    def multiple_add(*parameter_groups)
+      @parameter_groups << MultipleYields.new(*parameter_groups)
+    end
+    
+  end
+  
+end

data/test/lib/puppettest.rb

@@ -1,10 +1,18 @@
 # Add .../test/lib
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
+testlib = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift(testlib) unless $LOAD_PATH.include?(testlib)
 # Add .../lib
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../lib')))
+mainlib = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
+$LOAD_PATH.unshift(mainlib) unless $LOAD_PATH.include?(mainlib)
 
 require 'puppet'
-require 'test/unit'
+require 'mocha'
+
+# Only load the test/unit class if we're not in the spec directory.
+# Else we get the bogus 'no tests, no failures' message.
+unless Dir.getwd =~ /spec/
+    require 'test/unit'
+end
 
 # Yay; hackish but it works
 if ARGV.include?("-d")
@@ -12,6 +20,17 @@ if ARGV.include?("-d")
     $console = true
 end
 
+# Some monkey-patching to allow us to test private methods.
+class Class
+    def publicize_methods(*methods)
+        saved_private_instance_methods = methods.empty? ? self.private_instance_methods : methods
+
+        self.class_eval { public *saved_private_instance_methods }
+        yield
+        self.class_eval { private *saved_private_instance_methods }
+    end
+end
+
 module PuppetTest
     # Munge cli arguments, so we can enable debugging if we want
     # and so we can run just specific methods.
@@ -71,10 +90,6 @@ module PuppetTest
         end
     end
 
-    def cleanup(&block)
-        @@cleaners << block
-    end
-
     def datadir(*list)
         File.join(basedir, "test", "data", *list)
     end
@@ -93,6 +108,10 @@ module PuppetTest
 
     module_function :basedir, :datadir, :exampledir
 
+    def cleanup(&block)
+        @@cleaners << block
+    end
+
     # Rails clobbers RUBYLIB, thanks
     def libsetup
         curlibs = ENV["RUBYLIB"].split(":")
@@ -140,7 +159,7 @@ module PuppetTest
         end
 
         @configpath = File.join(tmpdir,
-            self.class.to_s + "configdir" + @@testcount.to_s + "/"
+            "configdir" + @@testcount.to_s + "/"
         )
 
         unless defined? $user and $group
@@ -148,7 +167,7 @@ module PuppetTest
             $group = nonrootgroup().gid.to_s
         end
 
-        Puppet.config.clear
+        Puppet.settings.clear
         Puppet[:user] = $user
         Puppet[:group] = $group
 
@@ -187,6 +206,8 @@ module PuppetTest
         end
 
         Puppet[:ignoreschedules] = true
+
+        #@start = Time.now
     end
 
     def tempfile
@@ -196,8 +217,7 @@ module PuppetTest
             @@tmpfilenum = 1
         end
 
-        f = File.join(self.tmpdir(), self.class.to_s + "_" + @method_name.to_s +
-                      @@tmpfilenum.to_s)
+        f = File.join(self.tmpdir(), "tempfile_" + @@tmpfilenum.to_s)
         @@tmpfiles << f
         return f
     end
@@ -222,11 +242,11 @@ module PuppetTest
                       when "Darwin": "/private/tmp"
                       when "SunOS": "/var/tmp"
                       else
-            "/tmp"
+                            "/tmp"
                       end
 
 
-            @tmpdir = File.join(@tmpdir, "puppettesting")
+            @tmpdir = File.join(@tmpdir, "puppettesting" + Process.pid.to_s)
 
             unless File.exists?(@tmpdir)
                 FileUtils.mkdir_p(@tmpdir)
@@ -237,6 +257,8 @@ module PuppetTest
     end
 
     def teardown
+        #@stop = Time.now
+        #File.open("/tmp/test_times.log", ::File::WRONLY|::File::CREAT|::File::APPEND) { |f| f.puts "%0.4f %s %s" % [@stop - @start, @method_name, self.class] }
         @@cleaners.each { |cleaner| cleaner.call() }
 
         @@tmpfiles.each { |file|
@@ -259,6 +281,8 @@ module PuppetTest
         Puppet::Type.allclear
         Puppet::Util::Storage.clear
         Puppet.clear
+        Puppet.settings.clear
+        Puppet::Indirector::Indirection.clear_cache
 
         @memoryatend = Puppet::Util.memory
         diff = @memoryatend - @memoryatstart
@@ -282,12 +306,7 @@ module PuppetTest
         rescue Timeout::Error
             # just move on
         end
-        if File.stat("/dev/null").mode & 007777 != 0666
-            File.open("/tmp/nullfailure", "w") { |f|
-                f.puts self.class
-            }
-            exit(74)
-        end
+        mocha_verify
     end
 
     def logstore
@@ -304,4 +323,3 @@ require 'puppettest/parsertesting'
 require 'puppettest/servertest'
 require 'puppettest/testcase'
 
-# $Id$