Fix test.

tests/TestCase/Mailer/EmailTest.php

@@ -82,8 +82,13 @@ class EmailTest extends TestCase {
 		$result = $this->Email->from(['cake@cakephp.org' => 'CakePHP']);
 		$this->assertSame($expected, $this->Email->from());
 		$this->assertSame($this->Email, $result);
+	}
 
-		$this->setExpectedException('InvalidArgumentException');
+	/**
+	 * @expectedException \InvalidArgumentException
+	 * @return void
+	 */
+	public function testFromExecption() {
 		$this->Email->from(['cake@cakephp.org' => 'CakePHP', 'fail@cakephp.org' => 'From can only be one address']);
 	}
 

tests/bootstrap.php

@@ -1,5 +1,8 @@
 <?php
-define('DS', DIRECTORY_SEPARATOR);
+
+if (!defined('DS')) {
+	define('DS', DIRECTORY_SEPARATOR);
+}
 if (!defined('WINDOWS')) {
 	if (DS == '\\' || substr(PHP_OS, 0, 3) === 'WIN') {
 		define('WINDOWS', true);