Show
Ignore:
Timestamp:
09/17/08 14:11:31 (3 months ago)
Author:
tony
Message:

Refs #683: Added support for PHP 5.3 namespaces

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk

    • Property svn:ignore set to
      .project
      .cache
      .settings
  • trunk/generator/test/classes/propel/GeneratedPeerTest.php

    r1068 r1082  
    11<?php 
     2 
     3use bookstore::Peer as PropelPeer; 
     4use bookstore::Model as PropelModel; 
     5 
    26/* 
    37 *  $Id$ 
     
    3943 
    4044        /** 
    41          * Test ability to delete multiple rows via single Criteria object. 
     45         * Test ability to delete multiple rows via single ::Criteria object. 
    4246         */ 
    4347        public function testDoDelete_MultiTable() { 
    4448 
    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); 
    4852 
    4953                // 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()); 
    5256                // The only way for multi-delete to work currently 
    5357                // is to specify the author_id and publisher_id (i.e. the fkeys 
    5458                // have to be in the criteria). 
    55                 $c->add(AuthorPeer::ID, $hp->getAuthorId()); 
    56                 $c->add(PublisherPeer::ID, $hp->getPublisherId()); 
     59                $c->add(PropelPeer::AuthorPeer::ID, $hp->getAuthorId()); 
     60                $c->add(PropelPeer::PublisherPeer::ID, $hp->getPublisherId()); 
    5761                $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())); 
    6165 
    6266                // check to make sure the right # of records was removed 
    63                 $this->assertEquals(3, count(AuthorPeer::doSelect(new Criteria())), "Expected 3 authors after deleting."); 
    64                 $this->assertEquals(3, count(PublisherPeer::doSelect(new Criteria())), "Expected 3 publishers after deleting."); 
    65                 $this->assertEquals(3, count(BookPeer::doSelect(new Criteria())), "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."); 
    6670        } 
    6771 
     
    7276 
    7377                //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")); 
    7882                $c->add($cn); 
    79                 BookPeer::doDelete($c); 
     83                PropelPeer::BookPeer::doDelete($c); 
    8084 
    8185                // now there should only be one book left; "The Tin Drum" 
    8286 
    83                 $books = BookPeer::doSelect(new Criteria()); 
     87                $books = PropelPeer::BookPeer::doSelect(new ::Criteria()); 
    8488 
    8589                $this->assertEquals(1, count($books), "Expected 1 book remaining after deleting."); 
     
    97101                // 1) Assert the row exists right now 
    98102 
    99                 $medias = MediaPeer::doSelect(new Criteria()); 
     103                $medias = PropelPeer::MediaPeer::doSelect(new ::Criteria()); 
    100104                $this->assertTrue(count($medias) > 0, "Expected to find at least one row in 'media' table."); 
    101105                $media = $medias[0]; 
     
    105109 
    106110                $owningBookId = $media->getBookId(); 
    107                 BookPeer::doDelete($owningBookId); 
     111                PropelPeer::BookPeer::doDelete($owningBookId); 
    108112 
    109113                // 3) Assert that the media row is now also gone 
    110114 
    111                 $obj = MediaPeer::retrieveByPK($mediaId); 
     115                $obj = PropelPeer::MediaPeer::retrieveByPK($mediaId); 
    112116                $this->assertNull($obj, "Expect NULL when retrieving on no matching Media."); 
    113117 
     
    121125        { 
    122126 
    123                 $origBceCount = BookstoreContestEntryPeer::doCount(new Criteria()); 
    124  
    125                 $cust1 = new Customer(); 
     127                $origBceCount = PropelPeer::BookstoreContestEntryPeer::doCount(new ::Criteria()); 
     128 
     129                $cust1 = new PropelModel::Customer(); 
    126130                $cust1->setName("Cust1"); 
    127131                $cust1->save(); 
    128132 
    129                 $cust2 = new Customer(); 
     133                $cust2 = new PropelModel::Customer(); 
    130134                $cust2->setName("Cust2"); 
    131135                $cust2->save(); 
    132136 
    133                 $c1 = new Contest(); 
     137                $c1 = new PropelModel::Contest(); 
    134138                $c1->setName("Contest1"); 
    135139                $c1->save(); 
    136140 
    137                 $c2 = new Contest(); 
     141                $c2 = new PropelModel::Contest(); 
    138142                $c2->setName("Contest2"); 
    139143                $c2->save(); 
    140144 
    141                 $store1 = new Bookstore(); 
     145                $store1 = new PropelModel::Bookstore(); 
    142146                $store1->setStoreName("Store1"); 
    143147                $store1->save(); 
    144148 
    145                 $bc1 = new BookstoreContest(); 
     149                $bc1 = new PropelModel::BookstoreContest(); 
    146150                $bc1->setBookstore($store1); 
    147151                $bc1->setContest($c1); 
    148152                $bc1->save(); 
    149153 
    150                 $bc2 = new BookstoreContest(); 
     154                $bc2 = new PropelModel::BookstoreContest(); 
    151155                $bc2->setBookstore($store1); 
    152156                $bc2->setContest($c2); 
    153157                $bc2->save(); 
    154158 
    155                 $bce1 = new BookstoreContestEntry(); 
     159                $bce1 = new PropelModel::BookstoreContestEntry(); 
    156160                $bce1->setEntryDate("now"); 
    157161                $bce1->setCustomer($cust1); 
     
    159163                $bce1->save(); 
    160164 
    161                 $bce2 = new BookstoreContestEntry(); 
     165                $bce2 = new PropelModel::BookstoreContestEntry(); 
    162166                $bce2->setEntryDate("now"); 
    163167                $bce2->setCustomer($cust1); 
     
    167171                // Now, if we remove $bc1, we expect *only* bce1 to be no longer valid. 
    168172 
    169                 BookstoreContestPeer::doDelete($bc1); 
    170  
    171                 $newCount = BookstoreContestEntryPeer::doCount(new Criteria()); 
     173                PropelPeer::BookstoreContestPeer::doDelete($bc1); 
     174 
     175                $newCount = PropelPeer::BookstoreContestEntryPeer::doCount(new ::Criteria()); 
    172176 
    173177                $this->assertEquals($origBceCount + 1, $newCount, "Expected new number of rows in BCE to be orig + 1"); 
    174178 
    175                 $bcetest = BookstoreContestEntryPeer::retrieveByPK($store1->getId(), $c1->getId(), $cust1->getId()); 
     179                $bcetest = PropelPeer::BookstoreContestEntryPeer::retrieveByPK($store1->getId(), $c1->getId(), $cust1->getId()); 
    176180                $this->assertNull($bcetest, "Expected BCE for store1 to be cascade deleted."); 
    177181 
    178                 $bcetest2 = BookstoreContestEntryPeer::retrieveByPK($store1->getId(), $c2->getId(), $cust1->getId()); 
     182                $bcetest2 = PropelPeer::BookstoreContestEntryPeer::retrieveByPK($store1->getId(), $c2->getId(), $cust1->getId()); 
    179183                $this->assertNotNull($bcetest2, "Expected BCE for store2 to NOT be cascade deleted."); 
    180184 
     
    189193 
    190194                // 1) Get an arbitrary book 
    191                 $c = new Criteria(); 
    192                 $book = BookPeer::doSelectOne($c); 
     195                $c = new ::Criteria(); 
     196                $book = PropelPeer::BookPeer::doSelectOne($c); 
    193197                $bookId = $book->getId(); 
    194198                $authorId = $book->getAuthorId(); 
     
    196200 
    197201                // 2) Delete the author for that book 
    198                 AuthorPeer::doDelete($authorId); 
     202                PropelPeer::AuthorPeer::doDelete($authorId); 
    199203 
    200204                // 3) Assert that the book.author_id column is now NULL 
    201205 
    202                 $book = BookPeer::retrieveByPK($bookId); 
     206                $book = PropelPeer::BookPeer::retrieveByPK($bookId); 
    203207                $this->assertNull($book->getAuthorId(), "Expect the book.author_id to be NULL after the author was removed."); 
    204208 
     
    211215 
    212216                // 1) get an arbitrary book 
    213                 $book = BookPeer::doSelectOne(new Criteria()); 
     217                $book = PropelPeer::BookPeer::doSelectOne(new ::Criteria()); 
    214218                $bookId = $book->getId(); 
    215219 
    216220                // 2) now delete that book 
    217                 BookPeer::doDelete($bookId); 
     221                PropelPeer::BookPeer::doDelete($bookId); 
    218222 
    219223                // 3) now make sure it's gone 
    220                 $obj = BookPeer::retrieveByPK($bookId); 
     224                $obj = PropelPeer::BookPeer::retrieveByPK($bookId); 
    221225                $this->assertNull($obj, "Expect NULL when retrieving on no matching Book."); 
    222226 
     
    229233 
    230234                // 1) get an arbitrary book 
    231                 $book = BookPeer::doSelectOne(new Criteria()); 
     235                $book = PropelPeer::BookPeer::doSelectOne(new ::Criteria()); 
    232236                $bookId = $book->getId(); 
    233237 
    234238                // 2) now delete that book 
    235                 BookPeer::doDelete($book); 
     239                PropelPeer::BookPeer::doDelete($book); 
    236240 
    237241                // 3) now make sure it's gone 
    238                 $obj = BookPeer::retrieveByPK($bookId); 
     242                $obj = PropelPeer::BookPeer::retrieveByPK($bookId); 
    239243                $this->assertNull($obj, "Expect NULL when retrieving on no matching Book."); 
    240244 
     
    247251        public function testDoDeleteAll() { 
    248252 
    249                 BookPeer::doDeleteAll(); 
    250                 $this->assertEquals(0, count(BookPeer::doSelect(new Criteria())), "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."); 
    251255        } 
    252256 
     
    256260        public function testDoDeleteAll_Cascade() { 
    257261 
    258                 BookPeer::doDeleteAll(); 
    259                 $this->assertEquals(0, count(MediaPeer::doSelect(new Criteria())), "Expect all media rows to have been cascade deleted."); 
    260                 $this->assertEquals(0, count(ReviewPeer::doSelect(new Criteria())), "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."); 
    261265        } 
    262266 
     
    266270        public function testDoDeleteAll_SetNull() { 
    267271 
    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); 
    270274 
    271275                // 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."); 
    273277 
    274278                // 2) delete all the authors 
    275                 AuthorPeer::doDeleteAll(); 
     279                PropelPeer::AuthorPeer::doDeleteAll(); 
    276280 
    277281                // 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. 
    283287         */ 
    284288        public function testDoInsert_Criteria() { 
     
    286290                $name = "A Sample Publisher - " . time(); 
    287291 
    288                 $values = new Criteria(); 
    289                 $values->add(PublisherPeer::NAME, $name); 
    290                 PublisherPeer::doInsert($values); 
    291  
    292                 $c = new Criteria(); 
    293                 $c->add(PublisherPeer::NAME, $name); 
    294  
    295                 $matches = PublisherPeer::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); 
    296300                $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."); 
    298302 
    299303        } 
     
    306310                $name = "A Sample Publisher - " . time(); 
    307311 
    308                 $values = new Publisher(); 
     312                $values = new PropelModel::Publisher(); 
    309313                $values->setName($name); 
    310                 PublisherPeer::doInsert($values); 
    311  
    312                 $c = new Criteria(); 
    313                 $c->add(PublisherPeer::NAME, $name); 
    314  
    315                 $matches = PublisherPeer::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); 
    316320                $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."); 
    318322 
    319323        } 
     
    325329 
    326330                // 1) get the total number of items in a particular table 
    327                 $count = BookPeer::doCount(new Criteria()); 
     331                $count = PropelPeer::BookPeer::doCount(new ::Criteria()); 
    328332 
    329333                $this->assertTrue($count > 1, "Need more than 1 record in books table to perform this test."); 
     
    331335                $limitcount = $count - 1; 
    332336 
    333                 $lc = new Criteria(); 
     337                $lc = new ::Criteria(); 
    334338                $lc->setLimit($limitcount); 
    335339 
    336                 $results = BookPeer::doSelect($lc); 
     340                $results = PropelPeer::BookPeer::doSelect($lc); 
    337341 
    338342                $this->assertEquals($limitcount, count($results), "Expected $limitcount results from BookPeer::doSelect()"); 
    339343 
    340344                // re-create it just to avoid side-effects 
    341                 $lc2 = new Criteria(); 
     345                $lc2 = new ::Criteria(); 
    342346                $lc2->setLimit($limitcount); 
    343                 $results2 = BookPeer::doSelectJoinAuthor($lc2); 
     347                $results2 = PropelPeer::BookPeer::doSelectJoinAuthor($lc2); 
    344348 
    345349                $this->assertEquals($limitcount, count($results2), "Expected $limitcount results from BookPeer::doSelectJoinAuthor()"); 
     
    353357        { 
    354358 
    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); 
    360364                $obj = $books[0]; 
    361365                $size = strlen(serialize($obj)); 
    362366 
    363                 BookPeer::clearInstancePool(); 
    364  
    365                 $joinBooks = BookPeer::doSelectJoinAuthor($c); 
     367                PropelPeer::BookPeer::clearInstancePool(); 
     368 
     369                $joinBooks = PropelPeer::BookPeer::doSelectJoinAuthor($c); 
    366370                $obj2 = $joinBooks[0]; 
    367371                $joinSize = strlen(serialize($obj2)); 
     
    377381        public function testDoSelectJoin_NullFk() 
    378382        { 
    379                 $b1 = new Book(); 
     383                $b1 = new PropelModel::Book(); 
    380384                $b1->setTitle("Test NULLFK 1"); 
    381385                $b1->setISBN("NULLFK-1"); 
    382386                $b1->save(); 
    383387 
    384                 $b2 = new Book(); 
     388                $b2 = new PropelModel::Book(); 
    385389                $b2->setTitle("Test NULLFK 2"); 
    386390                $b2->setISBN("NULLFK-2"); 
    387                 $b2->setAuthor(new Author()); 
     391                $b2->setAuthor(new PropelModel::Author()); 
    388392                $b2->getAuthor()->setFirstName("Hans")->setLastName("L"); 
    389393                $b2->save(); 
    390394 
    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); 
    399403                $this->assertEquals(2, count($matches), "Expected 2 matches back from new books; got back " . count($matches)); 
    400404 
    401405                $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())); 
    403409        } 
    404410 
     
    406412        { 
    407413 
    408                 $sample = BookPeer::doSelectOne(new Criteria()); 
     414                $sample = PropelPeer::BookPeer::doSelectOne(new ::Criteria()); 
    409415                $samplePk = $sample->getPrimaryKey(); 
    410416 
    411417                // 1) make sure consecutive calls to retrieveByPK() return the same object. 
    412418 
    413                 $b1 = BookPeer::retrieveByPK($samplePk); 
    414                 $b2 = BookPeer::retrieveByPK($samplePk); 
     419                $b1 = PropelPeer::BookPeer::retrieveByPK($samplePk); 
     420                $b2 = PropelPeer::BookPeer::retrieveByPK($samplePk); 
    415421 
    416422                $sampleval = md5(microtime()); 
     
    419425 
    420426                // 2) make sure that calls to doSelect also return references to the same objects. 
    421                 $allbooks = BookPeer::doSelect(new Criteria()); 
     427                $allbooks = PropelPeer::BookPeer::doSelect(new ::Criteria()); 
    422428                foreach ($allbooks as $testb) { 
    423429                        if ($testb->getPrimaryKey() == $b1->getPrimaryKey()) { 
     
    427433 
    428434                // 3) test fetching related objects 
    429                 $book = BookPeer::retrieveByPK($samplePk); 
     435                $book = PropelPeer::BookPeer::retrieveByPK($samplePk); 
    430436 
    431437                $bookauthor = $book->getAuthor(); 
    432438 
    433                 $author = AuthorPeer::retrieveByPK($bookauthor->getId()); 
     439                $author = PropelPeer::AuthorPeer::retrieveByPK($bookauthor->getId()); 
    434440 
    435441                $this->assertTrue($bookauthor === $author, "Expected same object instance when calling fk object accessor as retrieveByPK()"); 
    436442 
    437443                // 4) test a doSelectJoin() 
    438                 $morebooks = BookPeer::doSelectJoinAuthor(new Criteria()); 
     444                $morebooks = PropelPeer::BookPeer::doSelectJoinAuthor(new ::Criteria()); 
    439445                for ($i=0,$j=0; $j < count($morebooks); $i++, $j++) { 
    440446                        $testb1 = $allbooks[$i]; 
     
    449455 
    450456                // 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(); 
    452458                $b->setName("Testing"); 
    453459                $b->setJobTitle("Testing"); 
     
    456462                $empId = $b->getId(); 
    457463 
    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."); 
    459465 
    460466        } 
     
    465471        public function testInheritance() 
    466472        { 
    467                 $manager = new BookstoreManager(); 
     473                $manager = new PropelModel::BookstoreManager(); 
    468474                $manager->setName("Manager 1"); 
    469475                $manager->setJobTitle("Warehouse Manager"); 
     
    471477                $managerId = $manager->getId(); 
    472478 
    473                 $employee = new BookstoreEmployee(); 
     479                $employee = new PropelModel::BookstoreEmployee(); 
    474480                $employee->setName("Employee 1"); 
    475481                $employee->setJobTitle("Janitor"); 
     
    478484                $empId = $employee->getId(); 
    479485 
    480                 $cashier = new BookstoreCashier(); 
     486                $cashier = new PropelModel::BookstoreCashier(); 
    481487                $cashier->setName("Cashier 1"); 
    482488                $cashier->setJobTitle("Cashier"); 
     
    485491 
    486492                // 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); 
    492498 
    493499                $this->assertEquals(3, count($objects), "Expected 3 objects to be returned."); 
     
    500506 
    501507                // 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)); 
    509515 
    510516        } 
     
    515521        public function testDoCountType() 
    516522        { 
    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."); 
    521527        } 
    522528 
     
    526532        public function testDoCountLimitOffset() 
    527533        { 
    528                 BookPeer::doDeleteAll(); 
     534                PropelPeer::BookPeer::doDeleteAll(); 
    529535 
    530536                for ($i=0; $i < 25; $i++) { 
    531                         $b = new Book(); 
     537                        $b = new PropelModel::Book(); 
    532538                        $b->setTitle("Book $i"); 
    533539                        $b->setISBN("ISBN $i"); 
     
    535541                } 
    536542 
    537                 $c = new Criteria(); 
    538                 $totalCount = BookPeer::doCount($c); 
     543                $c = new ::Criteria(); 
     544                $totalCount = PropelPeer::BookPeer::doCount($c); 
    539545 
    540546                $this->assertEquals(25, $totalCount); 
    541547 
    542                 $c2 = new Criteria(); 
     548                $c2 = new ::Criteria(); 
    543549                $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(); 
    547553                $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(); 
    551557                $c4->setOffset(5); 
    552558                $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(); 
    556562                $c5->setOffset(20); 
    557563                $c5->setLimit(10); 
    558                 $this->assertEquals(5, BookPeer::doCount($c5)); 
     564                $this->assertEquals(5, PropelPeer::BookPeer::doCount($c5)); 
    559565        } 
    560566 
     
    564570        public function testDoCountJoin() 
    565571        { 
    566                 BookPeer::doDeleteAll(); 
     572                PropelPeer::BookPeer::doDeleteAll(); 
    567573 
    568574                for ($i=0; $i < 25; $i++) { 
    569                         $b = new Book(); 
     575                        $b = new PropelModel::Book(); 
    570576                        $b->setTitle("Book $i"); 
    571577                        $b->setISBN("ISBN $i"); 
     
    573579                } 
    574580 
    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)); 
    580586        } 
    581587 
     
    587593                // if it throws an exception, then it's broken. 
    588594                try { 
    589                         BookPeer::removeInstanceFromPool(null); 
    590                 } catch (Exception $x) { 
     595                        PropelPeer::BookPeer::removeInstanceFromPool(null); 
     596                } catch (::Exception $x) { 
    591597                        $this->fail("Expected to get no exception when removing an instance from the pool."); 
    592598                } 
     
    598604        private function createBookWithId($id) 
    599605        { 
    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); 
    602608                if (!$b) { 
    603                         $b = new Book(); 
     609                        $b = new PropelModel::Book(); 
    604610                        $b->setTitle("Book$id")->setISBN("BookISBN$id")->save(); 
    605611                        $b1Id = $b->getId(); 
    606                         $sql = "UPDATE " . BookPeer::TABLE_NAME . " SET id = ? WHERE id = ?"; 
     612                        $sql = "UPDATE " . PropelPeer::BookPeer::TABLE_NAME . " SET id = ? WHERE id = ?"; 
    607613                        $stmt = $con->prepare($sql); 
    608614                        $stmt->bindValue(1, $id); 
     
    617623        private function createReaderWithId($id) 
    618624        { 
    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); 
    621627                if (!$r) { 
    622                         $r = new BookReader(); 
     628                        $r = new PropelModel::BookReader(); 
    623629                        $r->setName('Reader'.$id)->save(); 
    624630                        $r1Id = $r->getId(); 
    625                         $sql = "UPDATE " . BookReaderPeer::TABLE_NAME . " SET id = ? WHERE id = ?"; 
     631                        $sql = "UPDATE " . PropelPeer::BookReaderPeer::TABLE_NAME . " SET id = ? WHERE id = ?"; 
    626632                        $stmt = $con->prepare($sql); 
    627633                        $stmt->bindValue(1, $id); 
     
    636642        public function testDoDeleteCompositePK() 
    637643        { 
    638                 $con = Propel::getConnection(BookPeer::DATABASE_NAME); 
    639  
    640                 ReaderFavoritePeer::doDeleteAll(); 
     644                $con = ::Propel::getConnection(PropelPeer::BookPeer::DATABASE_NAME); 
     645 
     646                PropelPeer::ReaderFavoritePeer::doDeleteAll(); 
    641647                // Create book and reader with ID 1 
    642648                // Create book and reader with ID 2 
     
    649655                for ($i=1; $i <= 2; $i++) { 
    650656                        for ($j=1; $j <= 2; $j++) { 
    651                                 $bo = new BookOpinion(); 
     657                                $bo = new PropelModel::BookOpinion(); 
    652658                                $bo->setBookId($i); 
    653659                                $bo->setReaderId($j); 
    654660                                $bo->save(); 
    655661                                 
    656                                 $rf = new ReaderFavorite(); 
     662                                $rf = new PropelModel::ReaderFavorite(); 
    657663                                $rf->setBookId($i); 
    658664                                $rf->setReaderId($j); 
     
    661667                } 
    662668 
    663                 $this->assertEquals(4, ReaderFavoritePeer::doCount(new Criteria())); 
     669                $this->assertEquals(4, PropelPeer::ReaderFavoritePeer::doCount(new ::Criteria())); 
    664670 
    665671                // Now delete 2 of those rows 
    666                 ReaderFavoritePeer::doDelete(array(array(1,1), array(2,2))); 
    667  
    668                 $this->assertEquals(2, ReaderFavoritePeer::doCount(new Criteria())); 
    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)); 
    674680        } 
    675681 
     
    681687        public function testHydrationJoinLazyLoad() 
    682688        { 
    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(); 
    688694                $bemp2->setName("Pieter"); 
    689695                $bemp2->setJobTitle("Clerk"); 
    690696                $bemp2->save(); 
    691697 
    692                 $role = new AcctAccessRole(); 
     698                $role = new PropelModel::AcctAccessRole(); 
    693699                $role->setName("Admin"); 
    694700 
    695                 $bempacct = new BookstoreEmployeeAccount(); 
     701                $bempacct = new PropelModel::BookstoreEmployeeAccount(); 
    696702                $bempacct->setBookstoreEmployee($bemp2); 
    697703                $bempacct->setAcctAccessRole($role); 
     
    700706                $bempacct->save(); 
    701707 
    702                 $c = new Criteria(); 
    703                 $results = BookstoreEmployeeAccountPeer::doSelectJoinAll($c); 
     708                $c = new ::Criteria(); 
     709                $results = PropelPeer::BookstoreEmployeeAccountPeer::doSelectJoinAll($c); 
    704710                $o = $results[0]; 
    705711 
     
    713719        public function testMultiColFk() 
    714720        { 
    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(); 
    720726                $b1->setTitle("Book1"); 
    721727                $b1->setISBN("ISBN-1"); 
    722728                $b1->save(); 
    723729                 
    724                 $r1 = new BookReader(); 
     730                $r1 = new PropelModel::BookReader(); 
    725731                $r1-> setName("Me"); 
    726732                $r1->save(); 
    727733                 
    728                 $bo1 = new BookOpinion(); 
     734                $bo1 = new PropelModel::BookOpinion(); 
    729735                $bo1->setBookId($b1->getId()); 
    730736                $bo1->setReaderId($r1->getId()); 
     
    733739                $bo1->save(); 
    734740                 
    735                 $rf1 = new ReaderFavorite(); 
     741                $rf1 = new PropelModel::ReaderFavorite(); 
    736742                $rf1->setReaderId($r1->getId()); 
    737743                $rf1->setBookId($b1->getId()); 
    738744                $rf1->save(); 
    739745                 
    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()); 
    743749                 
    744750                // This will produce an error! 
    745                 $results = ReaderFavoritePeer::doSelectJoinBookOpinion($c); 
     751                $results = PropelPeer::ReaderFavoritePeer::doSelectJoinBookOpinion($c); 
    746752                $this->assertEquals(1, count($results), "Expected 1 result"); 
    747753        } 
     
    752758        public function testMultiColJoin() 
    753759        { 
    754                 BookstoreContestPeer::doDeleteAll(); 
    755                 BookstoreContestEntryPeer::doDeleteAll(); 
    756                  
    757                 $bs = new Bookstore(); 
     760      &n