diff options
author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-07-05 17:41:16 +0400 |
---|---|---|
committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-07-05 17:41:16 +0400 |
commit | 126ab4ee114c0204b07dfcc83c38bd887f737a0e (patch) | |
tree | fa978d10aba847d91a8d31d59a7aa13e4fda3929 /tests | |
parent | 4bf8a93fbd99bfd396b32ae937af57a839acaaf4 (diff) |
fix insertIfNotExist return value, update doc and corresponding test
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib/db.php | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/lib/db.php b/tests/lib/db.php index d78253c847e..41bd7d623a2 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -40,7 +40,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { $this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (?,?)'); $result = $query->execute(array('fullname test', 'uri_1')); - $this->assertEquals('1', $result); + $this->assertEquals(1, $result); $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array('uri_1')); $this->assertTrue((bool)$result); @@ -54,7 +54,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { public function testNOW() { $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (NOW(),?)'); $result = $query->execute(array('uri_2')); - $this->assertEquals('1', $result); + $this->assertEquals(1, $result); $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array('uri_2')); $this->assertTrue((bool)$result); @@ -63,7 +63,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { public function testUNIX_TIMESTAMP() { $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (UNIX_TIMESTAMP(),?)'); $result = $query->execute(array('uri_3')); - $this->assertEquals('1', $result); + $this->assertEquals(1, $result); $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array('uri_3')); $this->assertTrue((bool)$result); @@ -71,11 +71,11 @@ class Test_DB extends PHPUnit_Framework_TestCase { public function testinsertIfNotExist() { $categoryentries = array( - array('user' => 'test', 'type' => 'contact', 'category' => 'Family'), - array('user' => 'test', 'type' => 'contact', 'category' => 'Friends'), - array('user' => 'test', 'type' => 'contact', 'category' => 'Coworkers'), - array('user' => 'test', 'type' => 'contact', 'category' => 'Coworkers'), - array('user' => 'test', 'type' => 'contact', 'category' => 'School'), + array('user' => 'test', 'type' => 'contact', 'category' => 'Family', 'expectedResult' => 1), + array('user' => 'test', 'type' => 'contact', 'category' => 'Friends', 'expectedResult' => 1), + array('user' => 'test', 'type' => 'contact', 'category' => 'Coworkers', 'expectedResult' => 1), + array('user' => 'test', 'type' => 'contact', 'category' => 'Coworkers', 'expectedResult' => 0), + array('user' => 'test', 'type' => 'contact', 'category' => 'School', 'expectedResult' => 1), ); foreach($categoryentries as $entry) { @@ -85,13 +85,13 @@ class Test_DB extends PHPUnit_Framework_TestCase { 'type' => $entry['type'], 'category' => $entry['category'], )); - $this->assertTrue((bool)$result); + $this->assertEquals($entry['expectedResult'], $result); } $query = OC_DB::prepare('SELECT * FROM `*PREFIX*'.$this->table3.'`'); $result = $query->execute(); $this->assertTrue((bool)$result); - $this->assertEquals('4', $result->numRows()); + $this->assertEquals(4, $result->numRows()); } public function testinsertIfNotExistDontOverwrite() { @@ -102,14 +102,14 @@ class Test_DB extends PHPUnit_Framework_TestCase { // Normal test to have same known data inserted. $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)'); $result = $query->execute(array($fullname, $uri, $carddata)); - $this->assertEquals('1', $result); + $this->assertEquals(1, $result); $query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array($uri)); $this->assertTrue((bool)$result); $row = $result->fetchRow(); $this->assertArrayHasKey('carddata', $row); $this->assertEquals($carddata, $row['carddata']); - $this->assertEquals('1', $result->numRows()); + $this->assertEquals(1, $result->numRows()); // Try to insert a new row $result = OC_DB::insertIfNotExist('*PREFIX*'.$this->table2, @@ -117,7 +117,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { 'fullname' => $fullname, 'uri' => $uri, )); - $this->assertTrue((bool)$result); + $this->assertEquals(0, $result); $query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array($uri)); @@ -127,7 +127,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { // Test that previously inserted data isn't overwritten $this->assertEquals($carddata, $row['carddata']); // And that a new row hasn't been inserted. - $this->assertEquals('1', $result->numRows()); + $this->assertEquals(1, $result->numRows()); } } |