diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DoctrineBundle] updated tests with shorter bundle names

Browse Source
This commit is contained in:
Kris Wallsmith 2011-03-28 11:06:07 -07:00
parent d44c184d57
commit 082fd73b3c
16 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
View File

@ -112,7 +112,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer(); $container = $this->getContainer();
$loader = new DoctrineExtension(); $loader = new DoctrineExtension();
$loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container); $loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Yaml' => array())))))), $container);
$this->assertFalse($container->getParameter('doctrine.orm.auto_generate_proxy_classes')); $this->assertFalse($container->getParameter('doctrine.orm.auto_generate_proxy_classes'));
$this->assertEquals('Doctrine\ORM\Configuration', $container->getParameter('doctrine.orm.configuration_class')); $this->assertEquals('Doctrine\ORM\Configuration', $container->getParameter('doctrine.orm.configuration_class'));
@ -137,7 +137,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
'default_entity_manager' => 'default', 'default_entity_manager' => 'default',
'entity_managers' => array( 'entity_managers' => array(
'default' => array( 'default' => array(
'mappings' => array('YamlBundle' => array()), 'mappings' => array('Yaml' => array()),
) )
) )
); );
@ -171,7 +171,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$definition = $container->getDefinition('doctrine.orm.default_configuration'); $definition = $container->getDefinition('doctrine.orm.default_configuration');
$calls = array_values($definition->getMethodCalls()); $calls = array_values($definition->getMethodCalls());
$this->assertEquals(array('YamlBundle' => 'Fixtures\Bundles\YamlBundle\Entity'), $calls[0][1][0]); $this->assertEquals(array('Yaml' => 'Fixtures\Bundles\YamlBundle\Entity'), $calls[0][1][0]);
$this->assertEquals('doctrine.orm.default_metadata_cache', (string) $calls[1][1][0]); $this->assertEquals('doctrine.orm.default_metadata_cache', (string) $calls[1][1][0]);
$this->assertEquals('doctrine.orm.default_query_cache', (string) $calls[2][1][0]); $this->assertEquals('doctrine.orm.default_query_cache', (string) $calls[2][1][0]);
$this->assertEquals('doctrine.orm.default_result_cache', (string) $calls[3][1][0]); $this->assertEquals('doctrine.orm.default_result_cache', (string) $calls[3][1][0]);
@ -191,7 +191,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer(); $container = $this->getContainer();
$loader = new DoctrineExtension(); $loader = new DoctrineExtension();
$loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container); $loader->load(array(array('dbal' => null, 'orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Yaml' => array())))))), $container);
$definition = $container->getDefinition('doctrine.dbal.default_connection'); $definition = $container->getDefinition('doctrine.dbal.default_connection');
$this->assertEquals('Doctrine\DBAL\Connection', $definition->getClass()); $this->assertEquals('Doctrine\DBAL\Connection', $definition->getClass());
@ -362,11 +362,11 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer(); $container = $this->getContainer();
$loader = new DoctrineExtension(); $loader = new DoctrineExtension();
$loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container); $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Yaml' => array())))))), $container);
$definition = $container->getDefinition('doctrine.orm.default_configuration'); $definition = $container->getDefinition('doctrine.orm.default_configuration');
$this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces', $this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces',
array(array('YamlBundle' => 'Fixtures\Bundles\YamlBundle\Entity')) array(array('Yaml' => 'Fixtures\Bundles\YamlBundle\Entity'))
); );
} }
@ -375,7 +375,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer(); $container = $this->getContainer();
$loader = new DoctrineExtension(); $loader = new DoctrineExtension();
$loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array('alias' => 'yml'))))))), $container); $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Yaml' => array('alias' => 'yml'))))))), $container);
$definition = $container->getDefinition('doctrine.orm.default_configuration'); $definition = $container->getDefinition('doctrine.orm.default_configuration');
$this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces', $this->assertDICDefinitionMethodCallOnce($definition, 'setEntityNamespaces',
@ -388,7 +388,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer('YamlBundle'); $container = $this->getContainer('YamlBundle');
$loader = new DoctrineExtension(); $loader = new DoctrineExtension();
$loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('YamlBundle' => array())))))), $container); $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Yaml' => array())))))), $container);
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver'); $definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
$this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array( $this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
@ -402,7 +402,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer('XmlBundle'); $container = $this->getContainer('XmlBundle');
$loader = new DoctrineExtension(); $loader = new DoctrineExtension();
$loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('XmlBundle' => array())))))), $container); $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Xml' => array())))))), $container);
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver'); $definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
$this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array( $this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
@ -416,7 +416,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer('AnnotationsBundle'); $container = $this->getContainer('AnnotationsBundle');
$loader = new DoctrineExtension(); $loader = new DoctrineExtension();
$loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('AnnotationsBundle' => array())))))), $container); $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Annotations' => array())))))), $container);
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver'); $definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
$this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array( $this->assertDICDefinitionMethodCallOnce($definition, 'addDriver', array(
@ -434,13 +434,13 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
'auto_generate_proxy_classes' => true, 'auto_generate_proxy_classes' => true,
'default_entity_manager' => 'default', 'default_entity_manager' => 'default',
'entity_managers' => array( 'entity_managers' => array(
'default' => array('mappings' => array('AnnotationsBundle' => array())) 'default' => array('mappings' => array('Annotations' => array()))
))), ))),
array('orm' => array( array('orm' => array(
'auto_generate_proxy_classes' => false, 'auto_generate_proxy_classes' => false,
'default_entity_manager' => 'default', 'default_entity_manager' => 'default',
'entity_managers' => array( 'entity_managers' => array(
'default' => array('mappings' => array('XmlBundle' => array())) 'default' => array('mappings' => array('Xml' => array()))
)))), $container); )))), $container);
$definition = $container->getDefinition('doctrine.orm.default_metadata_driver'); $definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
@ -628,7 +628,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$container = $this->getContainer('AnnotationsBundle', 'Vendor'); $container = $this->getContainer('AnnotationsBundle', 'Vendor');
$loader = new DoctrineExtension(); $loader = new DoctrineExtension();
$loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('AnnotationsBundle' => array())))))), $container); $loader->load(array(array('orm' => array('default_entity_manager' => 'default', 'entity_managers' => array('default' => array('mappings' => array('Annotations' => array())))))), $container);
$calls = $container->getDefinition('doctrine.orm.default_metadata_driver')->getMethodCalls(); $calls = $container->getDefinition('doctrine.orm.default_metadata_driver')->getMethodCalls();
$this->assertEquals('doctrine.orm.default_annotation_metadata_driver', (string) $calls[0][1][0]); $this->assertEquals('doctrine.orm.default_annotation_metadata_driver', (string) $calls[0][1][0]);
@ -679,7 +679,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
foreach ($bundles as $bundle) { foreach ($bundles as $bundle) {
require_once __DIR__.'/Fixtures/Bundles/'.($vendor ? $vendor.'/' : '').$bundle.'/'.$bundle.'.php'; require_once __DIR__.'/Fixtures/Bundles/'.($vendor ? $vendor.'/' : '').$bundle.'/'.$bundle.'.php';
$map[$bundle] = 'Fixtures\\Bundles\\'.($vendor ? $vendor.'\\' : '').$bundle.'\\'.$bundle; $map[substr($bundle, 0, -6)] = 'Fixtures\\Bundles\\'.($vendor ? $vendor.'\\' : '').$bundle.'\\'.$bundle;
} }
return new ContainerBuilder(new ParameterBag(array( return new ContainerBuilder(new ParameterBag(array(

2
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_functions.xml
View File

@ -10,7 +10,7 @@
<dbal /> <dbal />
<orm default-entity-manager="default"> <orm default-entity-manager="default">
<entity-manager name="default"> <entity-manager name="default">
<mapping name="YamlBundle" /> <mapping name="Yaml" />
<dql> <dql>
<string-function name="test_string" class="Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestStringFunction" /> <string-function name="test_string" class="Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestStringFunction" />
<numeric-function name="test_numeric" class="Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestNumericFunction" /> <numeric-function name="test_numeric" class="Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestNumericFunction" />

2
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_imports_import.xml
View File

@ -12,7 +12,7 @@
default-entity-manager="default" default-entity-manager="default"
> >
<entity-manager name="default" metadata-cache-driver="apc"> <entity-manager name="default" metadata-cache-driver="apc">
<mapping name="YamlBundle" /> <mapping name="Yaml" />
</entity-manager> </entity-manager>
</orm> </orm>
</config> </config>

4
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_multiple_em_bundle_mappings.xml
View File

@ -9,10 +9,10 @@
<config> <config>
<orm default-entity-manager="em2"> <orm default-entity-manager="em2">
<entity-manager name="em1"> <entity-manager name="em1">
<mapping name="AnnotationsBundle" /> <mapping name="Annotations" />
</entity-manager> </entity-manager>
<entity-manager name="em2"> <entity-manager name="em2">
<mapping name="YamlBundle" dir="Resources/config/doctrine/metadata" alias="yml" /> <mapping name="Yaml" dir="Resources/config/doctrine/metadata" alias="yml" />
<mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle" <mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle"
dir="%kernel.root_dir%/../src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata" dir="%kernel.root_dir%/../src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata"
alias="TestAlias" alias="TestAlias"

4
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_multiple_entity_managers.xml
View File

@ -30,10 +30,10 @@
<orm default-entity-manager="em2" auto-generate-proxy-classes="true"> <orm default-entity-manager="em2" auto-generate-proxy-classes="true">
<entity-manager name="em1" metadata-cache-driver="xcache" connection="conn1"> <entity-manager name="em1" metadata-cache-driver="xcache" connection="conn1">
<mapping name="YamlBundle" /> <mapping name="Yaml" />
</entity-manager> </entity-manager>
<entity-manager name="em2" connection="conn2" metadata-cache-driver="apc"> <entity-manager name="em2" connection="conn2" metadata-cache-driver="apc">
<mapping name="YamlBundle" /> <mapping name="Yaml" />
</entity-manager> </entity-manager>
</orm> </orm>
</config> </config>

2
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml
View File

@ -16,7 +16,7 @@
<port>11211</port> <port>11211</port>
<instance-class>Memcache</instance-class> <instance-class>Memcache</instance-class>
</metadata-cache-driver> </metadata-cache-driver>
<mapping name="YamlBundle" /> <mapping name="Yaml" />
</entity-manager> </entity-manager>
</orm> </orm>
</config> </config>

2
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_single_entity_manager.xml
View File

@ -32,7 +32,7 @@
<port>11211</port> <port>11211</port>
<instance-class>Memcache</instance-class> <instance-class>Memcache</instance-class>
</metadata-cache-driver> </metadata-cache-driver>
<mapping name="YamlBundle" /> <mapping name="Yaml" />
</entity-manager> </entity-manager>
</orm> </orm>
</config> </config>

4
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml
View File

@ -9,8 +9,8 @@
<config> <config>
<orm default-entity-manager="default"> <orm default-entity-manager="default">
<entity-manager name="default"> <entity-manager name="default">
<mapping name="AnnotationsBundle" /> <mapping name="Annotations" />
<mapping name="YamlBundle" dir="Resources/config/doctrine/metadata" alias="yml" /> <mapping name="Yaml" dir="Resources/config/doctrine/metadata" alias="yml" />
<mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle" <mapping name="manual" type="xml" prefix="Fixtures\Bundles\XmlBundle"
dir="%kernel.root_dir%/../src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata" dir="%kernel.root_dir%/../src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata"
alias="TestAlias" alias="TestAlias"

2
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_functions.yml
View File

@ -4,7 +4,7 @@ doctrine:
entity_managers: entity_managers:
default: default:
mappings: mappings:
YamlBundle: ~ Yaml: ~
dql: dql:
string_functions: string_functions:
test_string: Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestStringFunction test_string: Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestStringFunction

2
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_imports_import.yml
View File

@ -6,4 +6,4 @@ doctrine:
default: default:
metadata_cache_driver: apc metadata_cache_driver: apc
mappings: mappings:
YamlBundle: ~ Yaml: ~

4
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_multiple_em_bundle_mappings.yml
View File

@ -4,10 +4,10 @@ doctrine:
entity_managers: entity_managers:
em1: em1:
mappings: mappings:
AnnotationsBundle: ~ Annotations: ~
em2: em2:
mappings: mappings:
YamlBundle: Yaml:
dir: Resources/config/doctrine/metadata dir: Resources/config/doctrine/metadata
alias: yml alias: yml
manual: manual:

4
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_multiple_entity_managers.yml
View File

@ -26,9 +26,9 @@ doctrine:
metadata_cache_driver: xcache metadata_cache_driver: xcache
connection: conn1 connection: conn1
mappings: mappings:
YamlBundle: ~ Yaml: ~
em2: em2:
metadata_cache_driver: apc metadata_cache_driver: apc
connection: conn2 connection: conn2
mappings: mappings:
YamlBundle: ~ Yaml: ~

2
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_simple_single_entity_manager.yml
View File

@ -5,7 +5,7 @@ doctrine:
entity_managers: entity_managers:
default: default:
mappings: mappings:
YamlBundle: ~ Yaml: ~
metadata_cache_driver: metadata_cache_driver:
type: memcache type: memcache
class: Doctrine\Common\Cache\MemcacheCache class: Doctrine\Common\Cache\MemcacheCache

2
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_single_entity_manager.yml
View File

@ -17,7 +17,7 @@ doctrine:
default: default:
connection: default connection: default
mappings: mappings:
YamlBundle: ~ Yaml: ~
metadata_cache_driver: metadata_cache_driver:
type: memcache type: memcache
class: Doctrine\Common\Cache\MemcacheCache class: Doctrine\Common\Cache\MemcacheCache

4
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/yml/orm_single_em_bundle_mappings.yml
View File

@ -4,8 +4,8 @@ doctrine:
entity_managers: entity_managers:
default: default:
mappings: mappings:
AnnotationsBundle: ~ Annotations: ~
YamlBundle: Yaml:
dir: Resources/config/doctrine/metadata dir: Resources/config/doctrine/metadata
alias: yml alias: yml
manual: manual:

4
src/Symfony/Bundle/DoctrineBundle/Tests/TestCase.php
View File

@ -51,7 +51,7 @@ class TestCase extends \PHPUnit_Framework_TestCase
{ {
$container = new ContainerBuilder(new ParameterBag(array( $container = new ContainerBuilder(new ParameterBag(array(
'kernel.debug' => false, 'kernel.debug' => false,
'kernel.bundles' => array('YamlBundle' => 'Fixtures\Bundles\YamlBundle\YamlBundle'), 'kernel.bundles' => array('Yaml' => 'Fixtures\Bundles\YamlBundle\YamlBundle'),
'kernel.cache_dir' => sys_get_temp_dir(), 'kernel.cache_dir' => sys_get_temp_dir(),
'kernel.root_dir' => __DIR__ . "/../../../../" // src dir 'kernel.root_dir' => __DIR__ . "/../../../../" // src dir
))); )));
@ -74,7 +74,7 @@ class TestCase extends \PHPUnit_Framework_TestCase
'default_entity_manager' => 'default', 'default_entity_manager' => 'default',
'entity_managers' => array ( 'entity_managers' => array (
'default' => array( 'default' => array(
'mappings' => array('YamlBundle' => array( 'mappings' => array('Yaml' => array(
'type' => 'yml', 'type' => 'yml',
'dir' => __DIR__ . "/DependencyInjection/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata/orm", 'dir' => __DIR__ . "/DependencyInjection/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata/orm",
'prefix' => 'Fixtures\Bundles\YamlBundle', 'prefix' => 'Fixtures\Bundles\YamlBundle',