[Tests] Added missing unit tests

propelorm · Nov 10, 2011 · e4cbdd6 · e4cbdd6
1 parent a197124
commit e4cbdd6
Show file tree

Hide file tree

Showing 6 changed files with 1,675 additions and 17 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -14,8 +14,7 @@
 
     <testsuites>
         <testsuite name="Propel2 Test Suite">
-            <directory>./tests/Propel/Tests/Generator/</directory>
+            <directory>./tests/Propel/Tests/</directory>
-            <directory>./tests/Propel/Tests/Runtime/</directory>
         </testsuite>
     </testsuites>
 

diff --git a/src/Propel/Runtime/Util/BasePeer.php b/src/Propel/Runtime/Util/BasePeer.php
@@ -82,23 +82,19 @@ class BasePeer
      */
     const TYPE_NUM = 'num';
 
-    static public function getFieldnames ($classname, $type = self::TYPE_PHPNAME) {
+    static public function getFieldnames($classname, $type = self::TYPE_PHPNAME)
-
+    {
-        // TODO we should take care of including the peer class here
+        $peerclass  = $classname . 'Peer';
-
+        $callable   = array($peerclass, 'getFieldnames');
-        $peerclass = 'Base' . $classname . 'Peer'; // TODO is this always true?
-        $callable = array($peerclass, 'getFieldnames');
 
         return call_user_func($callable, $type);
     }
 
-    static public function translateFieldname($classname, $fieldname, $fromType, $toType) {
+    static public function translateFieldname($classname, $fieldname, $fromType, $toType)
-
+    {
-        // TODO we should take care of including the peer class here
+        $peerclass  = $classname . 'Peer';
-
+        $callable   = array($peerclass, 'translateFieldname');
-        $peerclass = 'Base' . $classname . 'Peer'; // TODO is this always true?
+        $args       = array($fieldname, $fromType, $toType);
-        $callable = array($peerclass, 'translateFieldname');
-        $args = array($fieldname, $fromType, $toType);
 
         return call_user_func_array($callable, $args);
     }
@@ -187,15 +183,15 @@ public static function doDelete(Criteria $criteria, ConnectionInterface $con)
      */
     public static function doDeleteAll($tableName, ConnectionInterface $con, $databaseName = null)
     {
-        
+
         try {
             $db = Propel::getDB($databaseName);
             if ($db->useQuoteIdentifier()) {
                 $tableName = $db->quoteIdentifierTable($tableName);
             }
             $sql = "DELETE FROM " . $tableName;
             $stmt = $con->prepare($sql);
-            
+
             $stmt->execute();
 
             return $stmt->rowCount();