#881 DDC-2825 - refactoring test logic, removing dead private method

doctrine · Jan 14, 2015 · 962f479 · 962f479
1 parent 80ce601
commit 962f479
Showing 1 changed file with 24 additions and 38 deletions.
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php
@@ -30,12 +30,32 @@ protected function setup()
      * @dataProvider getTestedClasses
      *
      * @param string $className
-     * @param string $schema
-     * @param string $table
+     * @param string $expectedSchemaName
+     * @param string $expectedTableName
      */
-    public function testClassSchemaMappingsValidity($className, $schema, $table)
+    public function testClassSchemaMappingsValidity($className, $expectedSchemaName, $expectedTableName)
     {
-        $this->checkClassMetadata($className, $schema, $table);
+        $classMetadata   = $this->_em->getClassMetadata($className);
+        $platform        = $this->_em->getConnection()->getDatabasePlatform();
+        $quotedTableName = $this->_em->getConfiguration()->getQuoteStrategy()->getTableName($classMetadata, $platform);
+
+        // Check if table name and schema properties are defined in the class metadata
+        $this->assertEquals($expectedTableName, $classMetadata->table['name']);
+        $this->assertEquals($expectedSchemaName, $classMetadata->table['schema']);
+
+        if ($this->_em->getConnection()->getDatabasePlatform()->supportsSchemas()) {
+            $fullTableName = sprintf('%s.%s', $expectedSchemaName, $expectedTableName);
+        } else {
+            $fullTableName = sprintf('%s__%s', $expectedSchemaName, $expectedTableName);
+        }
+
+        $this->assertEquals($fullTableName, $quotedTableName);
+
+        // Checks sequence name validity
+        $this->assertEquals(
+            $fullTableName . '_' . $classMetadata->getSingleIdentifierColumnName() . '_seq',
+            $classMetadata->getSequenceName($platform)
+        );
     }
 
     /**
@@ -71,40 +91,6 @@ public function getTestedClasses()
             array(DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName::CLASSNAME, 'myschema', 'order'),
         );
     }
-
-    /**
-     * Checks that class metadata is correctly stored when a database schema is used and
-     * checks that the table name is correctly converted whether the platform supports database
-     * schemas or not
-     *
-     * @param  string $className Class metadata
-     * @param  string $expectedSchemaName   Expected schema name
-     * @param  string $expectedTableName    Expected table name
-     */
-    private function checkClassMetadata($className, $expectedSchemaName, $expectedTableName)
-    {
-        $classMetadata   = $this->_em->getClassMetadata($className);
-        $platform        = $this->_em->getConnection()->getDatabasePlatform();
-        $quotedTableName = $this->_em->getConfiguration()->getQuoteStrategy()->getTableName($classMetadata, $platform);
-
-        // Check if table name and schema properties are defined in the class metadata
-        $this->assertEquals($expectedTableName, $classMetadata->table['name']);
-        $this->assertEquals($expectedSchemaName, $classMetadata->table['schema']);
-
-        if ($this->_em->getConnection()->getDatabasePlatform()->supportsSchemas()) {
-            $fullTableName = sprintf('%s.%s', $expectedSchemaName, $expectedTableName);
-        } else {
-            $fullTableName = sprintf('%s__%s', $expectedSchemaName, $expectedTableName);
-        }
-
-        $this->assertEquals($fullTableName, $quotedTableName);
-
-        // Checks sequence name validity
-        $this->assertEquals(
-            $fullTableName . '_' . $classMetadata->getSingleIdentifierColumnName() . '_seq',
-            $classMetadata->getSequenceName($platform)
-        );
-    }
 }
 
 /**