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

#1252 DDC-3496 - minor test cleanups (avoiding private static method)

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-18 00:03:49 +01:00
parent 60523d1b62
commit 29007e7d79
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
View File

@ -20,14 +20,6 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
return new DefaultNamingStrategy(); return new DefaultNamingStrategy();
} }
/**
* @return JoinColumnClassNamingStrategy
*/
static private function joinColumnClassNaming()
{
return new JoinColumnClassNamingStrategy();
}
/** /**
* @return UnderscoreNamingStrategy * @return UnderscoreNamingStrategy
*/ */
@ -171,28 +163,15 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
{ {
return array( return array(
// DefaultNamingStrategy // DefaultNamingStrategy
array(self::defaultNaming(), 'someColumn_id', array(self::defaultNaming(), 'someColumn_id', 'someColumn', null),
'someColumn', null, array(self::defaultNaming(), 'some_column_id', 'some_column', null),
),
array(self::defaultNaming(), 'some_column_id',
'some_column', null,
),
// UnderscoreNamingStrategy // UnderscoreNamingStrategy
array(self::underscoreNamingLower(), 'some_column_id', array(self::underscoreNamingLower(), 'some_column_id', 'someColumn', null),
'someColumn', null, array(self::underscoreNamingUpper(), 'SOME_COLUMN_ID', 'someColumn', null),
),
array(self::underscoreNamingUpper(), 'SOME_COLUMN_ID',
'someColumn', null,
),
// JoinColumnClassNamingStrategy // JoinColumnClassNamingStrategy
array(self::joinColumnClassNaming(), 'classname_someColumn_id', array(new JoinColumnClassNamingStrategy(), 'classname_someColumn_id', 'someColumn', 'Some\ClassName'),
'someColumn', 'Some\ClassName', array(new JoinColumnClassNamingStrategy(), 'classname_some_column_id', 'some_column', 'ClassName'),
),
array(self::joinColumnClassNaming(), 'classname_some_column_id',
'some_column', 'ClassName',
),
); );
} }