Renaming some ast resource classes and files so they make a lot more sense.

4 files changed, 9 insertions, 9 deletions

diff --git a/test/language/ast/resourcedef.rb b/test/language/ast/resource.rb
index d79a02cfa..9ef5181af 100755
--- a/test/language/ast/resourcedef.rb
+++ b/test/language/ast/resource.rb
@@ -8,7 +8,7 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppettest'
 require 'puppettest/parsertesting'
 
-class TestASTResourceDef < Test::Unit::TestCase
+class TestASTResource< Test::Unit::TestCase
 	include PuppetTest
 	include PuppetTest::ParserTesting
 	AST = Puppet::Parser::AST
@@ -22,7 +22,7 @@ class TestASTResourceDef < Test::Unit::TestCase
 
     def newdef(type, title, params = nil)
         params ||= AST::ASTArray.new(:children => [])
-        AST::ResourceDef.new(:type => type, :title => AST::String.new(:value => title), :params => params)
+        AST::Resource.new(:type => type, :title => AST::String.new(:value => title), :params => params)
     end
 
     # Related to #806, make sure resources always look up the full path to the resource.
diff --git a/test/language/ast/resourceref.rb b/test/language/ast/resource_reference.rb
index 33a80ad40..e8883afb9 100755
--- a/test/language/ast/resourceref.rb
+++ b/test/language/ast/resource_reference.rb
@@ -8,13 +8,13 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppettest'
 require 'puppettest/parsertesting'
 
-class TestASTResourceRef < Test::Unit::TestCase
+class TestASTResourceReference < Test::Unit::TestCase
 	include PuppetTest
 	include PuppetTest::ParserTesting
 	AST = Puppet::Parser::AST
     
     def newref(type, title)
-        AST::ResourceRef.new(:type => type, :title => AST::String.new(:value => title))
+        AST::ResourceReference.new(:type => type, :title => AST::String.new(:value => title))
     end
 
     def setup
diff --git a/test/language/parser.rb b/test/language/parser.rb
index ddf35e3e3..d50bdfe5a 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -475,7 +475,7 @@ file { "/tmp/yayness":
 
             assert_instance_of(AST::ASTArray, ret.classes[""].code)
             resdef = ret.classes[""].code[0]
-            assert_instance_of(AST::ResourceDef, resdef)
+            assert_instance_of(AST::Resource, resdef)
             assert_equal("/tmp/testing", resdef.title.value)
             # We always get an astarray back, so...
             check.call(resdef, "simple resource")
@@ -486,7 +486,7 @@ file { "/tmp/yayness":
             end
 
             ret.classes[""].each do |res|
-                assert_instance_of(AST::ResourceDef, res)
+                assert_instance_of(AST::Resource, res)
                 check.call(res, "multiresource")
             end
 
diff --git a/test/lib/puppettest/parsertesting.rb b/test/lib/puppettest/parsertesting.rb
index b8fd8bd83..c71508803 100644
--- a/test/lib/puppettest/parsertesting.rb
+++ b/test/lib/puppettest/parsertesting.rb
@@ -105,7 +105,7 @@ module PuppetTest::ParserTesting
             title = stringobj(title)
         end
         assert_nothing_raised("Could not create %s %s" % [type, title]) {
-            return AST::ResourceDef.new(
+            return AST::Resource.new(
                 :file => __FILE__,
                 :line => __LINE__,
                 :title => title,
@@ -135,7 +135,7 @@ module PuppetTest::ParserTesting
 
     def resourceref(type, title)
         assert_nothing_raised("Could not create %s %s" % [type, title]) {
-            return AST::ResourceRef.new(
+            return AST::ResourceReference.new(
                 :file => __FILE__,
                 :line => __LINE__,
                 :type => type,
@@ -191,7 +191,7 @@ module PuppetTest::ParserTesting
             params = hash.collect { |param, value|
             resourceparam(param, value)
         }
-        return AST::ResourceInst.new(
+        return AST::ResourceInstance.new(
                                    :file => tempfile(),
                                    :line => rand(100),
                                    :children => params