From c8f38b7fee12eefb2bed00681b4952ac7ad3f14f Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Wed, 31 Jan 2007 19:38:02 +0000
Subject: Renaming "pelement" to "resource".  The old name is a holdover from
 before we had settled on "resource" as a term.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2137 980ebf18-57e1-0310-9a29-db15c13687c0
---
 test/client/pelement.rb | 96 -------------------------------------------------
 test/client/resource.rb | 96 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 96 deletions(-)
 delete mode 100755 test/client/pelement.rb
 create mode 100755 test/client/resource.rb

(limited to 'test/client')

diff --git a/test/client/pelement.rb b/test/client/pelement.rb
deleted file mode 100755
index 8c8e76963..000000000
--- a/test/client/pelement.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
-
-require 'puppet'
-require 'puppet/client/pelement'
-require 'puppet/server'
-require 'puppettest'
-
-# $Id$
-
-class TestPElementClient < Test::Unit::TestCase
-    include PuppetTest::ServerTest
-
-    def mkpelementserver
-        handlers = {
-            :CA => {}, # so that certs autogenerate
-            :PElement => {},
-        }
-
-        return mkserver(handlers)
-    end
-
-    def mkclient
-        client = nil
-        assert_nothing_raised {
-            client = Puppet::Client::PElement.new(:Server => "localhost",
-                :Port => @@port)
-        }
-
-        return client
-    end
-
-    def test_pelements
-        file = tempfile()
-        text = "yayness\n"
-        File.open(file, "w") { |f| f.print text }
-
-        mkpelementserver()
-
-        client = mkclient()
-
-        # Test describing
-        tobj = nil
-        assert_nothing_raised {
-            tobj = client.describe("file", file)
-        }
-
-        assert(tobj, "Did not get response")
-
-        assert_instance_of(Puppet::TransObject, tobj)
-
-        obj = nil
-        assert_nothing_raised {
-            obj = tobj.to_type
-        }
-        assert_events([], obj)
-        File.unlink(file)
-        assert_events([:file_created], obj)
-        File.unlink(file)
-
-        # Now test applying
-        result = nil
-        assert_nothing_raised {
-            result = client.apply(tobj)
-        }
-        assert(FileTest.exists?(file), "File was not created on apply")
-
-        # Lastly, test "list"
-        list = nil
-        assert_nothing_raised {
-            list = client.list("user")
-        }
-
-        assert_instance_of(Puppet::TransBucket, list)
-
-        count = 0
-        list.each do |tobj|
-            break if count > 3
-            assert_instance_of(Puppet::TransObject, tobj)
-
-            tobj2 = nil
-            assert_nothing_raised {
-                tobj2 = client.describe(tobj.type, tobj.name)
-            }
-
-            obj = nil
-            assert_nothing_raised {
-                obj = tobj2.to_type
-            }
-            assert_events([], obj)
-
-            count += 1
-        end
-    end
-end
diff --git a/test/client/resource.rb b/test/client/resource.rb
new file mode 100755
index 000000000..51fe7ba7e
--- /dev/null
+++ b/test/client/resource.rb
@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+
+require 'puppet'
+require 'puppet/client/resource'
+require 'puppet/server'
+require 'puppettest'
+
+# $Id$
+
+class TestResourceClient < Test::Unit::TestCase
+    include PuppetTest::ServerTest
+
+    def mkresourceserver
+        handlers = {
+            :CA => {}, # so that certs autogenerate
+            :Resource => {},
+        }
+
+        return mkserver(handlers)
+    end
+
+    def mkclient
+        client = nil
+        assert_nothing_raised {
+            client = Puppet::Client::Resource.new(:Server => "localhost",
+                :Port => @@port)
+        }
+
+        return client
+    end
+
+    def test_resources
+        file = tempfile()
+        text = "yayness\n"
+        File.open(file, "w") { |f| f.print text }
+
+        mkresourceserver()
+
+        client = mkclient()
+
+        # Test describing
+        tobj = nil
+        assert_nothing_raised {
+            tobj = client.describe("file", file)
+        }
+
+        assert(tobj, "Did not get response")
+
+        assert_instance_of(Puppet::TransObject, tobj)
+
+        obj = nil
+        assert_nothing_raised {
+            obj = tobj.to_type
+        }
+        assert_events([], obj)
+        File.unlink(file)
+        assert_events([:file_created], obj)
+        File.unlink(file)
+
+        # Now test applying
+        result = nil
+        assert_nothing_raised {
+            result = client.apply(tobj)
+        }
+        assert(FileTest.exists?(file), "File was not created on apply")
+
+        # Lastly, test "list"
+        list = nil
+        assert_nothing_raised {
+            list = client.list("user")
+        }
+
+        assert_instance_of(Puppet::TransBucket, list)
+
+        count = 0
+        list.each do |tobj|
+            break if count > 3
+            assert_instance_of(Puppet::TransObject, tobj)
+
+            tobj2 = nil
+            assert_nothing_raised {
+                tobj2 = client.describe(tobj.type, tobj.name)
+            }
+
+            obj = nil
+            assert_nothing_raised {
+                obj = tobj2.to_type
+            }
+            assert_events([], obj)
+
+            count += 1
+        end
+    end
+end
-- 
cgit