(#6806) Improve error checking and reporting for interface naming.

We didn't do enough input checking and sanitization, and missed some
edge-cases for naming interfaces.  This adds testing, and cleans up some edge
cases to handle things better.

Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>

1 files changed, 27 insertions, 0 deletions

diff --git a/spec/unit/interface_spec.rb b/spec/unit/interface_spec.rb
index 4b6fd117f..cfa0111f6 100644..100755
--- a/spec/unit/interface_spec.rb
+++ b/spec/unit/interface_spec.rb
@@ -92,4 +92,31 @@ describe Puppet::Interface do
   end
 
   it "should be able to load all actions in all search paths"
+
+  describe "#constantize" do
+    faulty = [1, "#foo", "$bar", "sturm und drang", :"sturm und drang"]
+    valid  = {
+      "foo"      => "Foo",
+      :foo       => "Foo",
+      "foo_bar"  => "FooBar",
+      :foo_bar   => "FooBar",
+      "foo-bar"  => "FooBar",
+      :"foo-bar" => "FooBar",
+    }
+
+    valid.each do |input, expect|
+      it "should map '#{input}' to '#{expect}'" do
+        result = Puppet::Interface.constantize(input)
+        result.should be_a String
+        result.to_s.should == expect
+      end
+    end
+
+    faulty.each do |input|
+      it "should fail when presented with #{input.inspect} (#{input.class})" do
+        expect { Puppet::Interface.constantize(input) }.
+          should raise_error ArgumentError, /not a valid interface name/
+      end
+    end
+  end
 end