Changeset 928

Timestamp:

09/18/07 23:21:03 (1 year ago)

Author:

mikey

Message:

refactored finder to get rid of stubPersistable

Files:

• trunk/src/main/php/net/stubbles/rdbms/persistence/finder/stubDatabaseFinder.php (modified) (3 diffs)
• trunk/src/main/php/net/stubbles/rdbms/persistence/stubPersistenceHelper.php (modified) (2 diffs)
• trunk/src/test/php/net/stubbles/rdbms/RDBMSTestSuite.php (modified) (1 diff)
• trunk/src/test/php/net/stubbles/rdbms/persistence/MockNoTableAnnotationPersistable.php (modified) (3 diffs)
• trunk/src/test/php/net/stubbles/rdbms/persistence/finder/stubDatabaseFinderTestCase.php (modified) (8 diffs)

trunk/src/main/php/net/stubbles/rdbms/persistence/finder/stubDatabaseFinder.php

@@ -1 +1 @@
-<?php
-/**
- persistable
+n entity
- *
- * @author      Frank Kleine <mikey@stubbles.net>
@@ -15 +15 @@
-                      'net.stubbles.rdbms.persistence.finder.stubDatabaseFinderResult',
-                      'net.stubbles.rdbms.querybuilder.stubDatabaseQueryBuilderFactory',
-
-
+
-);
-/**
- persistable
+n entity
- *
- * @package     stubbles
@@ -168 +167 @@
-            }
-            
-
-
+
+
+
+
-            }
-            

trunk/src/main/php/net/stubbles/rdbms/persistence/stubPersistenceHelper.php

@@ -78 +78 @@
-        } else {
-            $column     = new stubDatabaseTableColumn();
-
-
+
-            $returnType = $method->getReturnType();
-            if (null === $returnType) {
@@ -122 +121 @@
-        return $column;
-    }
+
+    /**
+     * creates the property name from the name of the method
+     *
+     * @param   string  $methodName
+     * @return  string
+     */
+    protected function getPropertyName($methodName)
+    {
+        $propertyName = str_replace('is', '', str_replace('get', '', $methodName));
+        return strtolower($propertyName{0}) . substr($propertyName, 1);
+    }
-}
-?>

trunk/src/test/php/net/stubbles/rdbms/RDBMSTestSuite.php

@@ -46 +46 @@
-        $this->addTestFile($dir . '/persistence/creator/stubDatabaseCreatorTestCase.php');
-        $this->addTestFile($dir . '/persistence/eraser/stubDatabaseEraserTestCase.php');
-#
+
-       # $this->addTestFile($dir . '/persistence/serializer/stubDatabaseSerializerTestCase.php');
-        

trunk/src/test/php/net/stubbles/rdbms/persistence/MockNoTableAnnotationPersistable.php

@@ -100 +100 @@
-
-    /**
+     * setter method to prevent exceptions
+     *
+     * @param  int  $intValue
+     */
+    public function setIntValue($intValue)
+    {
+        // ignore this
+    }
+
+    /**
-     * method that has a no annotation
-     *
@@ -110 +120 @@
-
-    /**
+     * setter method to prevent exceptions
+     *
+     * @param  bool  $boolValue
+     */
+    public function setBoolValue($boolValue)
+    {
+        // ignore this
+    }
+
+    /**
-     * method that has a no annotation
-     *
@@ -117 +137 @@
-    {
-        return 3.13;
+    }
+
+    /**
+     * setter method to prevent exceptions
+     *
+     * @param  float  $floatValue
+     */
+    public function setFloatValue($floatValue)
+    {
+        // ignore this
-    }
-

trunk/src/test/php/net/stubbles/rdbms/persistence/finder/stubDatabaseFinderTestCase.php

@@ -1 +1 @@
-<?php
-/**
-
+.
- *
- * @author      Frank Kleine <mikey@stubbles.net>
@@ -14 +14 @@
-require_once dirname(__FILE__) . '/../MockNoTableAnnotationPersistable.php';
-require_once dirname(__FILE__) . '/../MockSinglePrimaryKeyPersistable.php';
-TestN
+MockNoEntityAnnotati
-/**
- * This is a persistable that requires arguments in the constructor.
- *
+ * @Entity
- * @DBTable(name='bar')
- */
-AbstractPersistable
+BaseObject
-{
-    protected $arg1;
@@ -31 +32 @@
-    }
-    
+    /**
+     * returns the first argument
+     *
+     * @return  string
+     * @Transient
+     */
-    public function getArg1()
-    {
-        return $this->arg1;
-    }
-
+
+
+
+
+
+
+
-    public function getArg2()
-    {
@@ -42 +55 @@
-}
-/**
-
+.
- *
- * @package     stubbles
@@ -127 +140 @@
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-
@@ -149 +153 @@
-    public function testByPrimaryKeys()
-    {
-        $singlePrimaryKey = new MockSinglePrimaryKeyPersistable();
-        $singlePrimaryKey->setId('mock');
-        $mockResult = new MockstubDatabaseResult();
-        $this->mockConnection->setReturnValue('query', $mockResult);
-        $mockResult->setReturnValueAt(0, 'fetch', false);
-
-
-
-
-
-
-
+
+
+
+
-        $this->assertEqual($singlePrimaryKey->withAnnotation(), 'Here is bar.');
-        $this->assertEqual($singlePrimaryKey->withDefaultValue(), 'And this is default.');
-        $select = $this->mockQueryBuilder->getSelect();
-        $this->assertEqual($select->getBaseTableName(), 'foo');
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        $mockCriterion = new MockstubCriterion();
@@ -179 +193 @@
-        $mockResult = new MockstubDatabaseResult();
-        $this->mockConnection->setReturnValue('query', $mockResult);
+        $mockResult->setReturnValue('fetch', array());
+        $entity = $this->dbFinder->findByPrimaryKeys(new stubReflectionClass('MockInstanceArgsPersistable'), array(), array('foo', 'bar'));
+        $this->assertEqual($entity->getArg1(), 'foo');
+        $this->assertEqual($entity->getArg2(), 'bar');
+        $entity = $this->dbFinder->findByPrimaryKeys(new stubReflectionClass('MockInstanceArgsPersistable'), array(), array('foo'));
+        $this->assertEqual($entity->getArg1(), 'foo');
+        $this->assertNull($entity->getArg2());
+    }
+
+    /**
+     * test that trying to find a class that does not implement stubPersistable throws an exception
+     */
+    public function testByCriterionNonEntity()
+    {
+        $this->expectException('stubPersistenceException');
+        $this->dbFinder->findByCriterion(new MockstubCriterion(), new stubReflectionClass('MockNoEntityAnnotationPersistable'));
+    }
+
+    /**
+     * test that finding data of an object with a criterion works as expected
+     */
+    public function testByCriterion()
+    {
+        $mockCriterion = new MockstubCriterion();
+        $mockCriterion->setReturnValue('toSQL', 'example');
+        $mockResult = new MockstubDatabaseResult();
+        $this->mockConnection->setReturnValue('query', $mockResult);
-        $mockResult->setReturnValueAt(0, 'fetchAll', false);
-        $mockResult->setReturnValueAt(1, 'fetchAll', array(array('bar' => 'Here is bar.', 'default' => 'And this is default.')));
-'MockSinglePrimaryKeyPersistable'
+new stubReflectionClass('MockSinglePrimaryKeyPersistable')
-        $this->assertEqual($finderResult->count(), 0);
-'MockSinglePrimaryKeyPersistable'
+new stubReflectionClass('MockSinglePrimaryKeyPersistable')
-        $this->assertEqual($finderResult->count(), 1);
-        $data = $finderResult->current();
-        $this->assertTrue($data->isPersistent());
-        $this->assertEqual($data->withAnnotation(), 'Here is bar.');
-        $this->assertEqual($data->withDefaultValue(), 'And this is default.');
-        $select = $this->mockQueryBuilder->getSelect();
-        $this->assertEqual($select->getBaseTableName(), 'foo');
-        $this->assertTrue($select->hasJoins());
-        $this->assertEqual(array_keys($select->getJoins()), array('blub'));
-        $this->assertEqual($select->getCriterion()->toSQL(), "(example)");
-    }
-
-    /**
-     * test that trying to find a class that does not implement stubPersistable throws an exception
-     */
-    public function testByCriterionNonPersistableClass()
-    {
-        $this->expectException('stubDatabaseFinderException');
-        $this->dbFinder->findByCriterion(new MockstubCriterion(), 'TestNonPersistable');
-    }
-
@@ -215 +243 @@
-        $this->mockConnection->setReturnValue('query', $mockResult);
-        $mockResult->setReturnValue('fetchAll', array(array()));
-'MockInstanceArgsPersistable'
+new stubReflectionClass('MockInstanceArgsPersistable')
-        $data = $finderResult->current();
-        $this->assertEqual($data->getArg1(), 'foo');
-        $this->assertEqual($data->getArg2(), 'bar');
-'MockInstanceArgsPersistable'
+new stubReflectionClass('MockInstanceArgsPersistable')
-        $data = $finderResult->current();
-        $this->assertEqual($data->getArg1(), 'foo');