Renaming Puppet::Node::Catalog to Puppet::Resource::Catalog

Signed-off-by: Luke Kanies <luke@madstop.com>

5 files changed, 12 insertions, 12 deletions

diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index dfb914f72..a1d0f5d4f 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -498,7 +498,7 @@ class TestSnippets < Test::Unit::TestCase
 
                 catalog = nil
                 assert_nothing_raised("Could not compile catalog") {
-                    catalog = Puppet::Node::Catalog.find(node)
+                    catalog = Puppet::Resource::Catalog.find(node)
                 }
 
                 assert_nothing_raised("Could not convert catalog") {
diff --git a/test/lib/puppettest/support/resources.rb b/test/lib/puppettest/support/resources.rb
index 255c55569..045579302 100755
--- a/test/lib/puppettest/support/resources.rb
+++ b/test/lib/puppettest/support/resources.rb
@@ -25,7 +25,7 @@ module PuppetTest::Support::Resources
     end
     
     def mktree
-        catalog = Puppet::Node::Catalog.new do |config|
+        catalog = Puppet::Resource::Catalog.new do |config|
             one = treenode(config, "one", "a", "b")
             two = treenode(config, "two", "c", "d")
             middle = treenode(config, "middle", "e", "f", two)
diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb
index 0d775d184..aa3ad8b8d 100644
--- a/test/lib/puppettest/support/utils.rb
+++ b/test/lib/puppettest/support/utils.rb
@@ -24,7 +24,7 @@ module PuppetTest::Support::Utils
     # Turn a list of resources, or possibly a catalog and some resources,
     # into a catalog object.
     def resources2catalog(*resources)
-        if resources[0].is_a?(Puppet::Node::Catalog)
+        if resources[0].is_a?(Puppet::Resource::Catalog)
             config = resources.shift
             unless resources.empty?
                 resources.each { |r| config.add_resource r }
@@ -34,7 +34,7 @@ module PuppetTest::Support::Utils
             comp = resources.shift
             comp.delve
         else
-            config = Puppet::Node::Catalog.new
+            config = Puppet::Resource::Catalog.new
             resources.each { |res| config.add_resource res }
         end
         return config
@@ -159,7 +159,7 @@ module PuppetTest::Support::Utils
         else
             name = :testing
         end
-        config = Puppet::Node::Catalog.new :testing do |conf|
+        config = Puppet::Resource::Catalog.new :testing do |conf|
             resources.each { |resource| conf.add_resource resource }
         end
 
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index 8e55f104c..a802b0a0a 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -13,7 +13,7 @@ class TestMaster < Test::Unit::TestCase
         @master = Puppet::Network::Handler.master.new(:Manifest => tempfile)
 
         @catalog = stub 'catalog', :extract => ""
-        Puppet::Node::Catalog.stubs(:find).returns(@catalog)
+        Puppet::Resource::Catalog.stubs(:find).returns(@catalog)
     end
 
     def teardown
@@ -53,7 +53,7 @@ class TestMaster < Test::Unit::TestCase
 
         @master.stubs(:decode_facts)
 
-        Puppet::Node::Catalog.expects(:find).with("foo.com").returns(@catalog)
+        Puppet::Resource::Catalog.expects(:find).with("foo.com").returns(@catalog)
 
         @master.getconfig("facts", "yaml", "foo.com")
     end
@@ -68,7 +68,7 @@ class TestMasterFormats < Test::Unit::TestCase
         @master.stubs(:decode_facts)
 
         @catalog = stub 'catalog', :extract => ""
-        Puppet::Node::Catalog.stubs(:find).returns(@catalog)
+        Puppet::Resource::Catalog.stubs(:find).returns(@catalog)
     end
 
     def test_marshal_can_be_used
diff --git a/test/other/transactions.rb b/test/other/transactions.rb
index 04480c24c..931a4d4d1 100755
--- a/test/other/transactions.rb
+++ b/test/other/transactions.rb
@@ -346,7 +346,7 @@ class TestTransactions < Test::Unit::TestCase
         file[:group] = @groups[0]
         assert_apply(file)
 
-        config = Puppet::Node::Catalog.new
+        config = Puppet::Resource::Catalog.new
         fcomp = Puppet::Type.type(:component).create(:name => "file")
         config.add_resource fcomp
         config.add_resource file
@@ -554,7 +554,7 @@ class TestTransactions < Test::Unit::TestCase
     end
 
     def test_ignore_tags?
-        config = Puppet::Node::Catalog.new
+        config = Puppet::Resource::Catalog.new
         config.host_config = true
         transaction = Puppet::Transaction.new(config)
         assert(! transaction.ignore_tags?, "Ignoring tags when applying a host catalog")
@@ -566,7 +566,7 @@ class TestTransactions < Test::Unit::TestCase
     
     def test_missing_tags?
         resource = stub 'resource', :tagged? => true
-        config = Puppet::Node::Catalog.new
+        config = Puppet::Resource::Catalog.new
 
         # Mark it as a host config so we don't care which test is first
         config.host_config = true
@@ -659,7 +659,7 @@ class TestTransactions < Test::Unit::TestCase
         end
 
         # Make a graph with some stuff in it.
-        graph = Puppet::Node::Catalog.new
+        graph = Puppet::Resource::Catalog.new
 
         # Add a non-triggering edge.
         a = trigger.new(:a)