Applying patch by DavidS from #522, along with test code and a small bit of code cleanup.

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

1 files changed, 38 insertions, 1 deletions

diff --git a/test/language/ast/casestatement.rb b/test/language/ast/casestatement.rb
index 493474909..036216757 100755
--- a/test/language/ast/casestatement.rb
+++ b/test/language/ast/casestatement.rb
@@ -62,6 +62,43 @@ class TestCaseStatement < Test::Unit::TestCase
         assert_equal(["lower"], result, "Did not match case-insensitively")
         assert(! hash["MyParam"].evaluated?, "upper value was evaluated even though it did not match")
     end
+
+    # #522 - test that case statements with multiple values work as
+    # expected, where any true value suffices.
+    def test_multiple_values
+        ast = nil
+
+        tests = {
+            "one" => %w{a b c},
+            "two" => %w{e f g}
+        }
+        options = tests.collect do |result, values|
+            values = values.collect { |v| AST::Leaf.new :value => v }
+            AST::CaseOpt.new(:value => AST::ASTArray.new(:children => values),
+                :statements => AST::Leaf.new(:value => result))
+        end
+        options << AST::CaseOpt.new(:value => AST::Default.new(:value => "default"),
+            :statements => AST::Leaf.new(:value => "default"))
+
+        ast = nil
+        param = AST::Variable.new(:value => "testparam")
+        assert_nothing_raised do
+            ast = AST::CaseStatement.new(:test => param, :options => options)
+        end
+        result = nil
+        tests.each do |should, values|
+            values.each do |value|
+                result = nil
+                scope = mkscope
+                scope.setvar("testparam", value)
+                assert_nothing_raised do
+                    result = ast.evaluate(:scope => scope)
+                end
+
+                assert_equal(should, result, "Got incorrect result for %s" % value)
+            end
+        end
+    end
 end
 
-# $Id$
\ No newline at end of file
+# $Id$