Use simpler asserts.

Refs #3622
This commit is contained in:
mark_story 2013-02-13 22:43:18 -05:00
parent fbb1a812dd
commit f104bd3504

View file

@ -746,12 +746,16 @@ class PostgresTest extends CakeTestCase {
*/ */
public function testAlterSchemaRenameTo() { public function testAlterSchemaRenameTo() {
$query = $this->Dbo->alterSchema(array( $query = $this->Dbo->alterSchema(array(
'posts' => array('change' => array('title' => array('name' => 'subject', 'type' => 'string', 'null' => false))) 'posts' => array(
'change' => array(
'title' => array('name' => 'subject', 'type' => 'string', 'null' => false)
)
)
)); ));
$this->assertRegExp('/RENAME "title" TO "subject";/i', $query); $this->assertContains('RENAME "title" TO "subject";', $query);
$this->assertRegExp('/ALTER COLUMN "subject" TYPE /i', $query); $this->assertContains('ALTER COLUMN "subject" TYPE', $query);
$this->assertNotRegExp('/;\n\tALTER COLUMN "subject" TYPE /i', $query); $this->assertNotContains(";\n\tALTER COLUMN \"subject\" TYPE", $query);
$this->assertNotRegExp('/ALTER COLUMN "title" TYPE "subject"/i', $query); $this->assertNotContains('ALTER COLUMN "title" TYPE "subject"', $query);
} }
/** /**
@ -937,6 +941,7 @@ class PostgresTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testNestedTransaction() { public function testNestedTransaction() {
$this->Dbo->useNestedTransactions = true;
$this->skipIf($this->Dbo->nestedTransactionSupported() === false, 'The Postgres server do not support nested transaction'); $this->skipIf($this->Dbo->nestedTransactionSupported() === false, 'The Postgres server do not support nested transaction');
$this->loadFixtures('Article'); $this->loadFixtures('Article');