Renaming 'configuration' to 'catalog', fixing #954.

4 files changed, 18 insertions, 18 deletions

diff --git a/test/language/ast/hostclass.rb b/test/language/ast/hostclass.rb
index 62d4f9ee3..80032f30c 100755
--- a/test/language/ast/hostclass.rb
+++ b/test/language/ast/hostclass.rb
@@ -175,7 +175,7 @@ class TestASTHostClass < Test::Unit::TestCase
         sub = parser.newclass "sub", :parent => "base"
 
         base.expects(:safeevaluate).with do |args|
-            assert(scope.compile.configuration.tags.include?("sub"), "Did not tag with sub class name before evaluating base class")
+            assert(scope.compile.catalog.tags.include?("sub"), "Did not tag with sub class name before evaluating base class")
             base.evaluate(args)
             true
         end
diff --git a/test/language/compile.rb b/test/language/compile.rb
index 50b16a24d..298493c0a 100755
--- a/test/language/compile.rb
+++ b/test/language/compile.rb
@@ -74,7 +74,7 @@ class TestCompile < Test::Unit::TestCase
         klass.expects(:classname).returns("myname")
 
         compile = mkcompile
-        compile.configuration.expects(:tag).with("myname")
+        compile.catalog.expects(:tag).with("myname")
         
         assert_nothing_raised("Could not set class") do
             compile.class_set "myname", "myscope"
@@ -153,7 +153,7 @@ class TestCompile < Test::Unit::TestCase
         [:set_node_parameters, :evaluate_main, :evaluate_ast_node, :evaluate_node_classes, :evaluate_generators, :fail_on_unevaluated, :finish].each do |method|
             compile.expects(method)
         end
-        assert_instance_of(Puppet::Node::Configuration, compile.compile, "Did not return the configuration")
+        assert_instance_of(Puppet::Node::Catalog, compile.compile, "Did not return the catalog")
     end
 
     # Test setting the node's parameters into the top scope.
@@ -416,7 +416,7 @@ class TestCompile < Test::Unit::TestCase
         compile.expects(:verify_uniqueness).with(resource)
         scope = stub("scope", :resource => mock('resource'))
 
-        compile.configuration.expects(:add_edge!).with(scope.resource, resource)
+        compile.catalog.expects(:add_edge!).with(scope.resource, resource)
 
         assert_nothing_raised("Could not store resource") do
             compile.store_resource(scope, resource)
diff --git a/test/language/functions.rb b/test/language/functions.rb
index 70dd6af7b..132ee97ac 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -66,8 +66,8 @@ class TestLangFunctions < Test::Unit::TestCase
         # Now make sure we correctly get tags.
         scope.resource.tag("resourcetag")
         assert(scope.function_tagged("resourcetag"), "tagged function did not catch resource tags")
-        scope.compile.configuration.tag("configtag")
-        assert(scope.function_tagged("configtag"), "tagged function did not catch configuration tags")
+        scope.compile.catalog.tag("configtag")
+        assert(scope.function_tagged("configtag"), "tagged function did not catch catalog tags")
     end
 
     def test_failfunction
@@ -212,15 +212,15 @@ class TestLangFunctions < Test::Unit::TestCase
 
         Puppet[:environment] = "yay"
 
-        configuration = nil
+        catalog = nil
         assert_nothing_raised {
-            configuration = interp.compile(node)
+            catalog = interp.compile(node)
         }
 
-        version = configuration.version
+        version = catalog.version
 
-        fileobj = configuration.vertices.find { |r| r.title == file }
-        assert(fileobj, "File was not in configuration")
+        fileobj = catalog.vertices.find { |r| r.title == file }
+        assert(fileobj, "File was not in catalog")
 
         assert_equal("original text\n", fileobj["content"],
             "Template did not work")
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index 0806a40b4..2a4ba0220 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -197,7 +197,7 @@ class TestSnippets < Test::Unit::TestCase
     def snippet_classpathtest
         path = "/tmp/classtest"
 
-        file = @configuration.resource(:file, path)
+        file = @catalog.resource(:file, path)
         assert(file, "did not create file %s" % path)
 
         assert_nothing_raised {
@@ -460,13 +460,13 @@ class TestSnippets < Test::Unit::TestCase
                 node = Puppet::Node.new("testhost")
                 node.merge(facts)
 
-                config = nil
-                assert_nothing_raised("Could not compile configuration") {
-                    config = Puppet::Node::Configuration.find(node)
+                catalog = nil
+                assert_nothing_raised("Could not compile catalog") {
+                    catalog = Puppet::Node::Catalog.find(node)
                 }
 
-                assert_nothing_raised("Could not convert configuration") {
-                    config = config.to_ral
+                assert_nothing_raised("Could not convert catalog") {
+                    catalog = catalog.to_ral
                 }
 
                 Puppet::Type.eachtype { |type|
@@ -479,7 +479,7 @@ class TestSnippets < Test::Unit::TestCase
                         assert(obj.name)
                     }
                 }
-                @configuration = config
+                @catalog = catalog
                 assert_nothing_raised {
                     self.send(mname)
                 }