From 00442b4c6d88f7cc85821e39a2d2645eb7141b76 Mon Sep 17 00:00:00 2001 From: jaugustin Date: Sun, 27 Jan 2013 14:50:05 +0100 Subject: [PATCH] fix tests, replace retreiveByPk* with findPk* --- tests/Propel/Tests/BookstoreTest.php | 12 ++--- .../Builder/Om/GeneratedObjectLobTest.php | 3 +- .../Builder/Om/GeneratedObjectTest.php | 40 ++++++++------ .../Om/GeneratedObjectWithFixturesTest.php | 7 ++- .../Builder/Om/GeneratedPeerDoDeleteTest.php | 52 +++++++++++-------- .../Builder/Om/GeneratedPeerDoSelectTest.php | 13 +++-- .../Runtime/Connection/PropelPDOTest.php | 17 +++--- 7 files changed, 82 insertions(+), 62 deletions(-) diff --git a/tests/Propel/Tests/BookstoreTest.php b/tests/Propel/Tests/BookstoreTest.php index 10c655b11e..411583c1fe 100644 --- a/tests/Propel/Tests/BookstoreTest.php +++ b/tests/Propel/Tests/BookstoreTest.php @@ -207,7 +207,7 @@ public function testScenario() // Updating just-created book title // First finding book by PK (=$qs_id) .... - $qs_lookup = BookPeer::retrieveByPk($qs_id); + $qs_lookup = BookQuery::create()->findPk($qs_id); $this->assertNotNull($qs_lookup, 'just-created book can be found by pk'); $new_title = "Quicksilver (".crc32(uniqid(rand())).")"; @@ -216,7 +216,7 @@ public function testScenario() $qs_lookup->save(); // Making sure object was correctly updated: "; - $qs_lookup2 = BookPeer::retrieveByPk($qs_id); + $qs_lookup2 = BookQuery::create()->findPk($qs_id); $this->assertEquals($new_title, $qs_lookup2->getTitle()); // Test some basic DATE / TIME stuff @@ -231,7 +231,7 @@ public function testScenario() $r->setReviewDate($control); $r->save(); - $r2 = ReviewPeer::retrieveByPk($r_id); + $r2 = ReviewQuery::create()->findPk($r_id); $this->assertEquals(new DateTime('2004-02-29 00:00:00'), $r2->getReviewDate(null), 'ability to fetch DateTime'); $this->assertEquals($control, $r2->getReviewDate('U'), 'ability to fetch native unix timestamp'); @@ -251,7 +251,7 @@ public function testScenario() $m1->save(); $m1_id = $m1->getId(); - $m1_lookup = MediaPeer::retrieveByPk($m1_id); + $m1_lookup = MediaQuery::create()->findPk($m1_id); $this->assertNotNull($m1_lookup, 'Can find just-created media item'); $this->assertEquals(md5(file_get_contents($blob_path)), md5(stream_get_contents($m1_lookup->getCoverImage())), 'BLOB was correctly updated'); @@ -261,7 +261,7 @@ public function testScenario() $m1_lookup->setCoverImage(file_get_contents($blob2_path)); $m1_lookup->save(); - $m2_lookup = MediaPeer::retrieveByPk($m1_id); + $m2_lookup = MediaQuery::create()->findPk($m1_id); $this->assertNotNull($m2_lookup, 'Can find just-created media item'); $this->assertEquals(md5(file_get_contents($blob2_path)), md5(stream_get_contents($m2_lookup->getCoverImage())), 'BLOB was correctly overwritten'); @@ -343,7 +343,7 @@ public function testScenario() // Removing books that were just created // First finding book by PK (=$phoenix_id) .... - $hp = BookPeer::retrieveByPk($phoenix_id); + $hp = BookQuery::create()->findPk($phoenix_id); $this->assertNotNull($hp, 'Could find just-created book'); // Attempting to delete [multi-table] by found pk diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php index 0404ed525d..ef07b57a1c 100644 --- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php +++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php @@ -16,6 +16,7 @@ use Propel\Tests\Bookstore\BookPeer; use Propel\Tests\Bookstore\Media; use Propel\Tests\Bookstore\MediaPeer; +use Propel\Tests\Bookstore\MediaQuery; use Propel\Runtime\ActiveQuery\Criteria; @@ -272,7 +273,7 @@ public function testLobSetting_WriteMode() MediaPeer::clearInstancePool(); // make sure we have the latest from the db: - $m2 = MediaPeer::retrieveByPK($m1->getId()); + $m2 = MediaQuery::create()->findPk($m1->getId()); // now attempt to assign a temporary stream, opened in 'w' mode, to the db diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php index de89c6df3c..f7c15052be 100644 --- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php +++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php @@ -17,6 +17,7 @@ use Propel\Runtime\Map\TableMap; use Propel\Tests\Bookstore\AcctAuditLog; use Propel\Tests\Bookstore\AcctAuditLogPeer; +use Propel\Tests\Bookstore\AcctAuditLogQuery; use Propel\Tests\Bookstore\Author; use Propel\Tests\Bookstore\AuthorQuery; use Propel\Tests\Bookstore\Map\AuthorTableMap; @@ -26,27 +27,32 @@ use Propel\Tests\Bookstore\Map\BookTableMap; use Propel\Tests\Bookstore\BookReader; use Propel\Tests\Bookstore\BookOpinion; +use Propel\Tests\Bookstore\BookOpinionQuery; use Propel\Tests\Bookstore\BookOpinionPeer; use Propel\Tests\Bookstore\Bookstore; use Propel\Tests\Bookstore\BookstorePeer; use Propel\Tests\Bookstore\BookstoreContest; +use Propel\Tests\Bookstore\BookstoreEmployee; +use Propel\Tests\Bookstore\BookstoreEmployeePeer; +use Propel\Tests\Bookstore\BookstoreEmployeeQuery; +use Propel\Tests\Bookstore\Map\BookstoreEmployeeTableMap; +use Propel\Tests\Bookstore\BookstoreEmployeeAccount; +use Propel\Tests\Bookstore\BookstoreEmployeeAccountPeer; +use Propel\Tests\Bookstore\BookstoreEmployeeAccountQuery; +use Propel\Tests\Bookstore\Map\BookstoreEmployeeAccountTableMap; +use Propel\Tests\Bookstore\BookstoreContestEntry; +use Propel\Tests\Bookstore\BookstoreSale; use Propel\Tests\Bookstore\Contest; use Propel\Tests\Bookstore\ContestView; use Propel\Tests\Bookstore\Customer; use Propel\Tests\Bookstore\CustomerPeer; +use Propel\Tests\Bookstore\CustomerQuery; use Propel\Tests\Bookstore\Publisher; use Propel\Tests\Bookstore\PublisherPeer; +use Propel\Tests\Bookstore\PublisherQuery; use Propel\Tests\Bookstore\Review; use Propel\Tests\Bookstore\ReviewPeer; use Propel\Tests\Bookstore\Map\ReviewTableMap; -use Propel\Tests\Bookstore\BookstoreEmployee; -use Propel\Tests\Bookstore\BookstoreEmployeePeer; -use Propel\Tests\Bookstore\Map\BookstoreEmployeeTableMap; -use Propel\Tests\Bookstore\BookstoreEmployeeAccount; -use Propel\Tests\Bookstore\BookstoreEmployeeAccountPeer; -use Propel\Tests\Bookstore\Map\BookstoreEmployeeAccountTableMap; -use Propel\Tests\Bookstore\BookstoreContestEntry; -use Propel\Tests\Bookstore\BookstoreSale; use Propel\Tests\Helpers\Bookstore\BookstoreTestBase; use Propel\Tests\Helpers\Bookstore\Behavior\TestAuthor; use Propel\Tests\Helpers\Bookstore\Behavior\TestAuthorDeleteFalse; @@ -108,7 +114,7 @@ public function testDefaultValueSetTwice() PublisherPeer::clearInstancePool(); - $pub2 = PublisherPeer::retrieveByPK($pubId); + $pub2 = PublisherQuery::create()->findPk($pubId); $pub2->setName('Penguin'); $this->assertFalse($pub2->isModified(), "Expect Publisher to be not modified after setting default value second time."); } @@ -167,7 +173,7 @@ public function testDefaultExpressions() $acct->save(); - $acct = BookstoreEmployeeAccountPeer::retrieveByPK($acct->getEmployeeId()); + $acct = BookstoreEmployeeAccountQuery::create()->findPk($acct->getEmployeeId()); $this->assertNotNull($acct->getAuthenticator(), "Expected a valid (non-NULL) authenticator column after save."); $this->assertEquals('Password', $acct->getAuthenticator(), "Expected authenticator='Password' after save."); @@ -326,7 +332,7 @@ public function testObjectInstances_New() $emp->save(); $id = $emp->getId(); - $retrieved = BookstoreEmployeePeer::retrieveByPK($id); + $retrieved = BookstoreEmployeeQuery::create()->findPk($id); $this->assertSame($emp, $retrieved, "Expected same object (from instance pool)"); } @@ -361,7 +367,7 @@ public function testObjectInstances_Fkeys() . " publisher_id = " . $pub2->getId() . " WHERE id = " . $book->getId()); - $book2 = BookPeer::retrieveByPK($book->getId()); + $book2 = BookQuery::create()->findPk($book->getId()); $this->assertSame($book, $book2, "Expected same book object instance"); $this->assertEquals($pub1->getId(), $book->getPublisherId(), "Expected book to have OLD publisher id before reload()"); @@ -408,7 +414,7 @@ public function testObjectInstancePoolTypecasting() $opinion->save(); - $opinion2 = BookOpinionPeer::retrieveByPK($bookId, $readerId); + $opinion2 = BookOpinionQuery::create()->findPk(array($bookId, $readerId)); $this->assertSame($opinion, $opinion2, "Expected same object to be retrieved from differently type-casted primary key values."); @@ -658,7 +664,7 @@ public function testCountRefFk() BookPeer::clearInstancePool(); ReviewPeer::clearInstancePool(); - $book = BookPeer::retrieveByPK($book->getId()); + $book = BookQuery::create()->findPk($book->getId()); $this->assertEquals($num, $book->countReviews(), "Expected countReviews() to return $num (after save)"); $this->assertEquals($num, count($book->getReviews()), "Expected getReviews() to return $num (after save)"); @@ -820,7 +826,7 @@ public function testAllowPkInsertOnIdMethodNativeTable() $this->assertEquals(100000, $cu->getPrimaryKey()); - $cu2 = CustomerPeer::retrieveByPk(100000); + $cu2 = CustomerQuery::create()->findPk(100000); $this->assertSame($cu, $cu2); } @@ -862,10 +868,10 @@ public function testUniqueFkRel() BookstoreEmployeeAccountPeer::clearInstancePool(); AcctAuditLogPeer::clearInstancePool(); - $al2 = AcctAuditLogPeer::retrieveByPK($alId); + $al2 = AcctAuditLogQuery::create()->findPk($alId); /* @var $al2 AcctAuditLog */ $mapacct = $al2->getBookstoreEmployeeAccount(); - $lookupacct = BookstoreEmployeeAccountPeer::retrieveByPK($acctId); + $lookupacct = BookstoreEmployeeAccountQuery::create()->findPk($acctId); $logs = $lookupacct->getAcctAuditLogs(); diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php index 5860181f50..16b7f7d292 100644 --- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php +++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php @@ -17,6 +17,7 @@ use Propel\Tests\Bookstore\AuthorPeer; use Propel\Tests\Bookstore\Book; use Propel\Tests\Bookstore\BookPeer; +use Propel\Tests\Bookstore\BookQuery; use Propel\Tests\Bookstore\Bookstore; use Propel\Tests\Bookstore\BookstorePeer; use Propel\Tests\Bookstore\BookstoreSale; @@ -29,10 +30,12 @@ use Propel\Tests\Bookstore\Map\BookstoreEmployeeTableMap; use Propel\Tests\Bookstore\Map\MediaTableMap; use Propel\Tests\Bookstore\MediaPeer; +use Propel\Tests\Bookstore\MediaQuery; use Propel\Tests\Bookstore\Publisher; use Propel\Tests\Bookstore\PublisherPeer; use Propel\Tests\Bookstore\Review; use Propel\Tests\Bookstore\ReviewPeer; +use Propel\Tests\Bookstore\ReviewQuery; use Propel\Tests\Helpers\Bookstore\BookstoreEmptyTestBase; use Propel\Tests\Helpers\Bookstore\BookstoreDataPopulator; @@ -121,7 +124,7 @@ public function testDelete() } catch (PropelException $e) {} // 4) make sure that it doesn't exist in db - $book = BookPeer::retrieveByPK($bookId); + $book = BookQuery::create()->findPk($bookId); $this->assertNull($book, "Expect NULL from retrieveByPK on deleted Book."); } @@ -168,7 +171,7 @@ public function testTypeSensitive() BookPeer::clearInstancePool(); // reload and verify that the types are the same - $r2 = ReviewPeer::retrieveByPK($id); + $r2 = ReviewQuery::create()->findPk($id); $this->assertInternalType('integer', $r2->getId(), "Expected getId() to return an integer."); $this->assertInternalType('string', $r2->getReviewedBy(), "Expected getReviewedBy() to return a string."); diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoDeleteTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoDeleteTest.php index 4e88702f83..6ef2961179 100644 --- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoDeleteTest.php +++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoDeleteTest.php @@ -17,26 +17,32 @@ use Propel\Tests\Bookstore\Map\AuthorTableMap; use Propel\Tests\Bookstore\Book; use Propel\Tests\Bookstore\BookPeer; +use Propel\Tests\Bookstore\BookQuery; use Propel\Tests\Bookstore\Map\BookTableMap; use Propel\Tests\Bookstore\BookOpinion; use Propel\Tests\Bookstore\BookReader; use Propel\Tests\Bookstore\BookReaderPeer; +use Propel\Tests\Bookstore\BookReaderQuery; use Propel\Tests\Bookstore\Map\BookReaderTableMap; use Propel\Tests\Bookstore\Bookstore; use Propel\Tests\Bookstore\BookstoreContest; use Propel\Tests\Bookstore\BookstoreContestPeer; use Propel\Tests\Bookstore\Map\BookstoreContestTableMap; use Propel\Tests\Bookstore\BookstoreContestEntry; +use Propel\Tests\Bookstore\BookstoreContestEntryPeer; +use Propel\Tests\Bookstore\BookstoreContestEntryQuery; use Propel\Tests\Bookstore\Customer; use Propel\Tests\Bookstore\Contest; -use Propel\Tests\Bookstore\BookstoreContestEntryPeer; use Propel\Tests\Bookstore\MediaPeer; +use Propel\Tests\Bookstore\MediaQuery; use Propel\Tests\Bookstore\Publisher; use Propel\Tests\Bookstore\PublisherPeer; use Propel\Tests\Bookstore\Map\PublisherTableMap; use Propel\Tests\Bookstore\ReviewPeer; +use Propel\Tests\Bookstore\ReviewQuery; use Propel\Tests\Bookstore\ReaderFavorite; use Propel\Tests\Bookstore\ReaderFavoritePeer; +use Propel\Tests\Bookstore\ReaderFavoriteQuery; use Propel\Runtime\Propel; use Propel\Runtime\ActiveQuery\Criteria; @@ -134,7 +140,7 @@ public function testDoDelete_Cascade_Simple() // 3) Assert that the media row is now also gone - $obj = MediaPeer::retrieveByPK($mediaId); + $obj = MediaQuery::create()->findPk($mediaId); $this->assertNull($obj, "Expect NULL when retrieving on no matching Media."); } @@ -198,10 +204,10 @@ public function testDoDelete_Cascade_CompositePK() $this->assertEquals($origBceCount + 1, $newCount, "Expected new number of rows in BCE to be orig + 1"); - $bcetest = BookstoreContestEntryPeer::retrieveByPK($store1->getId(), $c1->getId(), $cust1->getId()); + $bcetest = BookstoreContestEntryQuery::create()->findPk(array($store1->getId(), $c1->getId(), $cust1->getId())); $this->assertNull($bcetest, "Expected BCE for store1 to be cascade deleted."); - $bcetest2 = BookstoreContestEntryPeer::retrieveByPK($store1->getId(), $c2->getId(), $cust1->getId()); + $bcetest2 = BookstoreContestEntryQuery::create()->findPk(array($store1->getId(), $c2->getId(), $cust1->getId())); $this->assertNotNull($bcetest2, "Expected BCE for store2 to NOT be cascade deleted."); } @@ -225,7 +231,7 @@ public function testDoDelete_SetNull() // 3) Assert that the book.author_id column is now NULL - $book = BookPeer::retrieveByPK($bookId); + $book = BookQuery::create()->findPk($bookId); $this->assertNull($book->getAuthorId(), "Expect the book.author_id to be NULL after the author was removed."); } @@ -243,7 +249,7 @@ public function testDoDelete_ByPK() BookPeer::doDelete($bookId); // 3) now make sure it's gone - $obj = BookPeer::retrieveByPK($bookId); + $obj = BookQuery::create()->findPk($bookId); $this->assertNull($obj, "Expect NULL when retrieving on no matching Book."); } @@ -281,7 +287,7 @@ public function testDoDelete_ByObj() BookPeer::doDelete($book); // 3) now make sure it's gone - $obj = BookPeer::retrieveByPK($bookId); + $obj = BookQuery::create()->findPk($bookId); $this->assertNull($obj, "Expect NULL when retrieving on no matching Book."); } @@ -303,8 +309,8 @@ public function testDoDeleteAllInstancePool() $review = ReviewPeer::doSelectOne(new Criteria); $book = $review->getBook(); BookPeer::doDeleteAll(); - $this->assertNull(BookPeer::retrieveByPk($book->getId()), 'doDeleteAll invalidates instance pool'); - $this->assertNull(ReviewPeer::retrieveByPk($review->getId()), 'doDeleteAll invalidates instance pool of related tables with ON DELETE CASCADE'); + $this->assertNull(BookQuery::create()->findPk($book->getId()), 'doDeleteAll invalidates instance pool'); + $this->assertNull(ReviewQuery::create()->findPk($review->getId()), 'doDeleteAll invalidates instance pool of related tables with ON DELETE CASCADE'); } /** @@ -374,22 +380,22 @@ public function testDoDeleteCompositePK() $this->assertEquals(4, ReaderFavoritePeer::doCount(new Criteria())); //Note: these composite PK's are pairs of (BookId, ReaderId) - $this->assertNotNull(ReaderFavoritePeer::retrieveByPK(2,1)); - $this->assertNotNull(ReaderFavoritePeer::retrieveByPK(1,2)); - $this->assertNotNull(ReaderFavoritePeer::retrieveByPk(3,1)); - $this->assertNotNull(ReaderFavoritePeer::retrieveByPk(3,2)); - $this->assertNull(ReaderFavoritePeer::retrieveByPK(1,1)); - $this->assertNull(ReaderFavoritePeer::retrieveByPK(2,2)); + $this->assertNotNull(ReaderFavoriteQuery::create()->findPk(array(2,1))); + $this->assertNotNull(ReaderFavoriteQuery::create()->findPk(array(1,2))); + $this->assertNotNull(ReaderFavoriteQuery::create()->findPk(array(3,1))); + $this->assertNotNull(ReaderFavoriteQuery::create()->findPk(array(3,2))); + $this->assertNull(ReaderFavoriteQuery::create()->findPk(array(1,1))); + $this->assertNull(ReaderFavoriteQuery::create()->findPk(array(2,2))); //test deletion of a single composite PK ReaderFavoritePeer::doDelete(array(3,1)); $this->assertEquals(3, ReaderFavoritePeer::doCount(new Criteria())); - $this->assertNotNull(ReaderFavoritePeer::retrieveByPK(2,1)); - $this->assertNotNull(ReaderFavoritePeer::retrieveByPK(1,2)); - $this->assertNotNull(ReaderFavoritePeer::retrieveByPk(3,2)); - $this->assertNull(ReaderFavoritePeer::retrieveByPK(1,1)); - $this->assertNull(ReaderFavoritePeer::retrieveByPK(2,2)); - $this->assertNull(ReaderFavoritePeer::retrieveByPk(3,1)); + $this->assertNotNull(ReaderFavoriteQuery::create()->findPk(array(2,1))); + $this->assertNotNull(ReaderFavoriteQuery::create()->findPk(array(1,2))); + $this->assertNotNull(ReaderFavoriteQuery::create()->findPk(array(3,2))); + $this->assertNull(ReaderFavoriteQuery::create()->findPk(array(1,1))); + $this->assertNull(ReaderFavoriteQuery::create()->findPk(array(2,2))); + $this->assertNull(ReaderFavoriteQuery::create()->findPk(array(3,1))); //test deleting the last three ReaderFavoritePeer::doDelete(array(array(2,1), array(1,2), array(3,2))); @@ -540,7 +546,7 @@ public function testRemoveInstanceFromPool_Null() private function createBookWithId($id) { $con = Propel::getServiceContainer()->getConnection(BookTableMap::DATABASE_NAME); - $b = BookPeer::retrieveByPK($id); + $b = BookQuery::create()->findPk($id); if (!$b) { $b = new Book(); $b->setTitle("Book$id")->setISBN("BookISBN$id")->save(); @@ -559,7 +565,7 @@ private function createBookWithId($id) private function createReaderWithId($id) { $con = Propel::getServiceContainer()->getConnection(BookReaderTableMap::DATABASE_NAME); - $r = BookReaderPeer::retrieveByPK($id); + $r = BookReaderQuery::create()->findPk($id); if (!$r) { $r = new BookReader(); $r->setName('Reader'.$id)->save(); diff --git a/tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoSelectTest.php b/tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoSelectTest.php index d77727f34d..87e661421d 100644 --- a/tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoSelectTest.php +++ b/tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoSelectTest.php @@ -17,12 +17,15 @@ use Propel\Tests\Bookstore\AcctAccessRolePeer; use Propel\Tests\Bookstore\Author; use Propel\Tests\Bookstore\AuthorPeer; +use Propel\Tests\Bookstore\AuthorQuery; use Propel\Tests\Bookstore\Book; use Propel\Tests\Bookstore\BookPeer; +use Propel\Tests\Bookstore\BookQuery; use Propel\Tests\Bookstore\Map\BookTableMap; use Propel\Tests\Bookstore\Bookstore; use Propel\Tests\Bookstore\BookstoreEmployee; use Propel\Tests\Bookstore\BookstoreEmployeePeer; +use Propel\Tests\Bookstore\BookstoreEmployeeQuery; use Propel\Tests\Bookstore\Map\BookstoreEmployeeTableMap; use Propel\Tests\Bookstore\BookstoreEmployeeAccount; use Propel\Tests\Bookstore\BookstoreEmployeeAccountPeer; @@ -212,8 +215,8 @@ public function testObjectInstances() // 1) make sure consecutive calls to retrieveByPK() return the same object. - $b1 = BookPeer::retrieveByPK($samplePk); - $b2 = BookPeer::retrieveByPK($samplePk); + $b1 = BookQuery::create()->findPk($samplePk); + $b2 = BookQuery::create()->findPk($samplePk); $sampleval = md5(microtime()); @@ -228,11 +231,11 @@ public function testObjectInstances() } // 3) test fetching related objects - $book = BookPeer::retrieveByPK($samplePk); + $book = BookQuery::create()->findPk($samplePk); $bookauthor = $book->getAuthor(); - $author = AuthorPeer::retrieveByPK($bookauthor->getId()); + $author = AuthorQuery::create()->findPk($bookauthor->getId()); $this->assertTrue($bookauthor === $author, "Expected same object instance when calling fk object accessor as retrieveByPK()"); @@ -256,7 +259,7 @@ public function testObjectInstances() $empId = $b->getId(); - $this->assertSame($b, BookstoreEmployeePeer::retrieveByPK($empId), "Expected newly saved object to be same instance as pooled."); + $this->assertSame($b, BookstoreEmployeeQuery::create()->findPk($empId), "Expected newly saved object to be same instance as pooled."); } diff --git a/tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php b/tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php index dad219c220..7cf0ed6148 100644 --- a/tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php +++ b/tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php @@ -13,6 +13,7 @@ use Propel\Tests\Helpers\Bookstore\BookstoreTestBase; use Propel\Tests\Bookstore\Author; use Propel\Tests\Bookstore\AuthorPeer; +use Propel\Tests\Bookstore\AuthorQuery; use Propel\Tests\Bookstore\Book; use Propel\Tests\Bookstore\BookPeer; use Propel\Tests\Bookstore\Map\AuthorTableMap; @@ -157,9 +158,9 @@ public function testNestedTransactionCommit() } AuthorPeer::clearInstancePool(); - $at = AuthorPeer::retrieveByPK($authorId); + $at = AuthorQuery::create()->findPk($authorId); $this->assertNotNull($at, "Committed transaction is persisted in database"); - $at2 = AuthorPeer::retrieveByPK($authorId2); + $at2 = AuthorQuery::create()->findPk($authorId2); $this->assertNotNull($at2, "Committed transaction is persisted in database"); } @@ -205,7 +206,7 @@ public function testNestedTransactionRollBackRethrow() } AuthorPeer::clearInstancePool(); - $at = AuthorPeer::retrieveByPK($authorId); + $at = AuthorQuery::create()->findPk($authorId); $this->assertNull($at, "Rolled back transaction is not persisted in database"); } @@ -261,11 +262,11 @@ public function testNestedTransactionRollBackSwallow() } AuthorPeer::clearInstancePool(); - $at = AuthorPeer::retrieveByPK($authorId); + $at = AuthorQuery::create()->findPk($authorId); $this->assertNull($at, "Rolled back transaction is not persisted in database"); - $at2 = AuthorPeer::retrieveByPK($authorId2); + $at2 = AuthorQuery::create()->findPk($authorId2); $this->assertNull($at2, "Rolled back transaction is not persisted in database"); - $at3 = AuthorPeer::retrieveByPK($authorId3); + $at3 = AuthorQuery::create()->findPk($authorId3); $this->assertNull($at3, "Rolled back nested transaction is not persisted in database"); } @@ -299,9 +300,9 @@ public function testNestedTransactionForceRollBack() $this->assertFalse($con->isInTransaction(), 'PropelPDO is not in transaction after nested transaction force rollback'); AuthorPeer::clearInstancePool(); - $at = AuthorPeer::retrieveByPK($authorId); + $at = AuthorQuery::create()->findPk($authorId); $this->assertNull($at, "Rolled back transaction is not persisted in database"); - $at2 = AuthorPeer::retrieveByPK($authorId2); + $at2 = AuthorQuery::create()->findPk($authorId2); $this->assertNull($at2, "Forced Rolled back nested transaction is not persisted in database"); }