Revert "[DoctrineMongoDBBundle] updated tests to reflect extension changes"

This reverts commit 8c3923e5f59fda3221776c6fc747ca9bd603f9af.

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php

@@ -70,9 +70,8 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
         $arguments = $definition->getArguments();
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
         $this->assertEquals('doctrine.odm.mongodb.default_connection', (string) $arguments[0]);
-        $this->assertEquals('default', $arguments[1]);
-        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[2]);
-        $this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[2]);
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
+        $this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[1]);
     }
 
     public function testSingleDocumentManagerConfiguration()
@@ -82,8 +81,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
 
         $config = array(
             'server' => 'mongodb://localhost:27017',
-            'options' => array('connect' => true),
-            'default_database' => 'test'
+            'options' => array('connect' => true)
         );
         $loader->load(array($config), $container);
 
@@ -100,9 +98,8 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
         $arguments = $definition->getArguments();
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
         $this->assertEquals('doctrine.odm.mongodb.default_connection', (string) $arguments[0]);
-        $this->assertEquals('test', $arguments[1]);
-        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[2]);
-        $this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[2]);
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
+        $this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[1]);
     }
 
     public function testLoadSimpleSingleConnection()
@@ -136,9 +133,8 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
         $arguments = $definition->getArguments();
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
         $this->assertEquals('doctrine.odm.mongodb.default_connection', (string) $arguments[0]);
-        $this->assertEquals('mydb', $arguments[1]);
-        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[2]);
-        $this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[2]);
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
+        $this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[1]);
     }
 
     public function testLoadSingleConnection()
@@ -166,9 +162,8 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
         $arguments = $definition->getArguments();
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
         $this->assertEquals('doctrine.odm.mongodb.default_connection', (string) $arguments[0]);
-        $this->assertEquals('default', $arguments[1]);
-        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[2]);
-        $this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[2]);
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
+        $this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[1]);
     }
 
     public function testLoadMultipleConnections()
@@ -198,9 +193,8 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
         $arguments = $definition->getArguments();
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
         $this->assertEquals('doctrine.odm.mongodb.conn1_connection', (string) $arguments[0]);
-        $this->assertEquals('default', $arguments[1]);
-        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[2]);
-        $this->assertEquals('doctrine.odm.mongodb.dm1_configuration', (string) $arguments[2]);
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
+        $this->assertEquals('doctrine.odm.mongodb.dm1_configuration', (string) $arguments[1]);
 
         $definition = $container->getDefinition('doctrine.odm.mongodb.conn2_connection');
         $this->assertEquals('%doctrine.odm.mongodb.connection_class%', $definition->getClass());
@@ -215,9 +209,8 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
         $arguments = $definition->getArguments();
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
         $this->assertEquals('doctrine.odm.mongodb.conn2_connection', (string) $arguments[0]);
-        $this->assertEquals('prod2', $arguments[1]);
-        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[2]);
-        $this->assertEquals('doctrine.odm.mongodb.dm2_configuration', (string) $arguments[2]);
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
+        $this->assertEquals('doctrine.odm.mongodb.dm2_configuration', (string) $arguments[1]);
     }
 
     public function testBundleDocumentAliases()

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_multiple_connections.xml

@@ -27,9 +27,7 @@
         </doctrine:connections>
         <doctrine:document-managers>
             <doctrine:document-manager id="dm1" metadata-cache-driver="xcache" connection="conn1" />
-            <doctrine:document-manager id="dm2" connection="conn2">
-                <database>prod2</database>
-            </doctrine:document-manager>
+            <doctrine:document-manager id="dm2" connection="conn2" />
         </doctrine:document-managers>
     </doctrine:mongodb>
 </container>

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/yml/mongodb_service_multiple_connections.yml

@@ -17,4 +17,3 @@ doctrine_mongo_db:
       metadata_cache_driver: xcache
     dm2:
       connection: conn2
-      database:   prod2

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/TestCase.php

@@ -37,6 +37,6 @@ class TestCase extends \PHPUnit_Framework_TestCase
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver($paths));
         $config->setMetadataCacheImpl(new \Doctrine\Common\Cache\ArrayCache());
 
-        return DocumentManager::create(new Connection(), 'test', $config);
+        return DocumentManager::create(new Connection(), $config);
     }
 }