Merge branch 'remove-tests-catch-fail' of https://github.com/Maks3w/zf2…

… into hotfix/tests-exceptions
zendframework · Jul 5, 2012 · 2056187 · 2056187
commit 2056187
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/test/JsonXmlTest.php b/test/JsonXmlTest.php
@@ -558,16 +558,12 @@ public function testNestingDepthIsHandledProperlyWhenNestingDepthExceedsMaximum(
      * @dataProvider providerNestingDepthIsHandledProperly
      */
     public function testNestingDepthIsHandledProperlyWhenNestingDepthDoesNotExceedMaximum($xmlStringContents)
-    {   
-        try {
-            Json\Json::$maxRecursionDepthAllowed = 25;
-            $jsonString = Json\Json::fromXml($xmlStringContents, true);
-            $jsonArray = Json\Json::decode($jsonString, Json\Json::TYPE_ARRAY);
-            $this->assertNotNull($jsonArray, "JSON decode result is NULL");
-            $this->assertSame('A', $jsonArray['response']['message_type']['defaults']['close_rules']['after_responses']);
-        } catch ( Zend\Json\Exception\RecursionException $ex ) {
-            $this->fail('Zend_Json::fromXml does not implement recursion check properly');
-        }
+    {
+        Json\Json::$maxRecursionDepthAllowed = 25;
+        $jsonString = Json\Json::fromXml($xmlStringContents, true);
+        $jsonArray = Json\Json::decode($jsonString, Json\Json::TYPE_ARRAY);
+        $this->assertNotNull($jsonArray, "JSON decode result is NULL");
+        $this->assertSame('A', $jsonArray['response']['message_type']['defaults']['close_rules']['after_responses']);
     }
 
     /**