mcollective-test 0.4.3 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: '09fe1fb38a726df66f6f2eaa11d686d051be473dfbddb505192f315fb14155cd'
+  data.tar.gz: a2716539431f26ab49178a4ec0db25d0593be3a1d88da74242981655b9dce9c8
+SHA512:
+  metadata.gz: c28142f4dd7d8efa665fdb5e1e98eca8c72a30bf239083a864c8f96056b3e1f3d54a46f5936733e5928a75d5865383cfc582c9e488a59effe45fa7f3b4f8b69e
+  data.tar.gz: 52a7ddd99061d7598c40a5191d55882a0c20cd9e0acc1a65bb2785e9985d80c3b3969ba76ff864552086eb11f14746855ef1f4214ba657eac5cd970d645d31be

data/.gitignore

@@ -0,0 +1,2 @@
+Gemfile.lock
+pkg

data/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in mcollective-test.gemspec
+gemspec
+
+gem "rake"

data/README.md

@@ -0,0 +1,2 @@
+A set of helpers to assist in writing unit and integration tests
+for MCollective Agents and Applications.

data/Rakefile

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"

data/lib/mcollective/test/matchers/application_description.rb

@@ -1,39 +1,31 @@
-module MCollective
-  module Test
-    module Matchers
-      def have_a_description(description=nil); ApplicationDescription.new(description); end
+RSpec::Matchers.define(:have_a_description) do |expected|
+  match do |actual|
+    actual = actual.application_description
 
-      class ApplicationDescription
-        def initialize(match=nil)
-          @match = match
-        end
+    if expected
+      actual == expected
+    else
+      !actual.nil?
+    end
+  end
 
-        def matches?(actual)
-          @actual = actual.application_description
+  failure_message do |actual|
+    actual = actual.application_description
 
-          if @match
-            return @actual == @match
-          else
-            return !@actual.nil?
-          end
-        end
+    if expected
+      "application should have description #{expected.inspect} but got #{actual.inspect}"
+    else
+      "application should have a description, got #{actual.inspect}"
+    end
+  end
 
-        def failure_message
-          if @match
-            "application should have a description '#{@match}' but got '#{@actual}'"
-          else
-            "application should have a description, got #{@match}"
-          end
-        end
+  failure_message_when_negated do |actual|
+    actual = actual.application_description
 
-        def negative_failure_message
-          if @match
-            "application should not have a description matching '#{@match}' but got '#{@actual}'"
-          else
-            "application should not have a description"
-          end
-        end
-      end
+    if expected
+      "application should not have a description matching #{expected.inspect} but got #{actual.inspect}"
+    else
+      "application should not have a description, got #{actual.inspect}"
     end
   end
 end

data/lib/mcollective/test/matchers/rpc_result_items.rb

@@ -1,115 +1,11 @@
-module MCollective
-  module Test
-    module Matchers
-      def have_data_items(*items); RPCResultItems.new(items);end
-
-      class RPCResultItems
-        def initialize(expected)
-          @expected = expected
-          @actual = []
-        end
-
-        def matches?(actual)
-          # Data::Result has a bug in it's method missing in < 2.2.2 and < 2.3.0
-          # which raised the wrong exception class should someone call for example
-          # #to_ary like [x].flatten does causing the tests to fail, this works
-          # around that bug while we fix it in core.
-          unless actual.is_a?(Array)
-            actual = [actual]
-          end
-
-          if actual == []
-            return false
-          end
-
-          actual.each do |result|
-            if result.is_a?(MCollective::RPC::Result)
-              result = result.results
-            elsif result.is_a?(MCollective::Data::Result)
-              result = {:data => result.instance_variable_get("@data")}
-            end
-
-            @nodeid = result[:data][:test_sender]
-            @actual << result
-            @expected.each do |e|
-              if e.is_a? Hash
-                e.keys.each do |k|
-                  unless result[:data].keys.include?(k)
-                    return false
-                  end
-                end
-                e.keys.each do |k|
-                  if e[k].is_a?(String) || e[k].is_a?(Regexp)
-                    unless result[:data][k].match e[k]
-                      return false
-                    end
-                  else
-                    unless result[:data][k] == e[k]
-                      return false
-                    end
-                  end
-                end
-              else
-                unless result[:data].keys.include? e
-                  return false
-                end
-              end
-            end
-          end
-          true
-        end
-
-        def failure_message
-          return_string = "Failure from #{@nodeid}\n"
-          return_string << "Expected : \n"
-          @expected.each do |e|
-            if e.is_a? Hash
-              e.keys.each do |k|
-                return_string << " '#{k}' with value '#{e[k]}'\n"
-              end
-            else
-              return_string << " '#{e}' to be present\n"
-            end
-          end
-
-          return_string << "Got : \n"
-          @actual.each do |a|
-            if a[:sender] == @nodeid
-              a[:data].each do |data|
-                return_string << " '#{data[0]}' with value '#{data[1]}'\n"
-              end
-            end
-          end
-
-          return_string
-        end
-
-        def negative_failure_message
-          return_string = "Failure from #{@nodeid}\n"
-          return_string << "Did not expect : \n"
-          @expected.each do |e|
-            if e.is_a? Hash
-              e.keys.each do |k|
-                return_string << " '#{k}' with value '#{e[k]}'\n"
-              end
-            else
-              return_string << " '#{e}' to not be present\n"
-            end
-          end
-
-          return_string << "But got : \n"
-          @actual.each do |a|
-            if a[:sender] == @nodeid
-              a[:data].each do |data|
-                return_string << " '#{data[0]}' with value '#{data[1]}'\n"
-              end
-            end
-          end
-
-          return_string
-        end
-
-      end
+RSpec::Matchers.define(:have_data_items) do |expected|
+  match do |actual|
+    if actual.is_a?(MCollective::RPC::Result)
+      actual.results.should include(expected)
+    elsif actual.is_a?(MCollective::Data::Result)
+      actual.instance_variable_get(:@data).should include(expected)
+    else
+      actual.should include(data: include(expected))
     end
   end
 end

data/lib/mcollective/test/matchers/rpc_status.rb

@@ -1,48 +1,29 @@
-module MCollective
-  module Test
-    module Matchers
-      def rpc_success; RPCStatus.new(0); end
-      def rpc_aborted; RPCStatus.new(1); end
-      def rpc_unknown_action; RPCStatus.new(2); end
-      def rpc_missing_data; RPCStatus.new(3); end
-      def rpc_invalid_data; RPCStatus.new(4); end
-      def rpc_unknown; RPCStatus.new(5); end
-
-      alias be_successful rpc_success
-      alias be_aborted_error rpc_aborted
-      alias be_unknown_action_error rpc_unknown_action
-      alias be_missing_data_error rpc_missing_data
-      alias be_invalid_data_error rpc_invalid_data
-      alias be_unknown_error rpc_unknown
-
-      class RPCStatus
-        def initialize(code)
-          @code = code
-        end
-
-        def matches?(actual)
-          if actual == []
-            return false
-          end
-          [actual].flatten.each do |result|
-            result = result.results if result.is_a?(MCollective::RPC::Result)
-
-            @actual = result[:statuscode]
-
-            unless @actual == @code
-              return false
-            end
-          end
-        end
+{
+  0 => :rpc_success,
+  1 => :rpc_aborted,
+  2 => :rpc_unknown_action,
+  3 => :rpc_missing_data,
+  4 => :rpc_invalid_data,
+  5 => :rpc_unknown
+}.each do |code, name|
+  RSpec::Matchers.define(name) do
+    match do |actual|
+      actual[:statuscode] == code
+    end
 
-        def failure_message
-          "expected :statuscode == #{@code} but got '#{@actual}'"
-        end
+    failure_message do |actual|
+      "expected :statuscode == #{code} but got #{actual[:statuscode]}"
+    end
 
-        def negative_failure_message
-          "expected :statucode != #{@code} but got '#{@actual}'"
-        end
-      end
+    failure_message_when_negated do |actual|
+      "expected :statuscode != #{code} but got #{actual[:statuscode]}"
     end
   end
 end
+
+RSpec::Matchers.alias_matcher :be_successful, :rpc_success
+RSpec::Matchers.alias_matcher :be_aborted_error, :rpc_aborted
+RSpec::Matchers.alias_matcher :be_unknown_error, :rpc_unknown_action
+RSpec::Matchers.alias_matcher :be_missing_data_error, :rpc_missing_data
+RSpec::Matchers.alias_matcher :be_invalid_data_error, :rpc_invalid_data
+RSpec::Matchers.alias_matcher :be_unknown_error, :rpc_unknown

data/lib/mcollective/test/matchers.rb

@@ -2,7 +2,6 @@ module MCollective
   module Test
     module Matchers
       require 'mcollective/test/matchers/rpc_result_items.rb'
-      require 'mcollective/test/matchers/rpc_metadata.rb'
       require 'mcollective/test/matchers/rpc_status.rb'
       require 'mcollective/test/matchers/application_description.rb'
     end

data/lib/mcollective/test/util.rb

@@ -1,8 +1,10 @@
 module MCollective
   module Test
     module Util
+      include Mocha::API
+
       def create_facts_mock(factsource)
-        facts = Mocha::Mock.new('facts')
+        facts = mock('facts')
         facts.stubs(:get_facts).returns(factsource)
 
         factsource.each_pair do |k, v|
@@ -15,7 +17,7 @@ module MCollective
       def create_config_mock(config)
         pluginconf = {}
 
-        cfg = Mocha::Mock.new('config')
+        cfg = mock('config')
         cfg.stubs(:configured).returns(true)
         cfg.stubs(:rpcauthorization).returns(false)
         cfg.stubs(:main_collective).returns("mcollective")
@@ -55,7 +57,7 @@ module MCollective
       end
 
       def create_logger_mock
-        logger = Mocha::Mock.new(:logger)
+        logger = mock(:logger)
 
         [:log, :start, :debug, :info, :warn].each do |meth|
           logger.stubs(meth)
@@ -69,7 +71,7 @@ module MCollective
       end
 
       def create_connector_mock
-        connector = Mocha::Mock.new(:connector)
+        connector = mock(:connector)
 
         [:connect, :receive, :publish, :subscribe, :unsubscribe, :disconnect].each do |meth|
           connector.stubs(meth)

data/mcollective-test.gemspec

@@ -0,0 +1,13 @@
+spec = Gem::Specification.new do |s|
+  s.name = "mcollective-test"
+  s.version = "0.5.0"
+  s.author = "R.I.Pienaar"
+  s.email = "rip@devco.net"
+  s.homepage = "https://github.com/ripienaar/mcollective-test/"
+  s.summary = "Test helper for MCollective"
+  s.description = "Helpers, matchers and other utilities for writing agent, application and integration tests"
+  s.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  s.require_path = "lib"
+end

metadata

@@ -1,77 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mcollective-test
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
+version: !ruby/object:Gem::Version
+  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - R.I.Pienaar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2013-03-14 00:00:00 +00:00
-default_executable: 
+date: 2024-08-24 00:00:00.000000000 Z
 dependencies: []
-
-description: Helpers, matchers and other utilities for writing agent, application and integration tests
+description: Helpers, matchers and other utilities for writing agent, application
+  and integration tests
 email: rip@devco.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- ".gitignore"
+- Gemfile
+- README.md
+- Rakefile
 - lib/mcollective/test.rb
+- lib/mcollective/test/application_test.rb
+- lib/mcollective/test/data_test.rb
 - lib/mcollective/test/local_agent_test.rb
 - lib/mcollective/test/matchers.rb
-- lib/mcollective/test/remote_agent_test.rb
-- lib/mcollective/test/data_test.rb
-- lib/mcollective/test/matchers/rpc_metadata.rb
+- lib/mcollective/test/matchers/application_description.rb
 - lib/mcollective/test/matchers/rpc_result_items.rb
 - lib/mcollective/test/matchers/rpc_status.rb
-- lib/mcollective/test/matchers/application_description.rb
+- lib/mcollective/test/remote_agent_test.rb
 - lib/mcollective/test/util.rb
-- lib/mcollective/test/application_test.rb
-has_rdoc: true
+- mcollective-test.gemspec
 homepage: https://github.com/ripienaar/mcollective-test/
 licenses: []
-
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
-signing_key: 
-specification_version: 3
+rubygems_version: 3.2.33
+signing_key:
+specification_version: 4
 summary: Test helper for MCollective
 test_files: []
-

data/lib/mcollective/test/matchers/rpc_metadata.rb

@@ -1,40 +0,0 @@
-module MCollective
-  module Test
-    module Matchers
-      def have_valid_metadata; RPCMetadata.new; end
-
-      class RPCMetadata
-        def matches?(actual)
-          actual = actual.meta
-
-          @msg = "Unknown error"
-
-          [:name, :description, :author, :license, :version, :url, :timeout].each do |item|
-            unless actual.include?(item)
-              @msg = "needs a '#{item}' item"
-              return false
-            end
-          end
-
-          [:name, :description, :author, :license, :version, :url].each do |item|
-            unless actual[item].is_a?(String)
-              @msg = "#{item} should be a string"
-              return false
-            end
-          end
-
-          unless actual[:timeout].is_a?(Numeric)
-            @msg = "timeout should be numeric"
-            return false
-          end
-
-          return true
-        end
-
-        def failure_message
-          "Invalid meta data: #{@msg}"
-        end
-      end
-    end
-  end
-end