summaryrefslogtreecommitdiffstats
path: root/test/network/xmlrpc/processor.rb
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-07-09 18:12:17 -0700
committerMarkus Roberts <Markus@reality.com>2010-07-09 18:12:17 -0700
commit3180b9d9b2c844dade1d361326600f7001ec66dd (patch)
tree98fe7c5ac7eb942aac9c39f019a17b0b3f5a57f4 /test/network/xmlrpc/processor.rb
parent543225970225de5697734bfaf0a6eee996802c04 (diff)
downloadpuppet-3180b9d9b2c844dade1d361326600f7001ec66dd.tar.gz
puppet-3180b9d9b2c844dade1d361326600f7001ec66dd.tar.xz
puppet-3180b9d9b2c844dade1d361326600f7001ec66dd.zip
Code smell: Two space indentation
Replaced 106806 occurances of ^( +)(.*$) with The ruby community almost universally (i.e. everyone but Luke, Markus, and the other eleven people who learned ruby in the 1900s) uses two-space indentation. 3 Examples: The code: end # Tell getopt which arguments are valid def test_get_getopt_args element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args") becomes: end # Tell getopt which arguments are valid def test_get_getopt_args element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args") The code: assert_equal(str, val) assert_instance_of(Float, result) end # Now test it with a passed object becomes: assert_equal(str, val) assert_instance_of(Float, result) end # Now test it with a passed object The code: end assert_nothing_raised do klass[:Yay] = "boo" klass["Cool"] = :yayness end becomes: end assert_nothing_raised do klass[:Yay] = "boo" klass["Cool"] = :yayness end
Diffstat (limited to 'test/network/xmlrpc/processor.rb')
-rwxr-xr-xtest/network/xmlrpc/processor.rb104
1 files changed, 52 insertions, 52 deletions
diff --git a/test/network/xmlrpc/processor.rb b/test/network/xmlrpc/processor.rb
index 3bf7b7fa3..0c990c9e8 100755
--- a/test/network/xmlrpc/processor.rb
+++ b/test/network/xmlrpc/processor.rb
@@ -7,73 +7,73 @@ require 'puppet/network/xmlrpc/processor'
require 'mocha'
class TestXMLRPCProcessor < Test::Unit::TestCase
- include PuppetTest
- class BaseProcessor
- def add_handler(interface, handler)
- @handlers ||= {}
- @handlers[interface] = handler
- end
+ include PuppetTest
+ class BaseProcessor
+ def add_handler(interface, handler)
+ @handlers ||= {}
+ @handlers[interface] = handler
end
+ end
- # We use a base class just so super() works with add_handler.
- class Processor < BaseProcessor
- include Puppet::Network::XMLRPCProcessor
+ # We use a base class just so super() works with add_handler.
+ class Processor < BaseProcessor
+ include Puppet::Network::XMLRPCProcessor
- def set_service_hook(&block)
- meta_def(:service, &block)
- end
+ def set_service_hook(&block)
+ meta_def(:service, &block)
end
-
- def setup
- super
- Puppet::Util::SUIDManager.stubs(:asuser).yields
- @processor = Processor.new
+ end
+
+ def setup
+ super
+ Puppet::Util::SUIDManager.stubs(:asuser).yields
+ @processor = Processor.new
+ end
+
+ def test_handlers
+ ca = Puppet::Network::Handler.ca
+ @processor.send(:setup_processor)
+ assert(! @processor.handler_loaded?(:ca), "already have ca handler loaded")
+ assert_nothing_raised do
+ @processor.add_handler(ca.interface, ca.new)
end
- def test_handlers
- ca = Puppet::Network::Handler.ca
- @processor.send(:setup_processor)
- assert(! @processor.handler_loaded?(:ca), "already have ca handler loaded")
- assert_nothing_raised do
- @processor.add_handler(ca.interface, ca.new)
- end
+ assert(@processor.handler_loaded?(:puppetca), "ca handler not loaded by symbol")
+ assert(@processor.handler_loaded?("puppetca"), "ca handler not loaded by string")
+ end
- assert(@processor.handler_loaded?(:puppetca), "ca handler not loaded by symbol")
- assert(@processor.handler_loaded?("puppetca"), "ca handler not loaded by string")
+ def test_process
+ ca = Puppet::Network::Handler.ca
+ @processor.send(:setup_processor)
+ assert_nothing_raised do
+ @processor.add_handler(ca.interface, ca.new)
end
- def test_process
- ca = Puppet::Network::Handler.ca
- @processor.send(:setup_processor)
- assert_nothing_raised do
- @processor.add_handler(ca.interface, ca.new)
- end
+ fakeparser = Class.new do
+ def parseMethodCall(data)
+ data
+ end
+ end
- fakeparser = Class.new do
- def parseMethodCall(data)
- data
- end
- end
+ request = Puppet::Network::ClientRequest.new("fake", "192.168.0.1", false)
+ request.handler = "myhandler"
+ request.method = "mymethod"
- request = Puppet::Network::ClientRequest.new("fake", "192.168.0.1", false)
- request.handler = "myhandler"
- request.method = "mymethod"
+ @processor.expects(:parser).returns(fakeparser.new)
- @processor.expects(:parser).returns(fakeparser.new)
+ request.expects(:handler=).with("myhandler")
+ request.expects(:method=).with("mymethod")
- request.expects(:handler=).with("myhandler")
- request.expects(:method=).with("mymethod")
+ @processor.stubs(:verify)
+ @processor.expects(:handle).with(request.call, "params", request.name, request.ip)
- @processor.stubs(:verify)
- @processor.expects(:handle).with(request.call, "params", request.name, request.ip)
+ @processor.send(:process, ["myhandler.mymethod", ["params"]], request)
+ end
- @processor.send(:process, ["myhandler.mymethod", ["params"]], request)
- end
-
- def test_setup_processor
- @processor.expects(:set_service_hook)
- @processor.send(:setup_processor)
- end
+ def test_setup_processor
+ @processor.expects(:set_service_hook)
+ @processor.send(:setup_processor)
+ end
end