Fixed remaining failing tests

tests/TestCase/Network/Email/SmtpTransportTest.php

@@ -131,7 +131,7 @@ class SmtpTransportTest extends TestCase {
 /**
  * testConnectEhloTlsOnNonTlsServer method
  *
- * @expectedException \Cake\Network\Error\SocketException
+ * @expectedException Cake\Network\Exception\SocketException
  * @expectedExceptionMessage SMTP server did not accept the connection or trying to connect to non TLS SMTP server using TLS.
  * @return void
  */
@@ -152,7 +152,7 @@ class SmtpTransportTest extends TestCase {
 /**
  * testConnectEhloNoTlsOnRequiredTlsServer method
  *
- * @expectedException \Cake\Network\Error\SocketException
+ * @expectedException Cake\Network\Exception\SocketException
  * @expectedExceptionMessage SMTP authentication method not allowed, check if SMTP server requires TLS.
  * @return void
  */
@@ -191,7 +191,7 @@ class SmtpTransportTest extends TestCase {
 /**
  * testConnectFail method
  *
- * @expectedException \Cake\Network\Error\SocketException
+ * @expectedException Cake\Network\Exception\SocketException
  * @expectedExceptionMessage SMTP server did not accept the connection.
  * @return void
  */
@@ -230,7 +230,7 @@ class SmtpTransportTest extends TestCase {
 /**
  * testAuthNotRecognized method
  *
- * @expectedException Cake\Network\Error\SocketException
+ * @expectedException \Cake\Network\Exception\SocketException
  * @expectedExceptionMessage AUTH command not recognized or not implemented, SMTP server may not require authentication.
  * @return void
  */
@@ -245,7 +245,7 @@ class SmtpTransportTest extends TestCase {
 /**
  * testAuthNotImplemented method
  *
- * @expectedException Cake\Network\Error\SocketException
+ * @expectedException \Cake\Network\Exception\SocketException
  * @expectedExceptionMessage AUTH command not recognized or not implemented, SMTP server may not require authentication.
  * @return void
  */
@@ -260,7 +260,7 @@ class SmtpTransportTest extends TestCase {
 /**
  * testAuthBadSequence method
  *
- * @expectedException Cake\Network\Error\SocketException
+ * @expectedException \Cake\Network\Exception\SocketException
  * @expectedExceptionMessage SMTP Error: 503 5.5.1 Already authenticated
  * @return void
  */
@@ -275,7 +275,7 @@ class SmtpTransportTest extends TestCase {
 /**
  * testAuthBadUsername method
  *
- * @expectedException Cake\Network\Error\SocketException
+ * @expectedException \Cake\Network\Exception\SocketException
  * @expectedExceptionMessage SMTP server did not accept the username.
  * @return void
  */
@@ -293,7 +293,7 @@ class SmtpTransportTest extends TestCase {
 /**
  * testAuthBadPassword method
  *
- * @expectedException Cake\Network\Error\SocketException
+ * @expectedException \Cake\Network\Exception\SocketException
  * @expectedExceptionMessage SMTP server did not accept the password.
  * @return void
  */

tests/TestCase/Network/RequestTest.php

@@ -684,7 +684,7 @@ class RequestTest extends TestCase {
 /**
  * Test __call exceptions
  *
- * @expectedException \Cake\Core\Exception\Exception
+ * @expectedException BadMethodCallException
  * @return void
  */
 	public function testMagicCallExceptionOnUnknownMethod() {

tests/TestCase/Network/ResponseTest.php

@@ -1158,7 +1158,7 @@ class ResponseTest extends TestCase {
 /**
  * testFileNotFound
  *
- * @expectedException InvalidArgumentException
+ * @expectedException Cake\Network\Exception\NotFoundException
  * @return void
  */
 	public function testFileNotFound() {
@@ -1169,7 +1169,7 @@ class ResponseTest extends TestCase {
 /**
  * test file with ..
  *
- * @expectedException InvalidArgumentException
+ * @expectedException Cake\Network\Exception\NotFoundException
  * @return void
  */
 	public function testFileWithPathTraversal() {

tests/TestCase/Network/SocketTest.php

@@ -95,7 +95,7 @@ class SocketTest extends TestCase {
 			$this->Socket = new Socket($config);
 			$this->Socket->connect();
 			$this->assertTrue($this->Socket->connected);
-		} catch (\Cake\Network\Error\SocketException $e) {
+		} catch (Cake\Network\Exception\SocketException $e) {
 			$this->markTestSkipped('Cannot test network, skipping.');
 		}
 	}
@@ -116,7 +116,7 @@ class SocketTest extends TestCase {
  * testInvalidConnection method
  *
  * @dataProvider invalidConnections
- * @expectedException \Cake\Network\Error\SocketException
+ * @expectedException Cake\Network\Exception\SocketException
  * @return void
  */
 	public function testInvalidConnection($data) {
@@ -144,7 +144,7 @@ class SocketTest extends TestCase {
 			$this->assertEquals(gethostbyaddr('127.0.0.1'), $this->Socket->host());
 			$this->assertEquals(null, $this->Socket->lastError());
 			$this->assertTrue(in_array('127.0.0.1', $this->Socket->addresses()));
-		} catch (\Cake\Network\Error\SocketException $e) {
+		} catch (Cake\Network\Exception\SocketException $e) {
 			$this->markTestSkipped('Cannot test network, skipping.');
 		}
 	}
@@ -158,7 +158,7 @@ class SocketTest extends TestCase {
 		try {
 			$request = "GET / HTTP/1.1\r\nConnection: close\r\n\r\n";
 			$this->assertTrue((bool)$this->Socket->write($request));
-		} catch (\Cake\Network\Error\SocketException $e) {
+		} catch (Cake\Network\Exception\SocketException $e) {
 			$this->markTestSkipped('Cannot test network, skipping.');
 		}
 	}
@@ -179,7 +179,7 @@ class SocketTest extends TestCase {
 			$this->assertTrue($this->Socket->connect());
 			$this->assertEquals(null, $this->Socket->read(26));
 			$this->assertEquals('2: ' . 'Connection timed out', $this->Socket->lastError());
-		} catch (\Cake\Network\Error\SocketException $e) {
+		} catch (Cake\Network\Exception\SocketException $e) {
 			$this->markTestSkipped('Cannot test network, skipping.');
 		}
 	}
@@ -199,7 +199,7 @@ class SocketTest extends TestCase {
 			$this->Socket = new Socket($config);
 			$this->assertFalse($this->Socket->read(1024 * 1024));
 			$this->assertEquals('2: ' . 'Connection timed out', $this->Socket->lastError());
-		} catch (\Cake\Network\Error\SocketException $e) {
+		} catch (Cake\Network\Exception\SocketException $e) {
 			$this->markTestSkipped('Cannot test network, skipping.');
 		}
 	}
@@ -248,7 +248,7 @@ class SocketTest extends TestCase {
 /**
  * testEncrypt
  *
- * @expectedException \Cake\Network\Error\SocketException
+ * @expectedException Cake\Network\Exception\SocketException
  * @return void
  */
 	public function testEnableCryptoSocketExceptionNoSsl() {
@@ -264,7 +264,7 @@ class SocketTest extends TestCase {
 /**
  * testEnableCryptoSocketExceptionNoTls
  *
- * @expectedException \Cake\Network\Error\SocketException
+ * @expectedException Cake\Network\Exception\SocketException
  * @return void
  */
 	public function testEnableCryptoSocketExceptionNoTls() {
@@ -287,7 +287,7 @@ class SocketTest extends TestCase {
 		$this->Socket = new Socket($configSslTls);
 		try {
 			$this->Socket->connect();
-		} catch (\Cake\Network\Error\SocketException $e) {
+		} catch (Cake\Network\Exception\SocketException $e) {
 			$this->markTestSkipped('Cannot test network, skipping.');
 		}
 	}
@@ -326,7 +326,7 @@ class SocketTest extends TestCase {
 /**
  * testEnableCryptoExceptionEnableTwice
  *
- * @expectedException \Cake\Network\Error\SocketException
+ * @expectedException Cake\Network\Exception\SocketException
  * @return void
  */
 	public function testEnableCryptoExceptionEnableTwice() {
@@ -340,7 +340,7 @@ class SocketTest extends TestCase {
 /**
  * testEnableCryptoExceptionDisableTwice
  *
- * @expectedException \Cake\Network\Error\SocketException
+ * @expectedException Cake\Network\Exception\SocketException
  * @return void
  */
 	public function testEnableCryptoExceptionDisableTwice() {