Skip to content

Commit

Permalink
Updated the tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@stof
stof committed Mar 9, 2011
1 parent 0d0f053 commit a9a300e
Show file tree
Hide file tree
Showing 9 changed files with 100 additions and 126 deletions.
50 changes: 22 additions & 28 deletions ...Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
View file
Expand Up @@ -39,19 +39,14 @@ public function testDbalLoad()
{
$container = $this->getContainer();
$loader = new DoctrineExtension();
$loader->load(array(array('dbal' => array('password' => 'foo'))), $container);

$loader->load(array(array(), array('dbal' => array('default_connection' => 'foo')), array()), $container);
$loader->load(array(array('dbal' => array('password' => 'foo')), array(), array('dbal' => array('default_connection' => 'foo')), array()), $container);

$arguments = $container->getDefinition('doctrine.dbal.default_connection')->getArguments();
$config = $arguments[0];

$this->assertEquals('foo', $config['password']);
$this->assertEquals('root', $config['user']);

$loader->load(array(array('dbal' => array('user' => 'foo'))), $container);
$this->assertEquals('foo', $config['password']);
$this->assertEquals('root', $config['user']);
}

public function testDbalLoadFromXmlMultipleConnections()
Expand Down Expand Up @@ -117,8 +112,7 @@ public function testDependencyInjectionConfigurationDefaults()
$container = $this->getContainer();
$loader = new DoctrineExtension();

$loader->load(array(array('dbal' => array())), $container);
$loader->load(array(array('orm' => array('mappings' => array('YamlBundle' => array())))), $container);
$loader->load(array(array('dbal' => array(), 'orm' => array('mappings' => array('YamlBundle' => array())))), $container);

$this->assertFalse($container->getParameter('doctrine.orm.auto_generate_proxy_classes'));
$this->assertEquals('Doctrine\ORM\Configuration', $container->getParameter('doctrine.orm.configuration_class'));
Expand All @@ -143,8 +137,8 @@ public function testDependencyInjectionConfigurationDefaults()
'mappings' => array('YamlBundle' => array()),
);

$loader->load(array(array('dbal' => array())), $container);
$loader->load(array('orm' => $config), $container);
$container = $this->getContainer();
$loader->load(array(array('dbal' => array(), 'orm' => $config)), $container);

$definition = $container->getDefinition('doctrine.dbal.default_connection');
$this->assertEquals('Doctrine\DBAL\Connection', $definition->getClass());
Expand Down Expand Up @@ -192,8 +186,7 @@ public function testSingleEntityManagerConfiguration()
$container = $this->getContainer();
$loader = new DoctrineExtension();

$loader->load(array(array('dbal' => array())), $container);
$loader->load(array(array('orm' => array())), $container);
$loader->load(array(array('dbal' => array(), 'orm' => array())), $container);

$definition = $container->getDefinition('doctrine.dbal.default_connection');
$this->assertEquals('Doctrine\DBAL\Connection', $definition->getClass());
Expand All @@ -215,8 +208,7 @@ public function testLoadSimpleSingleConnection()
$loader = new DoctrineExtension();
$container->registerExtension($loader);

$loader->load(array(array('dbal' => array())), $container);
$loader->load(array(array('orm' => array())), $container);
$loader->load(array(array('dbal' => array(), 'orm' => array())), $container);

$this->loadFromFile($container, 'orm_service_simple_single_entity_manager');

Expand All @@ -235,6 +227,7 @@ public function testLoadSimpleSingleConnection()
'user' => 'root',
'password' => null,
'port' => null,
'logging' => false,
),
new Reference('doctrine.dbal.default_connection.configuration'),
new Reference('doctrine.dbal.default_connection.event_manager')
Expand Down Expand Up @@ -365,7 +358,6 @@ public function testBundleEntityAliases()
$container = $this->getContainer();
$loader = new DoctrineExtension();

$loader->load(array(array()), $container);
$loader->load(array(array('orm' => array('mappings' => array('YamlBundle' => array())))), $container);

$definition = $container->getDefinition('doctrine.orm.default_configuration');
Expand All @@ -379,7 +371,6 @@ public function testOverwriteEntityAliases()
$container = $this->getContainer();
$loader = new DoctrineExtension();

$loader->load(array(array()), $container);
$loader->load(array(array('orm' => array('mappings' => array('YamlBundle' => array('alias' => 'yml'))))), $container);

$definition = $container->getDefinition('doctrine.orm.default_configuration');
Expand All @@ -393,7 +384,6 @@ public function testYamlBundleMappingDetection()
$container = $this->getContainer('YamlBundle');
$loader = new DoctrineExtension();

$loader->load(array(array()), $container);
$loader->load(array(array('orm' => array('mappings' => array('YamlBundle' => array())))), $container);

$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
Expand All @@ -408,7 +398,6 @@ public function testXmlBundleMappingDetection()
$container = $this->getContainer('XmlBundle');
$loader = new DoctrineExtension();

$loader->load(array(array()), $container);
$loader->load(array(array('orm' => array('mappings' => array('XmlBundle' => array())))), $container);

$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
Expand All @@ -423,7 +412,6 @@ public function testAnnotationsBundleMappingDetection()
$container = $this->getContainer('AnnotationsBundle');
$loader = new DoctrineExtension();

$loader->load(array(array()), $container);
$loader->load(array(array('orm' => array('mappings' => array('AnnotationsBundle' => array())))), $container);

$definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
Expand All @@ -438,7 +426,6 @@ public function testOrmMergeConfigs()
$container = $this->getContainer(array('XmlBundle', 'AnnotationsBundle'));
$loader = new DoctrineExtension();

$loader->load(array(array()), $container);
$loader->load(array(array('orm' => array(
'auto_generate_proxy_classes' => true,
'mappings' => array('AnnotationsBundle' => array())
Expand All @@ -459,7 +446,15 @@ public function testOrmMergeConfigs()
));

$configDef = $container->getDefinition('doctrine.orm.default_configuration');
$this->assertDICDefinitionMethodCallOnce($configDef, 'setAutoGenerateProxyClasses', array( false ));
$this->assertDICDefinitionMethodCallOnce($configDef, 'setAutoGenerateProxyClasses');

$calls = $configDef->getMethodCalls();
foreach ($calls as $call) {
if ($call[0] == 'setAutoGenerateProxyClasses') {
$this->assertFalse($container->getParameterBag()->resolveValue($call[1][0]));
break;
}
}
}

public function testEntityManagerMetadataCacheDriverConfiguration()
Expand Down Expand Up @@ -557,17 +552,17 @@ public function testSingleEntityManagerMultipleMappingBundleDefinitions()
$annDef = $container->getDefinition('doctrine.orm.default_annotation_metadata_driver');
$this->assertDICConstructorArguments($annDef, array(
new Reference('doctrine.orm.metadata.annotation_reader'),
array(__DIR__ . '/Fixtures/Bundles/AnnotationsBundle/Entity')
array(__DIR__ .DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'Bundles'.DIRECTORY_SEPARATOR.'AnnotationsBundle'.DIRECTORY_SEPARATOR.'Entity')
));

$ymlDef = $container->getDefinition('doctrine.orm.default_yml_metadata_driver');
$this->assertDICConstructorArguments($ymlDef, array(
array(__DIR__ . '/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata')
array(__DIR__ .DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'Bundles'.DIRECTORY_SEPARATOR.'YamlBundle'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'doctrine'.DIRECTORY_SEPARATOR.'metadata')
));

$xmlDef = $container->getDefinition('doctrine.orm.default_xml_metadata_driver');
$this->assertDICConstructorArguments($xmlDef, array(
array(__DIR__ . '/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata')
array(__DIR__ .DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'Bundles'.DIRECTORY_SEPARATOR.'XmlBundle'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'doctrine'.DIRECTORY_SEPARATOR.'metadata')
));
}

Expand Down Expand Up @@ -606,17 +601,17 @@ public function testMultipleEntityManagersMappingBundleDefinitions()
$annDef = $container->getDefinition('doctrine.orm.em1_annotation_metadata_driver');
$this->assertDICConstructorArguments($annDef, array(
new Reference('doctrine.orm.metadata.annotation_reader'),
array(__DIR__ . '/Fixtures/Bundles/AnnotationsBundle/Entity')
array(__DIR__ .DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'Bundles'.DIRECTORY_SEPARATOR.'AnnotationsBundle'.DIRECTORY_SEPARATOR.'Entity')
));

$ymlDef = $container->getDefinition('doctrine.orm.em2_yml_metadata_driver');
$this->assertDICConstructorArguments($ymlDef, array(
array(__DIR__ . '/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata')
array(__DIR__ .DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'Bundles'.DIRECTORY_SEPARATOR.'YamlBundle'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'doctrine'.DIRECTORY_SEPARATOR.'metadata')
));

$xmlDef = $container->getDefinition('doctrine.orm.em2_xml_metadata_driver');
$this->assertDICConstructorArguments($xmlDef, array(
array(__DIR__ . '/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata')
array(__DIR__ .DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'Bundles'.DIRECTORY_SEPARATOR.'XmlBundle'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'doctrine'.DIRECTORY_SEPARATOR.'metadata')
));
}

Expand All @@ -625,7 +620,6 @@ public function testAnnotationsBundleMappingDetectionWithVendorNamespace()
$container = $this->getContainer('AnnotationsBundle', 'Vendor');
$loader = new DoctrineExtension();

$loader->load(array(array()), $container);
$loader->load(array(array('orm' => array('mappings' => array('AnnotationsBundle' => array())))), $container);

$calls = $container->getDefinition('doctrine.orm.default_metadata_driver')->getMethodCalls();
Expand Down
42 changes: 20 additions & 22 deletions ...undle/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_multiple_connections.xml
View file
Expand Up @@ -8,28 +8,26 @@

<config>
<dbal>
<connections>
<connection
name="mysql"
dbname="mysql_db"
user="mysql_user"
password="mysql_s3cr3t"
unix-socket="/path/to/mysqld.sock" /><!-- -->
<connection
name="sqlite"
driver="pdo_sqlite"
dbname="sqlite_db"
user="sqlite_user"
password="sqlite_s3cr3t"
memory="true" />
<connection
name="oci"
driver="oci8"
dbname="oracle_db"
user="oracle_user"
password="oracle_s3cr3t"
charset="utf8" />
</connections>
<connection
name="mysql"
dbname="mysql_db"
user="mysql_user"
password="mysql_s3cr3t"
unix-socket="/path/to/mysqld.sock" /><!-- -->
<connection
name="sqlite"
driver="pdo_sqlite"
dbname="sqlite_db"
user="sqlite_user"
password="sqlite_s3cr3t"
memory="true" />
<connection
name="oci"
driver="oci8"
dbname="oracle_db"
user="oracle_user"
password="oracle_s3cr3t"
charset="utf8" />
</dbal>
</config>
</srv:container>
14 changes: 6 additions & 8 deletions ...neBundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_connection.xml
View file
Expand Up @@ -8,14 +8,12 @@

<config>
<dbal>
<connections>
<connection
name="mysql"
dbname="mysql_db"
user="mysql_user"
password="mysql_s3cr3t"
unix-socket="/path/to/mysqld.sock" /><!-- -->
</connections>
<connection
name="mysql"
dbname="mysql_db"
user="mysql_user"
password="mysql_s3cr3t"
unix-socket="/path/to/mysqld.sock" /><!-- -->
</dbal>
</config>
</srv:container>
4 changes: 1 addition & 3 deletions ...ymfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_types.xml
View file
Expand Up @@ -8,9 +8,7 @@

<config>
<dbal>
<types>
<type name="test" class="Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestType" />
</types>
<type name="test" class="Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestType" />
</dbal>
</config>
</srv:container>
28 changes: 11 additions & 17 deletions ...eBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_multiple_em_bundle_mappings.xml
View file
Expand Up @@ -7,23 +7,17 @@
http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">

<config>
<orm>
<entity-managers>
<entity-manager name="em1">
<mappings>
<mapping name="AnnotationsBundle" />
</mappings>
</entity-manager>
<entity-manager name="em2">
<mappings>
<mapping name="YamlBundle" dir="Resources/config/doctrine/metadata" alias="yml" />
<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"
alias="TestAlias"
/>
</mappings>
</entity-manager>
</entity-managers>
<orm default-entity-manager="dm2" default-connection="conn1">
<entity-manager name="em1">
<mapping name="AnnotationsBundle" />
</entity-manager>
<entity-manager name="em2">
<mapping name="YamlBundle" dir="Resources/config/doctrine/metadata" alias="yml" />
<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"
alias="TestAlias"
/>
</entity-manager>
</orm>
</config>
</srv:container>
38 changes: 17 additions & 21 deletions ...le/Tests/DependencyInjection/Fixtures/config/xml/orm_service_multiple_entity_managers.xml
View file
Expand Up @@ -11,30 +11,26 @@
</srv:parameters>

<config>
<dbal>
<connections>
<connection
name="conn1"
driver="pdo_sqlite"
dbname="sqlite_db"
user="sqlite_user"
password="sqlite_s3cr3t"
memory="true" />
<connection
name="conn2"
driver="pdo_sqlite"
dbname="sqlite_db"
user="sqlite_user"
password="sqlite_s3cr3t"
memory="true" />
</connections>
<dbal default-connection="conn1">
<connection
name="conn1"
driver="pdo_sqlite"
dbname="sqlite_db"
user="sqlite_user"
password="sqlite_s3cr3t"
memory="true" />
<connection
name="conn2"
driver="pdo_sqlite"
dbname="sqlite_db"
user="sqlite_user"
password="sqlite_s3cr3t"
memory="true" />
</dbal>

<orm default-entity-manager="dm2" default-connection="conn1" auto-generate-proxy-classes="true">
<entity-managers>
<entity-manager name="dm1" metadata-cache-driver="xcache" connection="conn1" />
<entity-manager name="dm2" connection="conn2" metadata-cache-driver="apc" />
</entity-managers>
<entity-manager name="dm1" metadata-cache-driver="xcache" connection="conn1" />
<entity-manager name="dm2" connection="conn2" metadata-cache-driver="apc" />
</orm>
</config>
</srv:container>
34 changes: 15 additions & 19 deletions ...undle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_single_entity_manager.xml
View file
Expand Up @@ -12,15 +12,13 @@

<config>
<dbal>
<connections>
<connection
name="default"
driver="pdo_sqlite"
dbname="sqlite_db"
user="sqlite_user"
password="sqlite_s3cr3t"
memory="true" />
</connections>
<connection
name="default"
driver="pdo_sqlite"
dbname="sqlite_db"
user="sqlite_user"
password="sqlite_s3cr3t"
memory="true" />
</dbal>

<orm
Expand All @@ -29,16 +27,14 @@
default-connection="conn1"
auto-generate-proxy-classes="true"
>
<entity-managers>
<entity-manager name="default" connection="default">
<metadata-cache-driver type="memcache">
<class>Doctrine\Common\Cache\MemcacheCache</class>
<host>localhost</host>
<port>11211</port>
<instance-class>Memcache</instance-class>
</metadata-cache-driver>
</entity-manager>
</entity-managers>
<entity-manager name="default" connection="default">
<metadata-cache-driver type="memcache">
<class>Doctrine\Common\Cache\MemcacheCache</class>
<host>localhost</host>
<port>11211</port>
<instance-class>Memcache</instance-class>
</metadata-cache-driver>
</entity-manager>
</orm>
</config>
</srv:container>

0 comments on commit a9a300e

Please sign in to comment.