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

#1196 DDC-3418 DDC-3419 - Minor CS fixes, explicit setExpectedException calls

Browse Source
This commit is contained in:
Marco Pivetta 2014-11-27 19:10:45 +01:00
parent 71135972c6
commit b3fe0904eb
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
View File

@ -2,9 +2,10 @@
namespace Doctrine\Tests\ORM\Mapping; namespace Doctrine\Tests\ORM\Mapping;
use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService;
use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\ClassMetadataFactory;
use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Doctrine\ORM\Tools\SchemaTool; use Doctrine\Tests\Models\DDC869\DDC869Payment;
class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
{ {
@ -22,11 +23,10 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
$this->cmf->setEntityManager($this->_getTestEntityManager()); $this->cmf->setEntityManager($this->_getTestEntityManager());
} }
/**
* @expectedException Doctrine\ORM\Mapping\MappingException
*/
public function testGetMetadataForTransientClassThrowsException() public function testGetMetadataForTransientClassThrowsException()
{ {
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
$this->cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\TransientBaseClass'); $this->cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\TransientBaseClass');
} }
@ -77,7 +77,7 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
$this->assertArrayHasKey('id', $class->fieldMappings); $this->assertArrayHasKey('id', $class->fieldMappings);
$this->assertArrayHasKey('value', $class->fieldMappings); $this->assertArrayHasKey('value', $class->fieldMappings);
$this->assertArrayHasKey('serialNumber', $class->fieldMappings); $this->assertArrayHasKey('serialNumber', $class->fieldMappings);
$this->assertEquals($class->customRepositoryClassName, "Doctrine\Tests\Models\DDC869\DDC869PaymentRepository"); $this->assertEquals($class->customRepositoryClassName, 'Doctrine\Tests\Models\DDC869\DDC869PaymentRepository');
// override repositoryClass // override repositoryClass
@ -85,7 +85,7 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
$this->assertArrayHasKey('id', $class->fieldMappings); $this->assertArrayHasKey('id', $class->fieldMappings);
$this->assertArrayHasKey('value', $class->fieldMappings); $this->assertArrayHasKey('value', $class->fieldMappings);
$this->assertEquals($class->customRepositoryClassName, "Doctrine\ORM\EntityRepository"); $this->assertEquals($class->customRepositoryClassName, 'Doctrine\ORM\EntityRepository');
} }
/** /**
@ -97,7 +97,7 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
$class = $this->cmf->getMetadataFor(__NAMESPACE__ . '\\EntitySubClass2'); $class = $this->cmf->getMetadataFor(__NAMESPACE__ . '\\EntitySubClass2');
$class2 = unserialize(serialize($class)); $class2 = unserialize(serialize($class));
$class2->wakeupReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); $class2->wakeupReflection(new RuntimeReflectionService);
$this->assertArrayHasKey('mapped1', $class2->reflFields); $this->assertArrayHasKey('mapped1', $class2->reflFields);
$this->assertArrayHasKey('mapped2', $class2->reflFields); $this->assertArrayHasKey('mapped2', $class2->reflFields);
@ -121,7 +121,12 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
*/ */
public function testUnmappedEntityInHierarchy() public function testUnmappedEntityInHierarchy()
{ {
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "Entity 'Doctrine\Tests\ORM\Mapping\HierarchyBEntity' has to be part of the discriminator map of 'Doctrine\Tests\ORM\Mapping\HierarchyBase' to be properly mapped in the inheritance hierarchy. Alternatively you can make 'Doctrine\Tests\ORM\Mapping\HierarchyBEntity' an abstract class to avoid this exception from occurring."); $this->setExpectedException(
'Doctrine\ORM\Mapping\MappingException',
'Entity \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' has to be part of the discriminator map'
. ' of \'Doctrine\Tests\ORM\Mapping\HierarchyBase\' to be properly mapped in the inheritance hierarchy.'
. ' Alternatively you can make \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' an abstract class to'
. ' avoid this exception from occurring.');
$this->cmf->getMetadataFor(__NAMESPACE__ . '\\HierarchyE'); $this->cmf->getMetadataFor(__NAMESPACE__ . '\\HierarchyE');
} }
@ -147,7 +152,10 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
/* @var $class ClassMetadataInfo */ /* @var $class ClassMetadataInfo */
$this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator);
$this->assertEquals(array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), $class->sequenceGeneratorDefinition); $this->assertEquals(
array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'),
$class->sequenceGeneratorDefinition
);
} }
/** /**
@ -160,7 +168,10 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
/* @var $class ClassMetadataInfo */ /* @var $class ClassMetadataInfo */
$this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator);
$this->assertEquals(array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), $class->sequenceGeneratorDefinition); $this->assertEquals(
array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'),
$class->sequenceGeneratorDefinition
);
} }
/** /**
@ -173,7 +184,10 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
/* @var $class ClassMetadataInfo */ /* @var $class ClassMetadataInfo */
$this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator);
$this->assertEquals(array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), $class->sequenceGeneratorDefinition); $this->assertEquals(
array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'),
$class->sequenceGeneratorDefinition
);
} }
/** /**
@ -334,6 +348,6 @@ class MediumSuperclassEntity extends MediumSuperclassBase
} }
/** @Entity(repositoryClass = "Doctrine\ORM\EntityRepository") */ /** @Entity(repositoryClass = "Doctrine\ORM\EntityRepository") */
class SubclassWithRepository extends \Doctrine\Tests\Models\DDC869\DDC869Payment class SubclassWithRepository extends DDC869Payment
{ {
} }