From bbef4aa36d6383c7ee481ce18fdd437bc32a18fd Mon Sep 17 00:00:00 2001 From: Mark Story Date: Mon, 26 Dec 2011 17:59:50 -0500 Subject: [PATCH] Convert assertions to assetContains. --- .../Test/Case/Network/Email/CakeEmailTest.php | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php index ba0b86afaa7..701e29cb288 100644 --- a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php +++ b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php @@ -789,9 +789,9 @@ public function testSendRender() { $this->CakeEmail->template('default', 'default'); $result = $this->CakeEmail->send(); - $this->assertTrue((bool)strpos($result['message'], 'This email was sent using the CakePHP Framework')); - $this->assertTrue((bool)strpos($result['headers'], 'Message-ID: ')); - $this->assertTrue((bool)strpos($result['headers'], 'To: ')); + $this->assertContains('This email was sent using the CakePHP Framework', $result['message']); + $this->assertContains('Message-ID: ', $result['headers']); + $this->assertContains('To: ', $result['headers']); } /** @@ -814,9 +814,9 @@ public function testSendRenderJapanese() { $result = $this->CakeEmail->send(); $expected = mb_convert_encoding('CakePHP Framework を使って送信したメールです。 http://cakephp.org.','ISO-2022-JP'); - $this->assertTrue((bool)strpos($result['message'], $expected)); - $this->assertTrue((bool)strpos($result['headers'], 'Message-ID: ')); - $this->assertTrue((bool)strpos($result['headers'], 'To: ')); + $this->assertContains($expected, $result['message']); + $this->assertContains('Message-ID: ', $result['headers']); + $this->assertContains('To: ', $result['headers']); } /** @@ -836,7 +836,7 @@ public function testSendRenderWithVars() { $this->CakeEmail->viewVars(array('value' => 12345)); $result = $this->CakeEmail->send(); - $this->assertTrue((bool)strpos($result['message'], 'Here is your value: 12345')); + $this->assertContains('Here is your value: 12345', $result['message']); } /** @@ -908,21 +908,21 @@ public function testSendRenderPlugin() { $this->CakeEmail->config(array('empty')); $result = $this->CakeEmail->template('TestPlugin.test_plugin_tpl', 'default')->send(); - $this->assertTrue((bool)strpos($result['message'], 'Into TestPlugin.')); - $this->assertTrue((bool)strpos($result['message'], 'This email was sent using the CakePHP Framework')); + $this->assertContains('Into TestPlugin.', $result['message']); + $this->assertContains('This email was sent using the CakePHP Framework', $result['message']); $result = $this->CakeEmail->template('TestPlugin.test_plugin_tpl', 'TestPlugin.plug_default')->send(); - $this->assertTrue((bool)strpos($result['message'], 'Into TestPlugin.')); - $this->assertTrue((bool)strpos($result['message'], 'This email was sent using the TestPlugin.')); + $this->assertContains('Into TestPlugin.', $result['message']); + $this->assertContains('This email was sent using the TestPlugin.', $result['message']); $result = $this->CakeEmail->template('TestPlugin.test_plugin_tpl', 'plug_default')->send(); - $this->assertTrue((bool)strpos($result['message'], 'Into TestPlugin.')); - $this->assertTrue((bool)strpos($result['message'], 'This email was sent using the TestPlugin.')); + $this->assertContains('Into TestPlugin.', $result['message']); + $this->assertContains('This email was sent using the TestPlugin.', $result['message']); $this->CakeEmail->viewVars(array('value' => 12345)); $result = $this->CakeEmail->template('custom', 'TestPlugin.plug_default')->send(); - $this->assertTrue((bool)strpos($result['message'], 'Here is your value: 12345')); - $this->assertTrue((bool)strpos($result['message'], 'This email was sent using the TestPlugin.')); + $this->assertContains('Here is your value: 12345', $result['message']); + $this->assertContains('This email was sent using the TestPlugin.', $result['message']); $this->setExpectedException('MissingViewException'); $this->CakeEmail->template('test_plugin_tpl', 'plug_default')->send(); @@ -949,10 +949,10 @@ public function testSendMultipleMIME() { $message = $this->CakeEmail->message(); $boundary = $this->CakeEmail->getBoundary(); $this->assertFalse(empty($boundary)); - $this->assertFalse(in_array('--' . $boundary, $message)); - $this->assertFalse(in_array('--' . $boundary . '--', $message)); - $this->assertTrue(in_array('--alt-' . $boundary, $message)); - $this->assertTrue(in_array('--alt-' . $boundary . '--', $message)); + $this->assertNotContains('--' . $boundary, $message); + $this->assertNotContains('--' . $boundary . '--', $message); + $this->assertContains('--alt-' . $boundary, $message); + $this->assertContains('--alt-' . $boundary . '--', $message); $this->CakeEmail->attachments(array('fake.php' => __FILE__)); $this->CakeEmail->send(); @@ -960,10 +960,10 @@ public function testSendMultipleMIME() { $message = $this->CakeEmail->message(); $boundary = $this->CakeEmail->getBoundary(); $this->assertFalse(empty($boundary)); - $this->assertTrue(in_array('--' . $boundary, $message)); - $this->assertTrue(in_array('--' . $boundary . '--', $message)); - $this->assertTrue(in_array('--alt-' . $boundary, $message)); - $this->assertTrue(in_array('--alt-' . $boundary . '--', $message)); + $this->assertContains('--' . $boundary, $message); + $this->assertContains('--' . $boundary . '--', $message); + $this->assertContains('--alt-' . $boundary, $message); + $this->assertContains('--alt-' . $boundary . '--', $message); } /** @@ -1047,14 +1047,14 @@ public function testMessage() { $result = $this->CakeEmail->send(); $expected = '

This email was sent using the CakePHP Framework

'; - $this->assertTrue((bool)strpos($this->CakeEmail->message(CakeEmail::MESSAGE_HTML), $expected)); + $this->assertContains($expected, $this->CakeEmail->message(CakeEmail::MESSAGE_HTML)); $expected = 'This email was sent using the CakePHP Framework, http://cakephp.org.'; - $this->assertTrue((bool)strpos($this->CakeEmail->message(CakeEmail::MESSAGE_TEXT), $expected)); + $this->assertContains($expected, $this->CakeEmail->message(CakeEmail::MESSAGE_TEXT)); $message = $this->CakeEmail->message(); - $this->assertTrue(in_array('Content-Type: text/plain; charset=UTF-8', $message)); - $this->assertTrue(in_array('Content-Type: text/html; charset=UTF-8', $message)); + $this->assertContains('Content-Type: text/plain; charset=UTF-8', $message); + $this->assertContains('Content-Type: text/html; charset=UTF-8', $message); // UTF-8 is 8bit $this->assertTrue($this->checkContentTransferEncoding($message, '8bit')); @@ -1063,8 +1063,8 @@ public function testMessage() { $this->CakeEmail->charset = 'ISO-2022-JP'; $this->CakeEmail->send(); $message = $this->CakeEmail->message(); - $this->assertTrue(in_array('Content-Type: text/plain; charset=ISO-2022-JP', $message)); - $this->assertTrue(in_array('Content-Type: text/html; charset=ISO-2022-JP', $message)); + $this->assertContains('Content-Type: text/plain; charset=ISO-2022-JP', $message); + $this->assertContains('Content-Type: text/html; charset=ISO-2022-JP', $message); // ISO-2022-JP is 7bit $this->assertTrue($this->checkContentTransferEncoding($message, '7bit'));