Moving some of the stand-alone classes into the util/ subdirectory, to clean up the top-level namespace a bit. This is a lot of file modifications, but most of them just change class names and file paths.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2178 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 4 insertions, 4 deletions

diff --git a/test/other/autoload.rb b/test/other/autoload.rb
index 86ba639aa..34f40df24 100755
--- a/test/other/autoload.rb
+++ b/test/other/autoload.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/autoload'
+require 'puppet/util/autoload'
 require 'puppettest'
 
 class TestAutoload < Test::Unit::TestCase
@@ -53,10 +53,10 @@ TestAutoload.newthing(:#{name.to_s})
 
         loader = nil
         assert_nothing_raised {
-            loader = Puppet::Autoload.new(klass, :yayness)
+            loader = Puppet::Util::Autoload.new(klass, :yayness)
         }
 
-        assert_equal(loader.object_id, Puppet::Autoload[klass].object_id,
+        assert_equal(loader.object_id, Puppet::Util::Autoload[klass].object_id,
                     "Did not retrieve loader object by class")
 
         # Make sure we don't fail on missing files
@@ -117,7 +117,7 @@ TestAutoload.newthing(:#{name.to_s})
             f.puts "$loaded = true"
         end
 
-        auto = Puppet::Autoload.new(self, "test")
+        auto = Puppet::Util::Autoload.new(self, "test")
 
         # Now make sure autoloading modifies $: as necessary
         assert(! $:.include?(dir), "search path already includes libdir")