puppet 0.23.2 → 0.24.0

data/test/util/classgen.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppettest'
@@ -224,4 +224,3 @@ class TestPuppetUtilClassGen < Test::Unit::TestCase
     end
 end
 
-# $Id: classgen.rb 1856 2006-11-11 07:40:16Z luke $

data/test/util/execution.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppettest'
@@ -31,4 +31,3 @@ class TestPuppetUtilExecution < Test::Unit::TestCase
     end
 end
 
-# $Id: execution.rb 1793 2006-10-16 22:01:40Z luke $

data/test/util/features.rb

@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-11-07.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/util/feature'
@@ -93,5 +93,3 @@ class TestFeatures < Test::Unit::TestCase
         end
     end
 end
-
-# $Id: features.rb 2518 2007-05-16 00:00:47Z luke $

data/test/util/fileparsing.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/fileparsing'
@@ -456,12 +456,21 @@ billy three four\n"
                 :separator => " " # A single space
         end
 
-        ["a b c d", "a b * d", "a b * *", "a b c *"].each do |line|
+        { "a b c d" => [],
+          "a b * d" => [:three],
+          "a b * *" => [:three, :four],
+          "a b c *" => [:four]
+        }.each do |line, absentees|
             record = nil
             assert_nothing_raised do
                 record = @parser.parse_line(line)
             end
 
+            # Absent field is :absent, not "*" inside the record
+            absentees.each do |absentee|
+                assert_equal(:absent, record[absentee])
+            end
+
             # Now regenerate the line
             newline = nil
             assert_nothing_raised do
@@ -673,5 +682,4 @@ class TestUtilFileRecord < Test::Unit::TestCase
     end
 end
 
-# $Id: fileparsing.rb 2407 2007-04-23 18:01:36Z luke $
 

data/test/util/filetype.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/util/filetype'
@@ -135,4 +135,3 @@ class TestFileType < Test::Unit::TestCase
     end
 end
 
-# $Id: filetype.rb 2679 2007-07-11 20:23:49Z luke $

data/test/util/inifile.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/inifile'

data/test/util/instance_loader.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/instance_loader'
@@ -19,15 +19,15 @@ class TestInstanceloader < Test::Unit::TestCase
             end
         end
 
-        assert_nothing_raised("Could not create autoloader") do
-            @loader.autoload(:stuff, "puppet/stuff")
+        assert_nothing_raised("Could not create instance loader") do
+            @loader.instance_load(:stuff, "puppet/stuff")
         end
     end
 
     # Make sure we correctly create our autoload instance.  This covers the basics.
     def test_autoload
         # Make sure we can retrieve the loader
-        assert_instance_of(Puppet::Util::Autoload, @loader.instance_loader(:stuff), "Could not get autoloader")
+        assert_instance_of(Puppet::Util::Autoload, @loader.instance_loader(:stuff), "Could not get instance loader")
 
         # Make sure we can get the instance hash
         assert(@loader.instance_hash(:stuff), "Could not get instance hash")
@@ -46,8 +46,7 @@ class TestInstanceloader < Test::Unit::TestCase
         assert_equal("a value", @loader.loaded_instance(:stuff, :testing), "Got incorrect loaded instance")
     end
 
-    def test_autoloading
+    def test_instance_loading
     end
 end
 
-# $Id: instance_loader.rb 2476 2007-05-07 18:59:40Z luke $

data/test/util/loadedfile.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/loadedfile'
@@ -119,4 +119,3 @@ class TestLoadedFile < Test::Unit::TestCase
     end
 end
 
-# $Id: loadedfile.rb 2629 2007-06-19 22:18:55Z luke $

data/test/util/log.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/log'
@@ -272,4 +272,3 @@ class TestLog < Test::Unit::TestCase
     end
 end
 
-# $Id: log.rb 2259 2007-03-06 19:03:05Z luke $

data/test/util/metrics.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/metric'
@@ -75,4 +75,3 @@ class TestMetric < PuppetTest::TestCase
     end
 end
 
-# $Id: metrics.rb 2579 2007-06-14 06:07:31Z luke $

data/test/util/package.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/package'
@@ -24,4 +24,3 @@ class TestPuppetUtilPackage < Test::Unit::TestCase
     end
 end
 
-# $Id: package.rb 2132 2007-01-31 06:48:31Z mpalmer $

data/test/util/posixtest.rb

@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-11-07.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/util/posix'
@@ -167,4 +167,3 @@ class TestPosixUtil < Test::Unit::TestCase
     end
 end
 
-# $Id: posixtest.rb 2598 2007-06-17 23:11:14Z luke $

data/test/util/{config.rb → settings.rb}

@@ -1,15 +1,17 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'mocha'
 require 'puppettest'
-require 'puppet/util/config'
+require 'puppet/util/settings'
 require 'puppettest/parsertesting'
 
-class TestConfig < Test::Unit::TestCase
+class TestSettings < Test::Unit::TestCase
 	include PuppetTest
 	include PuppetTest::ParserTesting
+    CElement = Puppet::Util::Settings::CElement
+    CBoolean = Puppet::Util::Settings::CBoolean
 
     def setup
         super
@@ -57,41 +59,6 @@ class TestConfig < Test::Unit::TestCase
         }
     end
 
-    def test_to_manifest
-        set_configs
-        manifest = nil
-        assert_nothing_raised("Could not convert to a manifest") {
-            manifest = @config.to_manifest
-        }
-
-        Puppet[:parseonly] = true
-
-        interp = nil
-        assert_nothing_raised do
-            interp = mkinterp :Code => manifest, :UseNodes => false
-        end
-
-        trans = nil
-        assert_nothing_raised do
-            trans = interp.evaluate(nil, {})
-        end
-        assert_nothing_raised("Could not instantiate objects") {
-            trans.to_type
-        }
-    end
-
-    def test_to_comp
-        set_configs
-        comp = nil
-        assert_nothing_raised("Could not convert to a component") {
-            comp = @config.to_component
-        }
-
-        assert_nothing_raised("Could not retrieve component") {
-            comp.retrieve
-        }
-    end
-
     def test_to_config
         set_configs
 
@@ -128,7 +95,7 @@ class TestConfig < Test::Unit::TestCase
     def mkconfig
         c = nil
         assert_nothing_raised {
-            c = Puppet::Util::Config.new
+            c = Puppet::Util::Settings.new
         }
         return c
     end
@@ -159,11 +126,11 @@ class TestConfig < Test::Unit::TestCase
 
         assert(! @config[:booltest], "Booltest is not false")
 
-        assert_raise(Puppet::Error) {
+        assert_raise(ArgumentError) {
             @config[:booltest] = "yayness"
         }
 
-        assert_raise(Puppet::Error) {
+        assert_raise(ArgumentError) {
             @config[:booltest] = "/some/file"
         }
     end
@@ -202,7 +169,7 @@ class TestConfig < Test::Unit::TestCase
 
     def test_getset
         initial = "an initial value"
-        assert_raise(Puppet::Error) {
+        assert_raise(ArgumentError) {
             @config[:yayness] = initial
         }
 
@@ -223,7 +190,7 @@ class TestConfig < Test::Unit::TestCase
             @config.clear
         }
 
-        assert_equal(default, @config[:yayness])
+        assert_equal(default, @config[:yayness], "'clear' did not remove old values")
 
         assert_nothing_raised {
             @config[:yayness] = "not default"
@@ -372,27 +339,26 @@ yay = /a/path
             :shoe => ["puppet", "b"] # our default name
         )
         @config.handlearg("--cliparam", "changed")
-        @config.expects(:parse_file).returns(result).times(2)
+        @config.stubs(:parse_file).returns(result)
 
         # First do it with our name being 'puppet'
         assert_nothing_raised("Could not handle parse results") do
             @config.parse(tempfile)
         end
 
-        assert_logged(:warning, /unknown configuration parameter bad/, "Did not log invalid config param")
-
+        assert_equal(:puppet, @config.name, "Did not get correct name")
         assert_equal("main", @config[:main], "Did not get main value")
         assert_equal("puppet", @config[:other], "Did not get name value")
         assert_equal("changed", @config[:cliparam], "CLI values were overridden by config")
 
         # Now switch names and make sure the parsing switches, too.
         @config.clear(true)
-        @config[:name] = :puppetd
         assert_nothing_raised("Could not handle parse results") do
             @config.parse(tempfile)
         end
-        assert_logged(:warning, /unknown configuration parameter bad/, "Did not log invalid config param")
+        @config[:name] = :puppetd
 
+        assert_equal(:puppetd, @config.name, "Did not get correct name")
         assert_equal("main", @config[:main], "Did not get main value")
         assert_equal("puppetd", @config[:other], "Did not get name value")
         assert_equal("changed", @config[:cliparam], "CLI values were overridden by config")
@@ -411,6 +377,7 @@ yay = /a/path
         )
 
         file = tempfile
+        count = 0
 
         {
             :pass => {
@@ -430,17 +397,19 @@ yay = /a/path
                 %{{owner => you}}
             ]
         }.each do |type, list|
+            count += 1
             list.each do |value|
                 if type == :pass
                     value, should = value[0], value[1]
                 end
+                path = "/other%s" % count
                 # Write our file out
                 File.open(file, "w") do |f|
-                    f.puts %{[main]\nfile = /other%s} % value
+                    f.puts %{[main]\nfile = #{path}#{value}}
                 end
 
                 if type == :fail
-                    assert_raise(Puppet::Error, "Did not fail on %s" % value.inspect) do
+                    assert_raise(ArgumentError, "Did not fail on %s" % value.inspect) do
                         @config.send(:parse_file, file)
                     end
                 else
@@ -449,6 +418,7 @@ yay = /a/path
                         result = @config.send(:parse_file, file)
                     end
                     assert_equal(should, result[:main][:_meta][:file], "Got incorrect return for %s" % value.inspect)
+                    assert_equal(path, result[:main][:file], "Got incorrect value for %s" % value.inspect)
                 end
             end
         end
@@ -488,6 +458,7 @@ yay = /a/path
         # Get the actual object, so we can verify metadata
         file = @config.element(:file)
 
+        assert_equal("/other", @config[:file], "Did not get correct value")
         assert_equal("you", file.owner, "Did not pass on user")
         assert_equal("you", file.group, "Did not pass on group")
         assert_equal("644", file.mode, "Did not pass on mode")
@@ -535,34 +506,46 @@ yay = /a/path
         }
     end
 
-    def test_argadding
-        c = mkconfig
-
-        assert_nothing_raised {
-            @config.setdefaults("testing",
-                :onboolean => [true, "An on bool"],
-                :offboolean => [false, "An off bool"],
-                :string => ["a string", "A string arg"],
-                :file => ["/path/to/file", "A file arg"]
-            )
-        }
-        options = []
-
-        @config.addargs(options)
+    def test_addargs
+        @config.setdefaults("testing",
+                            :onboolean => [true, "An on bool"],
+                            :offboolean => [false, "An off bool"],
+                            :string => ["a string", "A string arg"],
+                            :file => ["/path/to/file", "A file arg"]
+                            )
+
+        should = []
+        @config.each { |name, element|
+            element.expects(:getopt_args).returns([name])
+            should << name
+        }
+        result = []
+        assert_nothing_raised("Add args failed") do
+            @config.addargs(result)
+        end
+        assert_equal(should, result, "Did not call addargs correctly.")
 
-        @config.each { |param, obj|
-            opt = "--%s" % param
-            assert(options.find { |ary|
-                ary[0] == opt
-            }, "Argument %s was not added" % opt)
+    end
 
-            if @config.boolean?(param)
-                o = "--no-%s" % param
-                assert(options.find { |ary|
-                ary[0] == o
-                }, "Boolean off %s was not added" % o)
+    def test_addargs_functional
+        @config.setdefaults("testing",
+                            :onboolean => [true, "An on bool"],
+                            :string => ["a string", "A string arg"]
+                            )
+        result = []
+        should = []
+        assert_nothing_raised("Add args failed") do
+            @config.addargs(result)
+        end
+        @config.each do |name, element|
+            if name == :onboolean
+                should << ["--onboolean", GetoptLong::NO_ARGUMENT]
+                should << ["--no-onboolean", GetoptLong::NO_ARGUMENT]
+            elsif name == :string
+                should << ["--string", GetoptLong::REQUIRED_ARGUMENT]
             end
-        }
+        end
+        assert_equal(should, result, "Add args functional test failed")
     end
 
     def test_usesection
@@ -634,91 +617,6 @@ yay = /a/path
         assert_equal("/my/file", @config[:b], "Values are not equal")
     end
 
-    def test_reuse
-        c = mkconfig
-
-        file = tempfile()
-        section = "testing"
-        assert_nothing_raised {
-            @config.setdefaults(section,
-                :myfile => {:default => file, :create => true, :desc => "yay"}
-            )
-        }
-
-        assert_nothing_raised("Could not use a section") {
-            @config.use(section)
-        }
-
-        assert(FileTest.exists?(file), "Did not create file")
-
-        assert(! Puppet::Type.type(:file)[file], "File obj still exists")
-
-        File.unlink(file)
-
-        @config.reuse
-        assert(FileTest.exists?(file), "Did not create file")
-    end
-
-    def test_mkusers
-        c = mkconfig
-
-        file = tempfile()
-        section = "testing"
-        assert_nothing_raised {
-            @config.setdefaults(section,
-                :mkusers => [false, "yay"],
-                :myfile => {
-                    :default => file,
-                    :owner => "pptest",
-                    :group => "pptest",
-                    :desc => "yay",
-                    :create => true
-                }
-            )
-        }
-
-        comp = nil
-        assert_nothing_raised {
-            comp = @config.to_component
-        }
-
-        [:user, :group].each do |type|
-            # The objects might get created internally by Puppet::Util; just
-            # make sure they're not being managed
-            if obj = Puppet.type(type)["pptest"]
-                assert(! obj.managed?, "%s objectis managed" % type)
-            end
-        end
-        comp.each { |o| o.remove }
-
-        @config[:mkusers] = true
-
-        assert_nothing_raised {
-            @config.to_component
-        }
-
-        user = Puppet.type(:user)["pptest"]
-        assert(user, "User object did not get created")
-        assert(user.managed?, "User object is not managed.")
-        assert(user.should(:comment), "user does not have a comment set")
-        
-        group = Puppet.type(:group)["pptest"]
-        assert(group, "Group object did not get created")
-        assert(group.managed?,
-            "Group object is not managed."
-        )
-        
-        if Process.uid == 0
-            cleanup do
-                user[:ensure] = :absent
-                group[:ensure] = :absent
-                assert_apply(user, group)
-            end
-            
-            assert_apply(user, group)
-        end
-    end
-
     def test_notmanagingdev
         c = mkconfig
         path = "/dev/testing"
@@ -730,11 +628,9 @@ yay = /a/path
             }
         )
 
-        assert_nothing_raised {
-            @config.to_component
-        }
+        config = @config.to_configuration
 
-        assert(! Puppet.type(:file)["/dev/testing"], "Created dev file")
+        assert(! config.resource(:file, "/dev/testing"), "Created dev file")
     end
 
     def test_groupsetting
@@ -839,37 +735,6 @@ yay = /a/path
         end
     end
 
-    def test_booleans_and_integers
-        config = mkconfig
-        config.setdefaults(:mysection,
-            :booltest => [false, "yay"],
-            :inttest => [14, "yay"]
-        )
-
-        file = tempfile()
-
-        File.open(file, "w") do |f|
-            f.puts %{
-[main]
-booltest = true
-inttest = 27
-}
-        end
-
-        assert_nothing_raised {
-            config.parse(file)
-        }
-
-        assert_equal(true, config[:booltest], "Boolean was not converted")
-        assert_equal(27, config[:inttest], "Integer was not converted")
-
-        # Now make sure that they get converted through handlearg
-        config.handlearg("--inttest", "true")
-        assert_equal(true, config[:inttest], "Boolean was not converted")
-        config.handlearg("--no-booltest", "false")
-        assert_equal(false, config[:booltest], "Boolean was not converted")
-    end
-
     # Make sure that tags are ignored when configuring
     def test_configs_ignore_tags
         config = mkconfig
@@ -903,15 +768,15 @@ inttest = 27
         }
 
         assert_equal("http://yayness/rahness", val,
-            "Config got messed up")
+            "Settings got messed up")
     end
 
     def test_correct_type_assumptions
         config = mkconfig
 
-        file = Puppet::Util::Config::CFile
-        element = Puppet::Util::Config::CElement
-        bool = Puppet::Util::Config::CBoolean
+        file = Puppet::Util::Settings::CFile
+        element = Puppet::Util::Settings::CElement
+        bool = Puppet::Util::Settings::CBoolean
 
         # We have to keep these ordered, unfortunately.
         [
@@ -925,15 +790,10 @@ inttest = 27
             ["$server/yayness.conf", file]
         ].each do |ary|
             value, type = ary
-            elem = nil
             assert_nothing_raised {
-                elem = config.newelement(
-                    :name => value,
-                    :default => value,
-                    :desc => name.to_s,
-                    :section => :yayness
-                )
+                config.setdefaults(:yayness, value => { :default => value, :desc => name.to_s})
             }
+            elem = config.element(value)
 
             assert_instance_of(type, elem,
                 "%s got created as wrong type" % value.inspect)
@@ -949,11 +809,10 @@ inttest = 27
         config.setdefaults(:mysection, :clichange => ["clichange", "yay"])
         config.setdefaults(:mysection, :filechange => ["filechange", "yay"])
 
-        file = tempfile()
-        # Set one parameter in the file
-        File.open(file, "w") { |f|
-            f.puts %{[main]\nfilechange = filevalue}
-        }
+        config.stubs(:read_file).returns(%{[main]\nfilechange = filevalue\n})
+        file = mock 'file'
+        file.stubs(:changed?).returns(true)
+
         assert_nothing_raised {
             config.parse(file)
         }
@@ -965,16 +824,14 @@ inttest = 27
 
         # And leave the other unset
         assert_equal("default", config[:default])
-        assert_equal("filevalue", config[:filechange])
+        assert_equal("filevalue", config[:filechange], "Did not get value from file")
         assert_equal("clivalue", config[:clichange])
 
-        # Now rewrite the file
-        File.open(file, "w") { |f|
-            f.puts %{[main]\nfilechange = newvalue}
-        }
-
-        cfile = config.file
-        cfile.send("tstamp=".intern, Time.now - 50)
+        # Now reparse
+        config.stubs(:read_file).returns(%{[main]\nfilechange = newvalue\n})
+        file = mock 'file'
+        file.stubs(:changed?).returns(true)
+        config.parse(file)
 
         # And check all of the values
         assert_equal("default", config[:default])
@@ -1059,21 +916,17 @@ inttest = 27
         config = mkconfig()
 
         testing = nil
-        elem = nil
         assert_nothing_raised do
-            elem = config.newelement :default => "yay",
-                :name => :blocktest,
-                :desc => "boo",
-                :section => :test,
-                :hook => proc { |value| testing = value }
+            config.setdefaults :test, :blocktest => {:default => "yay", :desc => "boo", :hook => proc { |value| testing = value }}
         end
+        elem = config.element(:blocktest)
 
         assert_nothing_raised do
             assert_equal("yay", elem.value)
         end
 
         assert_nothing_raised do
-            elem.value = "yaytest"
+            config[:blocktest] = "yaytest"
         end
 
         assert_nothing_raised do
@@ -1082,7 +935,7 @@ inttest = 27
         assert_equal("yaytest", testing)
 
         assert_nothing_raised do
-            elem.value = "another"
+            config[:blocktest] = "another"
         end
 
         assert_nothing_raised do
@@ -1128,12 +981,12 @@ inttest = 27
         # Now enable it so they'll be added
         config[:mkusers] = true
 
-        comp = config.to_component
+        comp = config.to_configuration
 
-        Puppet::Type.type(:user).each do |u|
+        comp.vertices.find_all { |r| r.class.name == :user }.each do |u|
             assert(u.name != "root", "Tried to manage root user")
         end
-        Puppet::Type.type(:group).each do |u|
+        comp.vertices.find_all { |r| r.class.name == :group }.each do |u|
             assert(u.name != "root", "Tried to manage root group")
             assert(u.name != "wheel", "Tried to manage wheel group")
         end
@@ -1176,9 +1029,6 @@ inttest = 27
         assert_nothing_raised("Unknown parameter threw an exception") do
             config.parse(file)
         end
-
-        assert(@logs.detect { |l| l.message =~ /unknown configuration/ and l.level == :warning },
-            "Did not generate warning message")
     end
 
     def test_multiple_interpolations
@@ -1204,45 +1054,53 @@ inttest = 27
             "Did not interpolate curlied variables")
     end
 
-    # Discovered from #734
-    def test_set_parameter_hash
-        @config.setdefaults(:section,
-            :unchanged => ["unval", "yay"],
-            :normal => ["normalval", "yay"],
-            :cliparam => ["clival", "yay"],
-            :file => ["/my/file", "yay"]
-        )
-
-        # Set the cli param using the cli method
-        @config.handlearg("--cliparam", "other")
+    # Test to make sure that we can set and get a short name
+    def test_celement_short_name
+        element = nil
+        assert_nothing_raised("Could not create celement") do
+            element = CElement.new :short => "n", :desc => "anything"
+        end
+        assert_equal("n", element.short, "Short value is not retained")
 
-        # Make sure missing params just throw warnings, not errors
-        assert_nothing_raised("Could not call set_parameter_hash with an invalid option") do
-            @config.send(:set_parameter_hash, :missing => "something")
+        assert_raise(ArgumentError,"Allowed multicharactered short names.") do
+            element = CElement.new :short => "no", :desc => "anything"
         end
+    end
 
-        # Make sure normal values get set
-        assert_nothing_raised("Could not call set_parameter_hash with a normal value") do
-            @config.send(:set_parameter_hash, :normal => "abnormal")
+    # Test to make sure that no two celements have the same short name
+    def test_celement_short_name_not_duplicated
+        config = mkconfig
+        assert_nothing_raised("Could not create celement with short name.") do
+            config.setdefaults(:main,
+                               :one => { :default => "blah", :desc => "anything", :short => "o" })
         end
-        assert_equal("abnormal", @config[:normal], "Value did not get set")
-        
-        # Make sure cli-set values don't get overridden
-        assert_nothing_raised("Could not call set_parameter_hash with an override of a cli value") do
-            @config.send(:set_parameter_hash, :cliparam => "something else")
+        assert_nothing_raised("Could not create second celement with short name.") do
+            config.setdefaults(:main,
+                               :two => { :default => "blah", :desc => "anything", :short => "i" })
         end
-        assert_equal("other", @config[:cliparam], "CLI value was overridden by config value")
-
-        # Make sure the meta stuff works
-        assert_nothing_raised("Could not call set_parameter_hash with meta info") do
-            @config.send(:set_parameter_hash, :file => "/other/file", :_meta => {:file => {:mode => "0755"}})
+        assert_raise(ArgumentError, "Could create second celement with duplicate short name.") do
+            config.setdefaults(:main,
+                               :three => { :default => "blah", :desc => "anything", :short => "i" })
         end
-        assert_equal("/other/file", @config[:file], "value with meta info was overridden by config value")
-        assert_equal("0755", @config.element(:file).mode, "Did not set mode from meta info")
+        # make sure that when the above raises an expection that the config is not included
+        assert(!config.include?(:three), "Invalid configuration item was retained")
+    end
+
+    # Tell getopt which arguments are valid
+    def test_get_getopt_args
+        element = CElement.new :name => "foo", :desc => "anything"
+        assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")
+        
+        element.short = "n"
+        assert_equal([["--foo", "-n", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")
+
+        element = CBoolean.new :name => "foo", :desc => "anything"
+        assert_equal([["--foo", GetoptLong::NO_ARGUMENT], ["--no-foo", GetoptLong::NO_ARGUMENT]],
+                     element.getopt_args, "Did not produce appropriate getopt args")
 
-        # And make sure other params are unchanged
-        assert_equal("unval", @config[:unchanged], "Unchanged value has somehow changed")
+        element.short = "n"
+        assert_equal([["--foo", "-n", GetoptLong::NO_ARGUMENT],["--no-foo", GetoptLong::NO_ARGUMENT]],
+                      element.getopt_args, "Did not produce appropriate getopt args")
     end
 end
 
-# $Id: config.rb 2743 2007-08-04 00:36:47Z luke $