From ea70e027b63a1b8bfe4087a4de978ad4eef5575b Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Wed, 23 Nov 2011 23:49:43 +0900
Subject: Remove unreachable code, and add additional testcases.

---
 actionpack/test/dispatch/request/json_params_parsing_test.rb | 12 ++++++++++++
 actionpack/test/dispatch/request/xml_params_parsing_test.rb  | 12 ++++++++++++
 2 files changed, 24 insertions(+)

(limited to 'actionpack/test/dispatch/request')

diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index d854d55173..d481a2df13 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -45,6 +45,18 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test "occurring a parse error if parsing unsuccessful" do
+    with_test_routing do
+      begin
+        $stderr = StringIO.new # suppress the log
+        json = "[\"person]\": {\"name\": \"David\"}}"
+        assert_raise(MultiJson::DecodeError) { post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => false} }
+      ensure
+        $stderr = STDERR
+      end
+    end
+  end
+
   private
     def assert_parses(expected, actual, headers = {})
       with_test_routing do
diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
index 38453dfe48..65a25557b7 100644
--- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
@@ -67,6 +67,18 @@ class XmlParamsParsingTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test "occurring a parse error if parsing unsuccessful" do
+    with_test_routing do
+      begin
+        $stderr = StringIO.new # suppress the log
+        xml = "<person><name>David</name></pineapple>"
+        assert_raise(REXML::ParseException) { post "/parse", xml, default_headers.merge('action_dispatch.show_exceptions' => false) }
+      ensure
+        $stderr = STDERR
+      end
+    end
+  end
+
   test "parses multiple files" do
     xml = <<-end_body
       <person>
-- 
cgit v1.2.3