RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-31 12:32:59 +03:00
Code Issues Projects Releases Wiki Activity

Fix failing test due to EntityGenerator assuming beginning with 2.2 the AnnotationReader is always used. There is still the simple reader though.

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-10-15 20:41:07 +02:00
parent 75e1d17d18
commit 7b71b3284d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -304,9 +304,6 @@ public function <methodName>()
*/ */
public function setAnnotationPrefix($prefix) public function setAnnotationPrefix($prefix)
{ {
if (version_compare(\Doctrine\Common\Version::VERSION, '2.2.0-DEV', '>=')) {
return;
}
$this->_annotationsPrefix = $prefix; $this->_annotationsPrefix = $prefix;
} }

8
tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
View File

@ -98,6 +98,8 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
public function testExportDirectoryAndFilesAreCreated() public function testExportDirectoryAndFilesAreCreated()
{ {
$this->_deleteDirectory(__DIR__ . '/export/'.$this->_getType());
$type = $this->_getType(); $type = $this->_getType();
$metadataDriver = $this->_createMetadataDriver($type, __DIR__ . '/' . $type); $metadataDriver = $this->_createMetadataDriver($type, __DIR__ . '/' . $type);
$em = $this->_createEntityManager($metadataDriver); $em = $this->_createEntityManager($metadataDriver);
@ -113,6 +115,7 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
$exporter = $cme->getExporter($type, __DIR__ . '/export/' . $type); $exporter = $cme->getExporter($type, __DIR__ . '/export/' . $type);
if ($type === 'annotation') { if ($type === 'annotation') {
$entityGenerator = new EntityGenerator(); $entityGenerator = new EntityGenerator();
$entityGenerator->setAnnotationPrefix("");
$exporter->setEntityGenerator($entityGenerator); $exporter->setEntityGenerator($entityGenerator);
} }
$this->_extension = $exporter->getExtension(); $this->_extension = $exporter->getExtension();
@ -139,6 +142,8 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
$cmf = $this->_createClassMetadataFactory($em, $type); $cmf = $this->_createClassMetadataFactory($em, $type);
$metadata = $cmf->getAllMetadata(); $metadata = $cmf->getAllMetadata();
$this->assertEquals(1, count($metadata));
$class = current($metadata); $class = current($metadata);
$this->assertEquals('Doctrine\Tests\ORM\Tools\Export\ExportedUser', $class->name); $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\ExportedUser', $class->name);
@ -322,8 +327,7 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
public function __destruct() public function __destruct()
{ {
$type = $this->_getType(); # $this->_deleteDirectory(__DIR__ . '/export/'.$this->_getType());
$this->_deleteDirectory(__DIR__ . '/export/'.$this->_getType());
} }
protected function _deleteDirectory($path) protected function _deleteDirectory($path)