diff options
| -rw-r--r-- | test/objects/tc_basic.rb | 14 | ||||
| -rw-r--r-- | test/objects/tc_file.rb | 6 | ||||
| -rw-r--r-- | test/objects/tc_package.rb | 6 | ||||
| -rw-r--r-- | test/objects/tc_service.rb | 8 | ||||
| -rw-r--r-- | test/objects/tc_symlink.rb | 6 |
5 files changed, 20 insertions, 20 deletions
diff --git a/test/objects/tc_basic.rb b/test/objects/tc_basic.rb index 75cec7b7b..eb3503302 100644 --- a/test/objects/tc_basic.rb +++ b/test/objects/tc_basic.rb @@ -31,24 +31,24 @@ class TestBasic < Test::Unit::TestCase assert_nothing_raised() { cfile = File.join($blinkbase,"examples/root/etc/configfile") - unless Blink::Objects::File.has_key?(cfile) - Blink::Objects::File.new( + unless Blink::Types::File.has_key?(cfile) + Blink::Types::File.new( :path => cfile ) end - @configfile = Blink::Objects::File[cfile] + @configfile = Blink::Types::File[cfile] } assert_nothing_raised() { - unless Blink::Objects::Service.has_key?("sleeper") - Blink::Objects::Service.new( + unless Blink::Types::Service.has_key?("sleeper") + Blink::Types::Service.new( :name => "sleeper", :running => 1 ) - Blink::Objects::Service.addpath( + Blink::Types::Service.addpath( File.join($blinkbase,"examples/root/etc/init.d") ) end - @sleeper = Blink::Objects::Service["sleeper"] + @sleeper = Blink::Types::Service["sleeper"] } assert_nothing_raised() { @component.push( diff --git a/test/objects/tc_file.rb b/test/objects/tc_file.rb index b92f20d04..27a4a0735 100644 --- a/test/objects/tc_file.rb +++ b/test/objects/tc_file.rb @@ -18,12 +18,12 @@ class TestFile < Test::Unit::TestCase @path = File.join($blinkbase,"examples/root/etc/configfile") Blink[:debug] = 1 assert_nothing_raised() { - unless Blink::Objects::File.has_key?(@path) - Blink::Objects::File.new( + unless Blink::Types::File.has_key?(@path) + Blink::Types::File.new( :path => @path ) end - @file = Blink::Objects::File[@path] + @file = Blink::Types::File[@path] } end diff --git a/test/objects/tc_package.rb b/test/objects/tc_package.rb index 38ea28e31..6b5513e45 100644 --- a/test/objects/tc_package.rb +++ b/test/objects/tc_package.rb @@ -4,7 +4,7 @@ if __FILE__ == $0 $blinkbase = "../.." end -require 'blink/objects/package' +require 'blink/types/package' require 'test/unit' require 'facter' @@ -24,7 +24,7 @@ class TestPackagingType < Test::Unit::TestCase end assert_nothing_raised() { - Blink::Objects::PackagingType[type].list + Blink::Types::PackagingType[type].list } end end @@ -33,7 +33,7 @@ class TestPackageSource < Test::Unit::TestCase def test_filesource assert_equal( "/tmp/fakepackage", - Blink::Objects::PackageSource.get("file:///tmp/fakepackage") + Blink::Types::PackageSource.get("file:///tmp/fakepackage") ) end end diff --git a/test/objects/tc_service.rb b/test/objects/tc_service.rb index ab7fc1262..d3f4a7cd4 100644 --- a/test/objects/tc_service.rb +++ b/test/objects/tc_service.rb @@ -20,16 +20,16 @@ class TestService < Test::Unit::TestCase Blink[:debug] = 1 assert_nothing_raised() { - unless Blink::Objects::Service.has_key?("sleeper") - Blink::Objects::Service.new( + unless Blink::Types::Service.has_key?("sleeper") + Blink::Types::Service.new( :name => "sleeper", :running => 1 ) - Blink::Objects::Service.addpath( + Blink::Types::Service.addpath( File.join($blinkbase,"examples/root/etc/init.d") ) end - @sleeper = Blink::Objects::Service["sleeper"] + @sleeper = Blink::Types::Service["sleeper"] } end diff --git a/test/objects/tc_symlink.rb b/test/objects/tc_symlink.rb index 045052f59..d25fa1f1c 100644 --- a/test/objects/tc_symlink.rb +++ b/test/objects/tc_symlink.rb @@ -20,12 +20,12 @@ class TestSymlink < Test::Unit::TestCase Kernel.system("rm -f %s" % @path) Blink[:debug] = 1 assert_nothing_raised() { - unless Blink::Objects::Symlink.has_key?(@path) - Blink::Objects::Symlink.new( + unless Blink::Types::Symlink.has_key?(@path) + Blink::Types::Symlink.new( :path => @path ) end - @symlink = Blink::Objects::Symlink[@path] + @symlink = Blink::Types::Symlink[@path] } end |