mcollective-test 0.1.2 → 0.1.3

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

@@ -1,34 +1,101 @@
 module MCollective
     module Test
         module Matchers
-            def have_data_items(*items); RPCResultItems.new(items); end
+            def have_data_items(*items); RPCResultItems.new(items);end
 
             class RPCResultItems
                 def initialize(expected)
-                    @expected = expected.flatten.sort
+                    @expected = expected
+                    @actual = []
                 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[:data].keys.sort
-
-                        unless @actual == @expected
-                            return false
+                        @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
-                    "expected keys '#{@expected.join ', '}' but got '#{@actual.join ', '}'"
+                    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
-                    "did not expect keys '#{@expected.join ', '}' but got '#{@actual.keys.join ', '}'"
+                    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
         end
     end

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

@@ -21,6 +21,9 @@ module MCollective
                 end
 
                 def matches?(actual)
+                    if actual == []
+                        return false
+                    end
                     [actual].flatten.each do |result|
                         result = result.results if result.is_a?(MCollective::RPC::Result)
 

data/lib/mcollective/test/util.rb

@@ -73,7 +73,6 @@ module MCollective
                     MCollective::PluginManager.loadclass(classname)
                 end
 
-                MCollective::PluginManager.loadclass(classname)
 
                 MCollective::PluginManager << {:type => "#{application}_application", :class => classname, :single_instance => false}
                 MCollective::PluginManager["#{application}_application"]
@@ -101,8 +100,12 @@ module MCollective
                 MCollective::PluginManager["#{agent}_agent"]
             end
 
-            def create_response(senderid, data = {}, statuscode = 0, statusmsg = "OK")
-                {:senderid => senderid, :body =>{:data => data}}
+            def create_response(senderid, data = {}, stats = nil , statuscode = 0, statusmsg = "OK")
+                unless stats == nil
+                    {:senderid => senderid, :body =>{:data => data, :stats => stats}}
+                else
+                    {:senderid => senderid, :body =>{:data => data}}
+                end
             end
         end
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mcollective-test
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 +01:00
+date: 2011-08-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -27,16 +28,16 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/mcollective/test.rb
+- lib/mcollective/test/util.rb
 - lib/mcollective/test/matchers/rpc_result_items.rb
 - lib/mcollective/test/matchers/rpc_metadata.rb
-- lib/mcollective/test/matchers/application_description.rb
 - lib/mcollective/test/matchers/rpc_status.rb
-- lib/mcollective/test/local_agent_test.rb
+- lib/mcollective/test/matchers/application_description.rb
+- lib/mcollective/test/remote_agent_test.rb
 - lib/mcollective/test/matchers.rb
 - lib/mcollective/test/application_test.rb
-- lib/mcollective/test/remote_agent_test.rb
-- lib/mcollective/test/util.rb
-- lib/mcollective/test.rb
+- lib/mcollective/test/local_agent_test.rb
 has_rdoc: true
 homepage: https://github.com/ripienaar/mcollective-test/
 licenses: []
@@ -47,23 +48,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Test helper for MCollective