Merging the state-rename branch. This includes the diff from version 2156 to 2168. All states should now be properties, with backward compatibility for the types that restricted themselves to the methods.

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

1 files changed, 8 insertions, 8 deletions

diff --git a/test/lib/puppettest/fakes.rb b/test/lib/puppettest/fakes.rb
index 137042d7f..ca47268c8 100644
--- a/test/lib/puppettest/fakes.rb
+++ b/test/lib/puppettest/fakes.rb
@@ -13,12 +13,12 @@ module PuppetTest
             @realmodel.namevar
         end
 
-        def self.validstates
-            Puppet::Type.type(@name).validstates
+        def self.validproperties
+            Puppet::Type.type(@name).validproperties
         end
 
-        def self.validstate?(name)
-            Puppet::Type.type(@name).validstate?(name)
+        def self.validproperty?(name)
+            Puppet::Type.type(@name).validproperty?(name)
         end
 
         def self.to_s
@@ -26,7 +26,7 @@ module PuppetTest
         end
 
         def [](param)
-            if @realmodel.attrtype(param) == :state
+            if @realmodel.attrtype(param) == :property
                 @is[param]
             else
                 @params[param]
@@ -39,7 +39,7 @@ module PuppetTest
                 raise Puppet::DevError, "Invalid attribute %s for %s" %
                     [param, @realmodel.name]
             end
-            if @realmodel.attrtype(param) == :state
+            if @realmodel.attrtype(param) == :property
                 @should[param] = value
             else
                 @params[param] = value
@@ -96,8 +96,8 @@ module PuppetTest
 
         # Set up methods to fake things
         def self.apimethods(*ary)
-            @model.validstates.each do |state|
-                ary << state unless ary.include? state
+            @model.validproperties.each do |property|
+                ary << property unless ary.include? property
             end
             attr_accessor(*ary)