summaryrefslogtreecommitdiffstats
path: root/test/language
diff options
context:
space:
mode:
authorLuke Kanies <luke@reductivelabs.com>2010-01-07 17:23:31 -0800
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitd0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5 (patch)
tree3a3060ac94be20b25742f5ec956e95c8ff3633d8 /test/language
parent67ef78d9f231661d0fdd6260d470cf0d06f1bac2 (diff)
downloadpuppet-d0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5.tar.gz
puppet-d0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5.tar.xz
puppet-d0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5.zip
Renaming Parser::ResourceType to Resource::Type
Basically, these classes (ResourceType and ResourceTypeCollection) don't really belong in Parser, so I'm moving them to the Resource namespace. This will be where anything RAL-related goes from now on, and as we migrate functionality out of Puppet::Type, it should go here. Signed-off-by: Luke Kanies <luke@reductivelabs.com>
Diffstat (limited to 'test/language')
-rwxr-xr-xtest/language/parser.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/language/parser.rb b/test/language/parser.rb
index 6c68184a6..a3311f423 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -426,7 +426,7 @@ file { "/tmp/yayness":
assert_nothing_raised do
out = parser.parse ""
- assert_instance_of(Puppet::Parser::ResourceTypeCollection, out)
+ assert_instance_of(Puppet::Resource::TypeCollection, out)
assert_nil(parser.hostclass(""), "Got a 'main' class when we had no code")
end
@@ -434,7 +434,7 @@ file { "/tmp/yayness":
parser.initvars
assert_nothing_raised do
out = parser.parse "Exec { path => '/usr/bin:/usr/sbin' }"
- assert_instance_of(Puppet::Parser::ResourceTypeCollection, out)
+ assert_instance_of(Puppet::Resource::TypeCollection, out)
assert_equal("", parser.hostclass("").classname)
assert_equal("", parser.hostclass("").namespace)
end
@@ -801,7 +801,7 @@ file { "/tmp/yayness":
assert_nothing_raised("Could not parse") do
result = parser.parse(str)
end
- assert_instance_of(Puppet::Parser::ResourceTypeCollection, result, "Did not get a ASTSet back from parsing")
+ assert_instance_of(Puppet::Resource::TypeCollection, result, "Did not get a ASTSet back from parsing")
assert_instance_of(AST::HostClass, result.hostclass("yay"), "Did not create 'yay' class")
assert_instance_of(AST::HostClass, result.hostclass(""), "Did not create main class")