summaryrefslogtreecommitdiffstats
path: root/test/lib/puppettest/resourcetesting.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/lib/puppettest/resourcetesting.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/lib/puppettest/resourcetesting.rb')
-rw-r--r--test/lib/puppettest/resourcetesting.rb80
1 files changed, 40 insertions, 40 deletions
diff --git a/test/lib/puppettest/resourcetesting.rb b/test/lib/puppettest/resourcetesting.rb
index 0949dfff4..ea8bec01b 100644
--- a/test/lib/puppettest/resourcetesting.rb
+++ b/test/lib/puppettest/resourcetesting.rb
@@ -1,54 +1,54 @@
module PuppetTest::ResourceTesting
- Parser = Puppet::Parser
- AST = Puppet::Parser::AST
+ Parser = Puppet::Parser
+ AST = Puppet::Parser::AST
- def mkevaltest(parser = nil)
- parser ||= mkparser
+ def mkevaltest(parser = nil)
+ parser ||= mkparser
- @parser.newdefine(
- "evaltest",
+ @parser.newdefine(
+ "evaltest",
- :arguments => [%w{one}, ["two", stringobj("755")]],
+ :arguments => [%w{one}, ["two", stringobj("755")]],
- :code => resourcedef(
- "file", "/tmp",
+ :code => resourcedef(
+ "file", "/tmp",
- "owner" => varref("one"), "mode" => varref("two"))
- )
+ "owner" => varref("one"), "mode" => varref("two"))
+ )
+ end
+
+ def mkresource(args = {})
+ args[:source] ||= "source"
+ args[:scope] ||= mkscope
+
+ type = args[:type] || "resource"
+ title = args[:title] || "testing"
+ args.delete(:type)
+ args.delete(:title)
+ {:source => "source", :scope => "scope"}.each do |param, value|
+ args[param] ||= value
end
- def mkresource(args = {})
- args[:source] ||= "source"
- args[:scope] ||= mkscope
-
- type = args[:type] || "resource"
- title = args[:title] || "testing"
- args.delete(:type)
- args.delete(:title)
- {:source => "source", :scope => "scope"}.each do |param, value|
- args[param] ||= value
- end
-
- params = args[:parameters] || {:one => "yay", :three => "rah"}
- if args[:parameters] == :none
- args.delete(:parameters)
- else
- args[:parameters] = paramify args[:source], params
- end
-
- Parser::Resource.new(type, title, args)
+ params = args[:parameters] || {:one => "yay", :three => "rah"}
+ if args[:parameters] == :none
+ args.delete(:parameters)
+ else
+ args[:parameters] = paramify args[:source], params
end
- def param(name, value, source)
- Parser::Resource::Param.new(:name => name, :value => value, :source => source)
- end
+ Parser::Resource.new(type, title, args)
+ end
+
+ def param(name, value, source)
+ Parser::Resource::Param.new(:name => name, :value => value, :source => source)
+ end
- def paramify(source, hash)
- hash.collect do |name, value|
- Parser::Resource::Param.new(
- :name => name, :value => value, :source => source
- )
- end
+ def paramify(source, hash)
+ hash.collect do |name, value|
+ Parser::Resource::Param.new(
+ :name => name, :value => value, :source => source
+ )
end
+ end
end