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

Author: weierophinney

test/Adapter/DbTableTest.php

@@ -114,12 +114,8 @@ public function testAuthenticateFailureIdentityNotFound()
         $this->_adapter->setIdentity('non_existent_username');
         $this->_adapter->setCredential('my_password');
 
-        try {
-            $result = $this->_adapter->authenticate();
-            $this->assertEquals(Authentication\Result::FAILURE_IDENTITY_NOT_FOUND, $result->getCode());
-        } catch (Adapter\Exception\RuntimeException $e) {
-            $this->fail('Exception should have been thrown');
-        }
+        $result = $this->_adapter->authenticate();
+        $this->assertEquals(Authentication\Result::FAILURE_IDENTITY_NOT_FOUND, $result->getCode());
     }
 
     /**
@@ -134,12 +130,8 @@ public function testAuthenticateFailureIdentityAmbiguous()
         $this->_adapter->setIdentity('my_username');
         $this->_adapter->setCredential('my_password');
 
-        try {
-            $result = $this->_adapter->authenticate();
-            $this->assertEquals(Authentication\Result::FAILURE_IDENTITY_AMBIGUOUS, $result->getCode());
-        } catch (Adapter\Exception\RuntimeException $e) {
-            $this->fail('Exception should have been thrown');
-        }
+        $result = $this->_adapter->authenticate();
+        $this->assertEquals(Authentication\Result::FAILURE_IDENTITY_AMBIGUOUS, $result->getCode());
     }
 
     /**
@@ -208,12 +200,9 @@ public function testAdapterCanUseModifiedDbSelectObject()
         $select->where('1 = 0');
         $this->_adapter->setIdentity('my_username');
         $this->_adapter->setCredential('my_password');
-        try {
-            $result = $this->_adapter->authenticate();
-            $this->assertEquals(Authentication\Result::FAILURE_IDENTITY_NOT_FOUND, $result->getCode());
-        } catch (Adapter\Exception\RuntimeException $e) {
-            $this->fail('Exception should have been thrown');
-        }
+
+        $result = $this->_adapter->authenticate();
+        $this->assertEquals(Authentication\Result::FAILURE_IDENTITY_NOT_FOUND, $result->getCode());
     }
 
     /**

test/Adapter/Http/ObjectTest.php

@@ -110,32 +110,13 @@ public function setUp()
 
     public function testValidConfigs()
     {
-        try {
-            $t = new Adapter\Http($this->_basicConfig);
-        } catch (Adapter\Exception\ExceptionInterface $e) {
-            $this->fail('Valid config deemed invalid');
-        }
-        $this->assertFalse(empty($t));
-        $this->assertInstanceOf('Zend\\Authentication\\Adapter\\Http', $t);
-        unset($t);
-
-        try {
-            $t = new Adapter\Http($this->_digestConfig);
-        } catch (Adapter\Exception\ExceptionInterface $e) {
-            $this->fail('Valid config deemed invalid');
-        }
-        $this->assertFalse(empty($t));
-        $this->assertInstanceOf('Zend\\Authentication\\Adapter\\Http', $t);
-        unset($t);
-
-        try {
-            $t = new Adapter\Http($this->_bothConfig);
-        } catch (Adapter\Exception\ExceptionInterface $e) {
-            $this->fail('Valid config deemed invalid');
-        }
-        $this->assertFalse(empty($t));
-        $this->assertInstanceOf('Zend\\Authentication\\Adapter\\Http', $t);
-        unset($t);
+        $configs = array (
+            $this->_basicConfig,
+            $this->_digestConfig,
+            $this->_bothConfig,
+        );
+        foreach($configs as $config)
+        new Adapter\Http($config);
     }
 
     public function testInvalidConfigs()