- Timestamp:
- 09/17/08 14:11:31 (3 months ago)
- Files:
-
- trunk (modified) (1 prop)
- trunk/generator/test/classes/propel/GeneratedPeerTest.php (modified) (52 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk
- Property svn:ignore set to
.project
.cache
.settings
- Property svn:ignore set to
trunk/generator/test/classes/propel/GeneratedPeerTest.php
r1068 r1082 1 1 <?php 2 3 use bookstore::Peer as PropelPeer; 4 use bookstore::Model as PropelModel; 5 2 6 /* 3 7 * $Id$ … … 39 43 40 44 /** 41 * Test ability to delete multiple rows via single Criteria object.45 * Test ability to delete multiple rows via single ::Criteria object. 42 46 */ 43 47 public function testDoDelete_MultiTable() { 44 48 45 $selc = new Criteria();46 $selc->add( BookPeer::TITLE, "Harry Potter and the Order of the Phoenix");47 $hp = BookPeer::doSelectOne($selc);49 $selc = new ::Criteria(); 50 $selc->add(PropelPeer::BookPeer::TITLE, "Harry Potter and the Order of the Phoenix"); 51 $hp = PropelPeer::BookPeer::doSelectOne($selc); 48 52 49 53 // print "Attempting to delete [multi-table] by found pk: "; 50 $c = new Criteria();51 $c->add( BookPeer::ID, $hp->getId());54 $c = new ::Criteria(); 55 $c->add(PropelPeer::BookPeer::ID, $hp->getId()); 52 56 // The only way for multi-delete to work currently 53 57 // is to specify the author_id and publisher_id (i.e. the fkeys 54 58 // have to be in the criteria). 55 $c->add( AuthorPeer::ID, $hp->getAuthorId());56 $c->add(P ublisherPeer::ID, $hp->getPublisherId());59 $c->add(PropelPeer::AuthorPeer::ID, $hp->getAuthorId()); 60 $c->add(PropelPeer::PublisherPeer::ID, $hp->getPublisherId()); 57 61 $c->setSingleRecord(true); 58 BookPeer::doDelete($c);59 60 //print_r(AuthorPeer::doSelect(new Criteria()));62 PropelPeer::BookPeer::doDelete($c); 63 64 //print_r(AuthorPeer::doSelect(new ::Criteria())); 61 65 62 66 // check to make sure the right # of records was removed 63 $this->assertEquals(3, count( AuthorPeer::doSelect(newCriteria())), "Expected 3 authors after deleting.");64 $this->assertEquals(3, count(P ublisherPeer::doSelect(newCriteria())), "Expected 3 publishers after deleting.");65 $this->assertEquals(3, count( BookPeer::doSelect(newCriteria())), "Expected 3 books after deleting.");67 $this->assertEquals(3, count(PropelPeer::AuthorPeer::doSelect(new ::Criteria())), "Expected 3 authors after deleting."); 68 $this->assertEquals(3, count(PropelPeer::PublisherPeer::doSelect(new ::Criteria())), "Expected 3 publishers after deleting."); 69 $this->assertEquals(3, count(PropelPeer::BookPeer::doSelect(new ::Criteria())), "Expected 3 books after deleting."); 66 70 } 67 71 … … 72 76 73 77 //print "Attempting to delete books by complex criteria: "; 74 $c = new Criteria();75 $cn = $c->getNewCriterion( BookPeer::ISBN, "043935806X");76 $cn->addOr($c->getNewCriterion( BookPeer::ISBN, "0380977427"));77 $cn->addOr($c->getNewCriterion( BookPeer::ISBN, "0140422161"));78 $c = new ::Criteria(); 79 $cn = $c->getNewCriterion(PropelPeer::BookPeer::ISBN, "043935806X"); 80 $cn->addOr($c->getNewCriterion(PropelPeer::BookPeer::ISBN, "0380977427")); 81 $cn->addOr($c->getNewCriterion(PropelPeer::BookPeer::ISBN, "0140422161")); 78 82 $c->add($cn); 79 BookPeer::doDelete($c);83 PropelPeer::BookPeer::doDelete($c); 80 84 81 85 // now there should only be one book left; "The Tin Drum" 82 86 83 $books = BookPeer::doSelect(newCriteria());87 $books = PropelPeer::BookPeer::doSelect(new ::Criteria()); 84 88 85 89 $this->assertEquals(1, count($books), "Expected 1 book remaining after deleting."); … … 97 101 // 1) Assert the row exists right now 98 102 99 $medias = MediaPeer::doSelect(newCriteria());103 $medias = PropelPeer::MediaPeer::doSelect(new ::Criteria()); 100 104 $this->assertTrue(count($medias) > 0, "Expected to find at least one row in 'media' table."); 101 105 $media = $medias[0]; … … 105 109 106 110 $owningBookId = $media->getBookId(); 107 BookPeer::doDelete($owningBookId);111 PropelPeer::BookPeer::doDelete($owningBookId); 108 112 109 113 // 3) Assert that the media row is now also gone 110 114 111 $obj = MediaPeer::retrieveByPK($mediaId);115 $obj = PropelPeer::MediaPeer::retrieveByPK($mediaId); 112 116 $this->assertNull($obj, "Expect NULL when retrieving on no matching Media."); 113 117 … … 121 125 { 122 126 123 $origBceCount = BookstoreContestEntryPeer::doCount(newCriteria());124 125 $cust1 = new Customer();127 $origBceCount = PropelPeer::BookstoreContestEntryPeer::doCount(new ::Criteria()); 128 129 $cust1 = new PropelModel::Customer(); 126 130 $cust1->setName("Cust1"); 127 131 $cust1->save(); 128 132 129 $cust2 = new Customer();133 $cust2 = new PropelModel::Customer(); 130 134 $cust2->setName("Cust2"); 131 135 $cust2->save(); 132 136 133 $c1 = new Contest();137 $c1 = new PropelModel::Contest(); 134 138 $c1->setName("Contest1"); 135 139 $c1->save(); 136 140 137 $c2 = new Contest();141 $c2 = new PropelModel::Contest(); 138 142 $c2->setName("Contest2"); 139 143 $c2->save(); 140 144 141 $store1 = new Bookstore();145 $store1 = new PropelModel::Bookstore(); 142 146 $store1->setStoreName("Store1"); 143 147 $store1->save(); 144 148 145 $bc1 = new BookstoreContest();149 $bc1 = new PropelModel::BookstoreContest(); 146 150 $bc1->setBookstore($store1); 147 151 $bc1->setContest($c1); 148 152 $bc1->save(); 149 153 150 $bc2 = new BookstoreContest();154 $bc2 = new PropelModel::BookstoreContest(); 151 155 $bc2->setBookstore($store1); 152 156 $bc2->setContest($c2); 153 157 $bc2->save(); 154 158 155 $bce1 = new BookstoreContestEntry();159 $bce1 = new PropelModel::BookstoreContestEntry(); 156 160 $bce1->setEntryDate("now"); 157 161 $bce1->setCustomer($cust1); … … 159 163 $bce1->save(); 160 164 161 $bce2 = new BookstoreContestEntry();165 $bce2 = new PropelModel::BookstoreContestEntry(); 162 166 $bce2->setEntryDate("now"); 163 167 $bce2->setCustomer($cust1); … … 167 171 // Now, if we remove $bc1, we expect *only* bce1 to be no longer valid. 168 172 169 BookstoreContestPeer::doDelete($bc1);170 171 $newCount = BookstoreContestEntryPeer::doCount(newCriteria());173 PropelPeer::BookstoreContestPeer::doDelete($bc1); 174 175 $newCount = PropelPeer::BookstoreContestEntryPeer::doCount(new ::Criteria()); 172 176 173 177 $this->assertEquals($origBceCount + 1, $newCount, "Expected new number of rows in BCE to be orig + 1"); 174 178 175 $bcetest = BookstoreContestEntryPeer::retrieveByPK($store1->getId(), $c1->getId(), $cust1->getId());179 $bcetest = PropelPeer::BookstoreContestEntryPeer::retrieveByPK($store1->getId(), $c1->getId(), $cust1->getId()); 176 180 $this->assertNull($bcetest, "Expected BCE for store1 to be cascade deleted."); 177 181 178 $bcetest2 = BookstoreContestEntryPeer::retrieveByPK($store1->getId(), $c2->getId(), $cust1->getId());182 $bcetest2 = PropelPeer::BookstoreContestEntryPeer::retrieveByPK($store1->getId(), $c2->getId(), $cust1->getId()); 179 183 $this->assertNotNull($bcetest2, "Expected BCE for store2 to NOT be cascade deleted."); 180 184 … … 189 193 190 194 // 1) Get an arbitrary book 191 $c = new Criteria();192 $book = BookPeer::doSelectOne($c);195 $c = new ::Criteria(); 196 $book = PropelPeer::BookPeer::doSelectOne($c); 193 197 $bookId = $book->getId(); 194 198 $authorId = $book->getAuthorId(); … … 196 200 197 201 // 2) Delete the author for that book 198 AuthorPeer::doDelete($authorId);202 PropelPeer::AuthorPeer::doDelete($authorId); 199 203 200 204 // 3) Assert that the book.author_id column is now NULL 201 205 202 $book = BookPeer::retrieveByPK($bookId);206 $book = PropelPeer::BookPeer::retrieveByPK($bookId); 203 207 $this->assertNull($book->getAuthorId(), "Expect the book.author_id to be NULL after the author was removed."); 204 208 … … 211 215 212 216 // 1) get an arbitrary book 213 $book = BookPeer::doSelectOne(newCriteria());217 $book = PropelPeer::BookPeer::doSelectOne(new ::Criteria()); 214 218 $bookId = $book->getId(); 215 219 216 220 // 2) now delete that book 217 BookPeer::doDelete($bookId);221 PropelPeer::BookPeer::doDelete($bookId); 218 222 219 223 // 3) now make sure it's gone 220 $obj = BookPeer::retrieveByPK($bookId);224 $obj = PropelPeer::BookPeer::retrieveByPK($bookId); 221 225 $this->assertNull($obj, "Expect NULL when retrieving on no matching Book."); 222 226 … … 229 233 230 234 // 1) get an arbitrary book 231 $book = BookPeer::doSelectOne(newCriteria());235 $book = PropelPeer::BookPeer::doSelectOne(new ::Criteria()); 232 236 $bookId = $book->getId(); 233 237 234 238 // 2) now delete that book 235 BookPeer::doDelete($book);239 PropelPeer::BookPeer::doDelete($book); 236 240 237 241 // 3) now make sure it's gone 238 $obj = BookPeer::retrieveByPK($bookId);242 $obj = PropelPeer::BookPeer::retrieveByPK($bookId); 239 243 $this->assertNull($obj, "Expect NULL when retrieving on no matching Book."); 240 244 … … 247 251 public function testDoDeleteAll() { 248 252 249 BookPeer::doDeleteAll();250 $this->assertEquals(0, count( BookPeer::doSelect(newCriteria())), "Expect all book rows to have been deleted.");253 PropelPeer::BookPeer::doDeleteAll(); 254 $this->assertEquals(0, count(PropelPeer::BookPeer::doSelect(new ::Criteria())), "Expect all book rows to have been deleted."); 251 255 } 252 256 … … 256 260 public function testDoDeleteAll_Cascade() { 257 261 258 BookPeer::doDeleteAll();259 $this->assertEquals(0, count( MediaPeer::doSelect(newCriteria())), "Expect all media rows to have been cascade deleted.");260 $this->assertEquals(0, count( ReviewPeer::doSelect(newCriteria())), "Expect all review rows to have been cascade deleted.");262 PropelPeer::BookPeer::doDeleteAll(); 263 $this->assertEquals(0, count(PropelPeer::MediaPeer::doSelect(new ::Criteria())), "Expect all media rows to have been cascade deleted."); 264 $this->assertEquals(0, count(PropelPeer::ReviewPeer::doSelect(new ::Criteria())), "Expect all review rows to have been cascade deleted."); 261 265 } 262 266 … … 266 270 public function testDoDeleteAll_SetNull() { 267 271 268 $c = new Criteria();269 $c->add( BookPeer::AUTHOR_ID, null,Criteria::NOT_EQUAL);272 $c = new ::Criteria(); 273 $c->add(PropelPeer::BookPeer::AUTHOR_ID, null, ::Criteria::NOT_EQUAL); 270 274 271 275 // 1) make sure there are some books with valid authors 272 $this->assertTrue(count( BookPeer::doSelect($c)) > 0, "Expect some book.author_id columns that are not NULL.");276 $this->assertTrue(count(PropelPeer::BookPeer::doSelect($c)) > 0, "Expect some book.author_id columns that are not NULL."); 273 277 274 278 // 2) delete all the authors 275 AuthorPeer::doDeleteAll();279 PropelPeer::AuthorPeer::doDeleteAll(); 276 280 277 281 // 3) now verify that the book.author_id columns are all nul 278 $this->assertEquals(0, count( BookPeer::doSelect($c)), "Expect all book.author_id columns to be NULL.");279 } 280 281 /** 282 * Test the doInsert() method when passed a Criteria object.282 $this->assertEquals(0, count(PropelPeer::BookPeer::doSelect($c)), "Expect all book.author_id columns to be NULL."); 283 } 284 285 /** 286 * Test the doInsert() method when passed a ::Criteria object. 283 287 */ 284 288 public function testDoInsert_Criteria() { … … 286 290 $name = "A Sample Publisher - " . time(); 287 291 288 $values = new Criteria();289 $values->add(P ublisherPeer::NAME, $name);290 P ublisherPeer::doInsert($values);291 292 $c = new Criteria();293 $c->add(P ublisherPeer::NAME, $name);294 295 $matches = P ublisherPeer::doSelect($c);292 $values = new ::Criteria(); 293 $values->add(PropelPeer::PublisherPeer::NAME, $name); 294 PropelPeer::PublisherPeer::doInsert($values); 295 296 $c = new ::Criteria(); 297 $c->add(PropelPeer::PublisherPeer::NAME, $name); 298 299 $matches = PropelPeer::PublisherPeer::doSelect($c); 296 300 $this->assertEquals(1, count($matches), "Expect there to be exactly 1 publisher just-inserted."); 297 $this->assertTrue( 1 != $matches[0]->getId(), "Expected to have different ID than one put in values Criteria.");301 $this->assertTrue( 1 != $matches[0]->getId(), "Expected to have different ID than one put in values ::Criteria."); 298 302 299 303 } … … 306 310 $name = "A Sample Publisher - " . time(); 307 311 308 $values = new P ublisher();312 $values = new PropelModel::Publisher(); 309 313 $values->setName($name); 310 P ublisherPeer::doInsert($values);311 312 $c = new Criteria();313 $c->add(P ublisherPeer::NAME, $name);314 315 $matches = P ublisherPeer::doSelect($c);314 PropelPeer::PublisherPeer::doInsert($values); 315 316 $c = new ::Criteria(); 317 $c->add(PropelPeer::PublisherPeer::NAME, $name); 318 319 $matches = PropelPeer::PublisherPeer::doSelect($c); 316 320 $this->assertEquals(1, count($matches), "Expect there to be exactly 1 publisher just-inserted."); 317 $this->assertTrue( 1 != $matches[0]->getId(), "Expected to have different ID than one put in values Criteria.");321 $this->assertTrue( 1 != $matches[0]->getId(), "Expected to have different ID than one put in values ::Criteria."); 318 322 319 323 } … … 325 329 326 330 // 1) get the total number of items in a particular table 327 $count = BookPeer::doCount(newCriteria());331 $count = PropelPeer::BookPeer::doCount(new ::Criteria()); 328 332 329 333 $this->assertTrue($count > 1, "Need more than 1 record in books table to perform this test."); … … 331 335 $limitcount = $count - 1; 332 336 333 $lc = new Criteria();337 $lc = new ::Criteria(); 334 338 $lc->setLimit($limitcount); 335 339 336 $results = BookPeer::doSelect($lc);340 $results = PropelPeer::BookPeer::doSelect($lc); 337 341 338 342 $this->assertEquals($limitcount, count($results), "Expected $limitcount results from BookPeer::doSelect()"); 339 343 340 344 // re-create it just to avoid side-effects 341 $lc2 = new Criteria();345 $lc2 = new ::Criteria(); 342 346 $lc2->setLimit($limitcount); 343 $results2 = BookPeer::doSelectJoinAuthor($lc2);347 $results2 = PropelPeer::BookPeer::doSelectJoinAuthor($lc2); 344 348 345 349 $this->assertEquals($limitcount, count($results2), "Expected $limitcount results from BookPeer::doSelectJoinAuthor()"); … … 353 357 { 354 358 355 BookPeer::clearInstancePool();356 357 $c = new Criteria();358 359 $books = BookPeer::doSelect($c);359 PropelPeer::BookPeer::clearInstancePool(); 360 361 $c = new ::Criteria(); 362 363 $books = PropelPeer::BookPeer::doSelect($c); 360 364 $obj = $books[0]; 361 365 $size = strlen(serialize($obj)); 362 366 363 BookPeer::clearInstancePool();364 365 $joinBooks = BookPeer::doSelectJoinAuthor($c);367 PropelPeer::BookPeer::clearInstancePool(); 368 369 $joinBooks = PropelPeer::BookPeer::doSelectJoinAuthor($c); 366 370 $obj2 = $joinBooks[0]; 367 371 $joinSize = strlen(serialize($obj2)); … … 377 381 public function testDoSelectJoin_NullFk() 378 382 { 379 $b1 = new Book();383 $b1 = new PropelModel::Book(); 380 384 $b1->setTitle("Test NULLFK 1"); 381 385 $b1->setISBN("NULLFK-1"); 382 386 $b1->save(); 383 387 384 $b2 = new Book();388 $b2 = new PropelModel::Book(); 385 389 $b2->setTitle("Test NULLFK 2"); 386 390 $b2->setISBN("NULLFK-2"); 387 $b2->setAuthor(new Author());391 $b2->setAuthor(new PropelModel::Author()); 388 392 $b2->getAuthor()->setFirstName("Hans")->setLastName("L"); 389 393 $b2->save(); 390 394 391 BookPeer::clearInstancePool();392 AuthorPeer::clearInstancePool();393 394 $c = new Criteria();395 $c->add( BookPeer::ISBN, 'NULLFK-%',Criteria::LIKE);396 $c->addAscendingOrderByColumn( BookPeer::ISBN);397 398 $matches = BookPeer::doSelectJoinAuthor($c);395 PropelPeer::BookPeer::clearInstancePool(); 396 PropelPeer::AuthorPeer::clearInstancePool(); 397 398 $c = new ::Criteria(); 399 $c->add(PropelPeer::BookPeer::ISBN, 'NULLFK-%', ::Criteria::LIKE); 400 $c->addAscendingOrderByColumn(PropelPeer::BookPeer::ISBN); 401 402 $matches = PropelPeer::BookPeer::doSelectJoinAuthor($c); 399 403 $this->assertEquals(2, count($matches), "Expected 2 matches back from new books; got back " . count($matches)); 400 404 401 405 $this->assertNull($matches[0]->getAuthor(), "Expected first book author to be null"); 402 $this->assertType('Author', $matches[1]->getAuthor(), "Expected valid Author object for second book."); 406 // This doesn't seem to work in my version of PHPUnit (3.2.21) 407 //$this->assertType('bookstore::Model::Author', $matches[1]->getAuthor(), "Expected valid Author object for second book."); 408 $this->assertEquals('bookstore::Model::Author', get_class($matches[1]->getAuthor())); 403 409 } 404 410 … … 406 412 { 407 413 408 $sample = BookPeer::doSelectOne(newCriteria());414 $sample = PropelPeer::BookPeer::doSelectOne(new ::Criteria()); 409 415 $samplePk = $sample->getPrimaryKey(); 410 416 411 417 // 1) make sure consecutive calls to retrieveByPK() return the same object. 412 418 413 $b1 = BookPeer::retrieveByPK($samplePk);414 $b2 = BookPeer::retrieveByPK($samplePk);419 $b1 = PropelPeer::BookPeer::retrieveByPK($samplePk); 420 $b2 = PropelPeer::BookPeer::retrieveByPK($samplePk); 415 421 416 422 $sampleval = md5(microtime()); … … 419 425 420 426 // 2) make sure that calls to doSelect also return references to the same objects. 421 $allbooks = BookPeer::doSelect(newCriteria());427 $allbooks = PropelPeer::BookPeer::doSelect(new ::Criteria()); 422 428 foreach ($allbooks as $testb) { 423 429 if ($testb->getPrimaryKey() == $b1->getPrimaryKey()) { … … 427 433 428 434 // 3) test fetching related objects 429 $book = BookPeer::retrieveByPK($samplePk);435 $book = PropelPeer::BookPeer::retrieveByPK($samplePk); 430 436 431 437 $bookauthor = $book->getAuthor(); 432 438 433 $author = AuthorPeer::retrieveByPK($bookauthor->getId());439 $author = PropelPeer::AuthorPeer::retrieveByPK($bookauthor->getId()); 434 440 435 441 $this->assertTrue($bookauthor === $author, "Expected same object instance when calling fk object accessor as retrieveByPK()"); 436 442 437 443 // 4) test a doSelectJoin() 438 $morebooks = BookPeer::doSelectJoinAuthor(newCriteria());444 $morebooks = PropelPeer::BookPeer::doSelectJoinAuthor(new ::Criteria()); 439 445 for ($i=0,$j=0; $j < count($morebooks); $i++, $j++) { 440 446 $testb1 = $allbooks[$i]; … … 449 455 450 456 // 5) test creating a new object, saving it, and then retrieving that object (should all be same instance) 451 $b = new BookstoreEmployee();457 $b = new PropelModel::BookstoreEmployee(); 452 458 $b->setName("Testing"); 453 459 $b->setJobTitle("Testing"); … … 456 462 $empId = $b->getId(); 457 463 458 $this->assertSame($b, BookstoreEmployeePeer::retrieveByPK($empId), "Expected newly saved object to be same instance as pooled.");464 $this->assertSame($b, PropelPeer::BookstoreEmployeePeer::retrieveByPK($empId), "Expected newly saved object to be same instance as pooled."); 459 465 460 466 } … … 465 471 public function testInheritance() 466 472 { 467 $manager = new BookstoreManager();473 $manager = new PropelModel::BookstoreManager(); 468 474 $manager->setName("Manager 1"); 469 475 $manager->setJobTitle("Warehouse Manager"); … … 471 477 $managerId = $manager->getId(); 472 478 473 $employee = new BookstoreEmployee();479 $employee = new PropelModel::BookstoreEmployee(); 474 480 $employee->setName("Employee 1"); 475 481 $employee->setJobTitle("Janitor"); … … 478 484 $empId = $employee->getId(); 479 485 480 $cashier = new BookstoreCashier();486 $cashier = new PropelModel::BookstoreCashier(); 481 487 $cashier->setName("Cashier 1"); 482 488 $cashier->setJobTitle("Cashier"); … … 485 491 486 492 // 1) test the pooled instances' 487 $c = new Criteria();488 $c->add( BookstoreEmployeePeer::ID, array($managerId, $empId, $cashierId),Criteria::IN);489 $c->addAscendingOrderByColumn( BookstoreEmployeePeer::ID);490 491 $objects = BookstoreEmployeePeer::doSelect($c);493 $c = new ::Criteria(); 494 $c->add(PropelPeer::BookstoreEmployeePeer::ID, array($managerId, $empId, $cashierId), ::Criteria::IN); 495 $c->addAscendingOrderByColumn(PropelPeer::BookstoreEmployeePeer::ID); 496 497 $objects = PropelPeer::BookstoreEmployeePeer::doSelect($c); 492 498 493 499 $this->assertEquals(3, count($objects), "Expected 3 objects to be returned."); … … 500 506 501 507 // 2) test a forced reload from database 502 BookstoreEmployeePeer::clearInstancePool();503 504 list($o1,$o2,$o3) = BookstoreEmployeePeer::doSelect($c);505 506 $this->assertTrue($o1 instanceof BookstoreManager, "Expected BookstoreManager object, got " . get_class($o1));507 $this->assertTrue($o2 instanceof BookstoreEmployee, "Expected BookstoreEmployee object, got " . get_class($o2));508 $this->assertTrue($o3 instanceof BookstoreCashier, "Expected BookstoreCashier object, got " . get_class($o3));508 PropelPeer::BookstoreEmployeePeer::clearInstancePool(); 509 510 list($o1,$o2,$o3) = PropelPeer::BookstoreEmployeePeer::doSelect($c); 511 512 $this->assertTrue($o1 instanceof PropelModel::BookstoreManager, "Expected BookstoreManager object, got " . get_class($o1)); 513 $this->assertTrue($o2 instanceof PropelModel::BookstoreEmployee, "Expected BookstoreEmployee object, got " . get_class($o2)); 514 $this->assertTrue($o3 instanceof PropelModel::BookstoreCashier, "Expected BookstoreCashier object, got " . get_class($o3)); 509 515 510 516 } … … 515 521 public function testDoCountType() 516 522 { 517 $c = new Criteria();518 $this->assertType('integer', BookPeer::doCount($c), "Expected doCount() to return an integer.");519 $this->assertType('integer', BookPeer::doCountJoinAll($c), "Expected doCountJoinAll() to return an integer.");520 $this->assertType('integer', BookPeer::doCountJoinAuthor($c), "Expected doCountJoinAuthor() to return an integer.");523 $c = new ::Criteria(); 524 $this->assertType('integer', PropelPeer::BookPeer::doCount($c), "Expected doCount() to return an integer."); 525 $this->assertType('integer', PropelPeer::BookPeer::doCountJoinAll($c), "Expected doCountJoinAll() to return an integer."); 526 $this->assertType('integer', PropelPeer::BookPeer::doCountJoinAuthor($c), "Expected doCountJoinAuthor() to return an integer."); 521 527 } 522 528 … … 526 532 public function testDoCountLimitOffset() 527 533 { 528 BookPeer::doDeleteAll();534 PropelPeer::BookPeer::doDeleteAll(); 529 535 530 536 for ($i=0; $i < 25; $i++) { 531 $b = new Book();537 $b = new PropelModel::Book(); 532 538 $b->setTitle("Book $i"); 533 539 $b->setISBN("ISBN $i"); … … 535 541 } 536 542 537 $c = new Criteria();538 $totalCount = BookPeer::doCount($c);543 $c = new ::Criteria(); 544 $totalCount = PropelPeer::BookPeer::doCount($c); 539 545 540 546 $this->assertEquals(25, $totalCount); 541 547 542 $c2 = new Criteria();548 $c2 = new ::Criteria(); 543 549 $c2->setLimit(10); 544 $this->assertEquals(10, BookPeer::doCount($c2));545 546 $c3 = new Criteria();550 $this->assertEquals(10, PropelPeer::BookPeer::doCount($c2)); 551 552 $c3 = new ::Criteria(); 547 553 $c3->setOffset(10); 548 $this->assertEquals(15, BookPeer::doCount($c3));549 550 $c4 = new Criteria();554 $this->assertEquals(15, PropelPeer::BookPeer::doCount($c3)); 555 556 $c4 = new ::Criteria(); 551 557 $c4->setOffset(5); 552 558 $c4->setLimit(5); 553 $this->assertEquals(5, BookPeer::doCount($c4));554 555 $c5 = new Criteria();559 $this->assertEquals(5, PropelPeer::BookPeer::doCount($c4)); 560 561 $c5 = new ::Criteria(); 556 562 $c5->setOffset(20); 557 563 $c5->setLimit(10); 558 $this->assertEquals(5, BookPeer::doCount($c5));564 $this->assertEquals(5, PropelPeer::BookPeer::doCount($c5)); 559 565 } 560 566 … … 564 570 public function testDoCountJoin() 565 571 { 566 BookPeer::doDeleteAll();572 PropelPeer::BookPeer::doDeleteAll(); 567 573 568 574 for ($i=0; $i < 25; $i++) { 569 $b = new Book();575 $b = new PropelModel::Book(); 570 576 $b->setTitle("Book $i"); 571 577 $b->setISBN("ISBN $i"); … … 573 579 } 574 580 575 $c = new Criteria();576 $totalCount = BookPeer::doCount($c);577 578 $this->assertEquals($totalCount, BookPeer::doCountJoinAuthor($c));579 $this->assertEquals($totalCount, BookPeer::doCountJoinPublisher($c));581 $c = new ::Criteria(); 582 $totalCount = PropelPeer::BookPeer::doCount($c); 583 584 $this->assertEquals($totalCount, PropelPeer::BookPeer::doCountJoinAuthor($c)); 585 $this->assertEquals($totalCount, PropelPeer::BookPeer::doCountJoinPublisher($c)); 580 586 } 581 587 … … 587 593 // if it throws an exception, then it's broken. 588 594 try { 589 BookPeer::removeInstanceFromPool(null);590 } catch ( Exception $x) {595 PropelPeer::BookPeer::removeInstanceFromPool(null); 596 } catch (::Exception $x) { 591 597 $this->fail("Expected to get no exception when removing an instance from the pool."); 592 598 } … … 598 604 private function createBookWithId($id) 599 605 { 600 $con = Propel::getConnection(BookPeer::DATABASE_NAME);601 $b = BookPeer::retrieveByPK($id);606 $con = ::Propel::getConnection(PropelPeer::BookPeer::DATABASE_NAME); 607 $b = PropelPeer::BookPeer::retrieveByPK($id); 602 608 if (!$b) { 603 $b = new Book();609 $b = new PropelModel::Book(); 604 610 $b->setTitle("Book$id")->setISBN("BookISBN$id")->save(); 605 611 $b1Id = $b->getId(); 606 $sql = "UPDATE " . BookPeer::TABLE_NAME . " SET id = ? WHERE id = ?";612 $sql = "UPDATE " . PropelPeer::BookPeer::TABLE_NAME . " SET id = ? WHERE id = ?"; 607 613 $stmt = $con->prepare($sql); 608 614 $stmt->bindValue(1, $id); … … 617 623 private function createReaderWithId($id) 618 624 { 619 $con = Propel::getConnection(BookReaderPeer::DATABASE_NAME);620 $r = BookReaderPeer::retrieveByPK($id);625 $con = ::Propel::getConnection(PropelPeer::BookReaderPeer::DATABASE_NAME); 626 $r = PropelPeer::BookReaderPeer::retrieveByPK($id); 621 627 if (!$r) { 622 $r = new BookReader();628 $r = new PropelModel::BookReader(); 623 629 $r->setName('Reader'.$id)->save(); 624 630 $r1Id = $r->getId(); 625 $sql = "UPDATE " . BookReaderPeer::TABLE_NAME . " SET id = ? WHERE id = ?";631 $sql = "UPDATE " . PropelPeer::BookReaderPeer::TABLE_NAME . " SET id = ? WHERE id = ?"; 626 632 $stmt = $con->prepare($sql); 627 633 $stmt->bindValue(1, $id); … … 636 642 public function testDoDeleteCompositePK() 637 643 { 638 $con = Propel::getConnection(BookPeer::DATABASE_NAME);639 640 ReaderFavoritePeer::doDeleteAll();644 $con = ::Propel::getConnection(PropelPeer::BookPeer::DATABASE_NAME); 645 646 PropelPeer::ReaderFavoritePeer::doDeleteAll(); 641 647 // Create book and reader with ID 1 642 648 // Create book and reader with ID 2 … … 649 655 for ($i=1; $i <= 2; $i++) { 650 656 for ($j=1; $j <= 2; $j++) { 651 $bo = new BookOpinion();657 $bo = new PropelModel::BookOpinion(); 652 658 $bo->setBookId($i); 653 659 $bo->setReaderId($j); 654 660 $bo->save(); 655 661 656 $rf = new ReaderFavorite();662 $rf = new PropelModel::ReaderFavorite(); 657 663 $rf->setBookId($i); 658 664 $rf->setReaderId($j); … … 661 667 } 662 668 663 $this->assertEquals(4, ReaderFavoritePeer::doCount(newCriteria()));669 $this->assertEquals(4, PropelPeer::ReaderFavoritePeer::doCount(new ::Criteria())); 664 670 665 671 // Now delete 2 of those rows 666 ReaderFavoritePeer::doDelete(array(array(1,1), array(2,2)));667 668 $this->assertEquals(2, ReaderFavoritePeer::doCount(newCriteria()));669 670 $this->assertNotNull( ReaderFavoritePeer::retrieveByPK(2,1));671 $this->assertNotNull( ReaderFavoritePeer::retrieveByPK(1,2));672 $this->assertNull( ReaderFavoritePeer::retrieveByPK(1,1));673 $this->assertNull( ReaderFavoritePeer::retrieveByPK(2,2));672 PropelPeer::ReaderFavoritePeer::doDelete(array(array(1,1), array(2,2))); 673 674 $this->assertEquals(2, PropelPeer::ReaderFavoritePeer::doCount(new ::Criteria())); 675 676 $this->assertNotNull(PropelPeer::ReaderFavoritePeer::retrieveByPK(2,1)); 677 $this->assertNotNull(PropelPeer::ReaderFavoritePeer::retrieveByPK(1,2)); 678 $this->assertNull(PropelPeer::ReaderFavoritePeer::retrieveByPK(1,1)); 679 $this->assertNull(PropelPeer::ReaderFavoritePeer::retrieveByPK(2,2)); 674 680 } 675 681 … … 681 687 public function testHydrationJoinLazyLoad() 682 688 { 683 BookstoreEmployeeAccountPeer::doDeleteAll();684 BookstoreEmployeePeer::doDeleteAll();685 AcctAccessRolePeer::doDeleteAll();686 687 $bemp2 = new BookstoreEmployee();689 PropelPeer::BookstoreEmployeeAccountPeer::doDeleteAll(); 690 PropelPeer::BookstoreEmployeePeer::doDeleteAll(); 691 PropelPeer::AcctAccessRolePeer::doDeleteAll(); 692 693 $bemp2 = new PropelModel::BookstoreEmployee(); 688 694 $bemp2->setName("Pieter"); 689 695 $bemp2->setJobTitle("Clerk"); 690 696 $bemp2->save(); 691 697 692 $role = new AcctAccessRole();698 $role = new PropelModel::AcctAccessRole(); 693 699 $role->setName("Admin"); 694 700 695 $bempacct = new BookstoreEmployeeAccount();701 $bempacct = new PropelModel::BookstoreEmployeeAccount(); 696 702 $bempacct->setBookstoreEmployee($bemp2); 697 703 $bempacct->setAcctAccessRole($role); … … 700 706 $bempacct->save(); 701 707 702 $c = new Criteria();703 $results = BookstoreEmployeeAccountPeer::doSelectJoinAll($c);708 $c = new ::Criteria(); 709 $results = PropelPeer::BookstoreEmployeeAccountPeer::doSelectJoinAll($c); 704 710 $o = $results[0]; 705 711 … … 713 719 public function testMultiColFk() 714 720 { 715 $con = Propel::getConnection(BookPeer::DATABASE_NAME);716 717 ReaderFavoritePeer::doDeleteAll();718 719 $b1 = new Book();721 $con = ::Propel::getConnection(PropelPeer::BookPeer::DATABASE_NAME); 722 723 PropelPeer::ReaderFavoritePeer::doDeleteAll(); 724 725 $b1 = new PropelModel::Book(); 720 726 $b1->setTitle("Book1"); 721 727 $b1->setISBN("ISBN-1"); 722 728 $b1->save(); 723 729 724 $r1 = new BookReader();730 $r1 = new PropelModel::BookReader(); 725 731 $r1-> setName("Me"); 726 732 $r1->save(); 727 733 728 $bo1 = new BookOpinion();734 $bo1 = new PropelModel::BookOpinion(); 729 735 $bo1->setBookId($b1->getId()); 730 736 $bo1->setReaderId($r1->getId()); … … 733 739 $bo1->save(); 734 740 735 $rf1 = new ReaderFavorite();741 $rf1 = new PropelModel::ReaderFavorite(); 736 742 $rf1->setReaderId($r1->getId()); 737 743 $rf1->setBookId($b1->getId()); 738 744 $rf1->save(); 739 745 740 $c = new Criteria(ReaderFavoritePeer::DATABASE_NAME);741 $c->add( ReaderFavoritePeer::BOOK_ID, $b1->getId());742 $c->add( ReaderFavoritePeer::READER_ID, $r1->getId());746 $c = new ::Criteria(PropelPeer::ReaderFavoritePeer::DATABASE_NAME); 747 $c->add(PropelPeer::ReaderFavoritePeer::BOOK_ID, $b1->getId()); 748 $c->add(PropelPeer::ReaderFavoritePeer::READER_ID, $r1->getId()); 743 749 744 750 // This will produce an error! 745 $results = ReaderFavoritePeer::doSelectJoinBookOpinion($c);751 $results = PropelPeer::ReaderFavoritePeer::doSelectJoinBookOpinion($c); 746 752 $this->assertEquals(1, count($results), "Expected 1 result"); 747 753 } … … 752 758 public function testMultiColJoin() 753 759 { 754 BookstoreContestPeer::doDeleteAll();755 BookstoreContestEntryPeer::doDeleteAll();756 757 $bs = new Bookstore();760 &n
