renaming objects to types, since they are just subclasses of Blink::Type

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

6 files changed, 0 insertions, 491 deletions

diff --git a/test/objects/tc_basic.rb b/test/objects/tc_basic.rb
deleted file mode 100644
index 6d453d188..000000000
--- a/test/objects/tc_basic.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $blinkbase = "../.."
-end
-
-require 'blink'
-require 'test/unit'
-
-# $Id$
-
-class TestBasic < Test::Unit::TestCase
-    # hmmm
-    # this is complicated, because we store references to the created
-    # objects in a central store
-    def setup
-        @component = nil
-        @configfile = nil
-        @sleeper = nil
-
-        Blink[:debug] = 1
-
-        assert_nothing_raised() {
-            unless Blink::Component.has_key?("sleeper")
-                Blink::Component.new(
-                    :name => "sleeper"
-                )
-            end
-            @component = Blink::Component["sleeper"]
-        }
-
-        assert_nothing_raised() {
-            cfile = File.join($blinkbase,"examples/root/etc/configfile")
-            unless Blink::Type::File.has_key?(cfile)
-                Blink::Type::File.new(
-                    :path => cfile
-                )
-            end
-            @configfile = Blink::Type::File[cfile]
-        }
-        assert_nothing_raised() {
-            unless Blink::Type::Service.has_key?("sleeper")
-                Blink::Type::Service.new(
-                    :name => "sleeper",
-                    :running => 1
-                )
-                Blink::Type::Service.addpath(
-                    File.join($blinkbase,"examples/root/etc/init.d")
-                )
-            end
-            @sleeper = Blink::Type::Service["sleeper"]
-        }
-        assert_nothing_raised() {
-            @component.push(
-                @configfile,
-                @sleeper
-            )
-        }
-        
-        #puts "Component is %s, id %s" % [@component, @component.object_id]
-        #puts "ConfigFile is %s, id %s" % [@configfile, @configfile.object_id]
-    end
-
-    def test_name_calls
-        [@component,@sleeper,@configfile].each { |obj|
-            assert_nothing_raised(){
-                obj.name
-            }
-        }
-    end
-
-    def test_name_equality
-        #puts "Component is %s, id %s" % [@component, @component.object_id]
-        assert_equal(
-            "sleeper",
-            @component.name
-        )
-
-        assert_equal(
-            File.join($blinkbase,"examples/root/etc/configfile"),
-            @configfile.name
-        )
-
-        assert_equal(
-            "sleeper",
-            @sleeper.name
-        )
-    end
-
-    def test_object_retrieval
-        [@component,@sleeper,@configfile].each { |obj|
-            assert_equal(
-                obj.class[obj.name].object_id,
-                obj.object_id
-            )
-        }
-    end
-end
diff --git a/test/objects/tc_file.rb b/test/objects/tc_file.rb
deleted file mode 100644
index 5731bfec0..000000000
--- a/test/objects/tc_file.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $blinkbase = "../.."
-end
-
-require 'blink'
-require 'test/unit'
-
-# $Id$
-
-class TestFile < Test::Unit::TestCase
-    # hmmm
-    # this is complicated, because we store references to the created
-    # objects in a central store
-    def setup
-        @file = nil
-        @path = File.join($blinkbase,"examples/root/etc/configfile")
-        Blink[:debug] = 1
-        assert_nothing_raised() {
-            unless Blink::Type::File.has_key?(@path)
-                Blink::Type::File.new(
-                    :path => @path
-                )
-            end
-            @file = Blink::Type::File[@path]
-        }
-    end
-
-    def test_owner
-        [Process.uid,%x{whoami}.chomp].each { |user|
-            assert_nothing_raised() {
-                @file[:owner] = user
-            }
-            assert_nothing_raised() {
-                @file.retrieve
-            }
-            assert_nothing_raised() {
-                @file.sync
-            }
-            assert_nothing_raised() {
-                @file.retrieve
-            }
-            assert(@file.insync?())
-        }
-        assert_nothing_raised() {
-            @file[:owner] = "root"
-        }
-        assert_nothing_raised() {
-            @file.retrieve
-        }
-        # we might already be in sync
-        assert(!@file.insync?())
-        assert_nothing_raised() {
-            @file.delete(:owner)
-        }
-    end
-
-    def test_group
-        [%x{groups}.chomp.split(/ /), Process.groups].flatten.each { |group|
-            assert_nothing_raised() {
-                @file[:group] = group
-            }
-            assert_nothing_raised() {
-                @file.retrieve
-            }
-            assert_nothing_raised() {
-                @file.sync
-            }
-            assert_nothing_raised() {
-                @file.retrieve
-            }
-            assert(@file.insync?())
-            assert_nothing_raised() {
-                @file.delete(:group)
-            }
-        }
-    end
-
-    def test_modes
-        [0644,0755,0777,0641].each { |mode|
-            assert_nothing_raised() {
-                @file[:mode] = mode
-            }
-            assert_nothing_raised() {
-                @file.retrieve
-            }
-            assert_nothing_raised() {
-                @file.sync
-            }
-            assert_nothing_raised() {
-                @file.retrieve
-            }
-            assert(@file.insync?())
-            assert_nothing_raised() {
-                @file.delete(:mode)
-            }
-        }
-    end
-end
diff --git a/test/objects/tc_filetype.rb b/test/objects/tc_filetype.rb
deleted file mode 100644
index bf2e2ee9d..000000000
--- a/test/objects/tc_filetype.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $blinkbase = "../.."
-end
-
-require 'blink'
-require 'blink/type/filetype'
-require 'test/unit'
-
-# $Id$
-
-class TestFileType < Test::Unit::TestCase
-    def setup
-        Blink[:debug] = 1
-
-        @passwdtype = Blink::FileType["passwd"]
-        if @passwdtype.nil?
-            assert_nothing_raised() {
-                @passwdtype = Blink::FileType.newtype(
-                    :name => "passwd",
-                    :recordsplit => ":",
-                    :fields => %w{name password uid gid gcos home shell},
-                    :namevar => "name"
-                )
-            }
-        end
-
-        @passwdtype = Blink::FileType["passwd"]
-        if @passwdtype.nil?
-            assert_nothing_raised() {
-                @passwdtype = Blink::FileType.newtype(
-                    :name => "user",
-                    :recordsplit => ":",
-                    :fields => %w{name password uid gid gcos home shell},
-                    :namevar => "name"
-                )
-            }
-        end
-    end
-
-    def test_passwd1_nochange
-        file = nil
-        type = nil
-        assert_nothing_raised() {
-            file = @passwdtype.new("/etc/passwd")
-        }
-        assert_nothing_raised() {
-            file.retrieve
-        }
-
-        assert(file.insync?)
-
-        contents = ""
-        File.open("/etc/passwd") { |ofile|
-            ofile.each { |line|
-                contents += line
-            }
-        }
-
-        assert_equal(
-            contents,
-            file.to_s
-        )
-
-    end
-
-    def test_passwd2_change
-        file = nil
-        type = nil
-        Kernel.system("cp /etc/passwd /tmp/oparsepasswd")
-        assert_nothing_raised() {
-            file = @passwdtype.new("/tmp/oparsepasswd")
-        }
-        assert_nothing_raised() {
-            file.retrieve
-        }
-
-        assert(file.insync?)
-
-        assert_nothing_raised() {
-            file.add { |obj|
-                obj["name"] = "yaytest"
-                obj["password"] = "x"
-                obj["uid"] = "10000"
-                obj["gid"] = "10000"
-                obj["home"] = "/home/yaytest"
-                obj["gcos"] = "The Yaytest"
-                obj["shell"] = "/bin/sh"
-            }
-        }
-
-        assert(!file.insync?)
-
-        assert_nothing_raised() {
-            file.sync
-        }
-
-        assert(file.insync?)
-
-        assert_nothing_raised() {
-            file.delete("bin")
-        }
-
-        assert(!file.insync?)
-
-        assert_nothing_raised() {
-            file.sync
-        }
-
-        assert(file.insync?)
-
-        #Kernel.system("rm /tmp/oparsepasswd")
-    end
-end
diff --git a/test/objects/tc_package.rb b/test/objects/tc_package.rb
deleted file mode 100644
index d78dca75d..000000000
--- a/test/objects/tc_package.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $blinkbase = "../.."
-end
-
-require 'blink/type/package'
-require 'test/unit'
-require 'facter'
-
-# $Id$
-
-class TestPackagingType < Test::Unit::TestCase
-    def test_listing
-        platform = Facter["operatingsystem"].value
-        type = nil
-        case platform
-        when "SunOS"
-            type = "sunpkg"
-        when "Linux"
-            type = "dpkg"
-        else
-            type = :invalid
-        end
-
-        assert_nothing_raised() {
-            Blink::Type::PackagingType[type].list
-        }
-    end
-end
-
-class TestPackageSource < Test::Unit::TestCase
-    def test_filesource
-        assert_equal(
-            "/tmp/fakepackage",
-            Blink::Type::PackageSource.get("file:///tmp/fakepackage")
-        )
-    end
-end
diff --git a/test/objects/tc_service.rb b/test/objects/tc_service.rb
deleted file mode 100644
index ad85f615a..000000000
--- a/test/objects/tc_service.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $blinkbase = "../.."
-end
-
-require 'blink'
-require 'test/unit'
-
-# $Id$
-
-class TestService < Test::Unit::TestCase
-    # hmmm
-    # this is complicated, because we store references to the created
-    # objects in a central store
-    def setup
-        @sleeper = nil
-        script = File.join($blinkbase,"examples/root/etc/init.d/sleeper")
-        @status = script + " status"
-
-        Blink[:debug] = 1
-        assert_nothing_raised() {
-            unless Blink::Type::Service.has_key?("sleeper")
-                Blink::Type::Service.new(
-                    :name => "sleeper",
-                    :running => 1
-                )
-                Blink::Type::Service.addpath(
-                    File.join($blinkbase,"examples/root/etc/init.d")
-                )
-            end
-            @sleeper = Blink::Type::Service["sleeper"]
-        }
-    end
-
-    def test_process_start
-        # start it
-        assert_nothing_raised() {
-            @sleeper[:running] = 1
-        }
-        assert_nothing_raised() {
-            @sleeper.retrieve
-        }
-        assert(!@sleeper.insync?())
-        assert_nothing_raised() {
-            @sleeper.sync
-        }
-        assert_nothing_raised() {
-            @sleeper.retrieve
-        }
-        assert(@sleeper.insync?)
-
-        # now stop it
-        assert_nothing_raised() {
-            @sleeper[:running] = 0
-        }
-        assert_nothing_raised() {
-            @sleeper.retrieve
-        }
-        assert(!@sleeper.insync?())
-        assert_nothing_raised() {
-            @sleeper.sync
-        }
-        assert_nothing_raised() {
-            @sleeper.retrieve
-        }
-        assert(@sleeper.insync?)
-    end
-    def teardown
-        Kernel.system("pkill sleeper")
-    end
-end
diff --git a/test/objects/tc_symlink.rb b/test/objects/tc_symlink.rb
deleted file mode 100644
index 177f523a5..000000000
--- a/test/objects/tc_symlink.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-if __FILE__ == $0
-    $:.unshift '..'
-    $:.unshift '../../lib'
-    $blinkbase = "../.."
-end
-
-require 'blink'
-require 'test/unit'
-
-# $Id$
-
-class TestSymlink < Test::Unit::TestCase
-    # hmmm
-    # this is complicated, because we store references to the created
-    # objects in a central store
-    def setup
-        @symlink = nil
-        @path = File.join($blinkbase,"examples/root/etc/symlink")
-
-        Kernel.system("rm -f %s" % @path)
-        Blink[:debug] = 1
-        assert_nothing_raised() {
-            unless Blink::Type::Symlink.has_key?(@path)
-                Blink::Type::Symlink.new(
-                    :path => @path
-                )
-            end
-            @symlink = Blink::Type::Symlink[@path]
-        }
-    end
-
-    def test_target
-        assert_nothing_raised() {
-            @symlink[:target] = "configfile"
-        }
-        assert_nothing_raised() {
-            @symlink.retrieve
-        }
-        # we might already be in sync
-        assert(!@symlink.insync?())
-        assert_nothing_raised() {
-            @symlink.sync
-        }
-        assert_nothing_raised() {
-            @symlink.retrieve
-        }
-        assert(@symlink.insync?())
-        assert_nothing_raised() {
-            @symlink[:target] = nil
-        }
-        assert_nothing_raised() {
-            @symlink.retrieve
-        }
-        assert(!@symlink.insync?())
-        assert_nothing_raised() {
-            @symlink.sync
-        }
-        assert_nothing_raised() {
-            @symlink.retrieve
-        }
-        assert(@symlink.insync?())
-    end
-
-    def teardown
-        Kernel.system("rm -f %s" % @path)
-    end
-end