From 6bcfaed6400a26d523065c09b6735ab0388f902e Mon Sep 17 00:00:00 2001 From: Vitali Yakavenka Date: Sat, 26 Nov 2011 19:14:47 +0100 Subject: [PATCH] Remove explicit annotation registration after it was merged into OrmTestCase --- tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php | 3 --- tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php | 2 -- 2 files changed, 5 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index a980a13db..51270f73f 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -4,7 +4,6 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Events; -use Doctrine\Common\Annotations\AnnotationRegistry; require_once __DIR__ . '/../../TestInit.php'; @@ -115,8 +114,6 @@ class AnnotationDriverTest extends AbstractMappingDriverTest protected function _loadDriver() { - AnnotationRegistry::registerFile(__DIR__ . - '/../../../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php'); return $this->createAnnotationDriver(); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php index 6224121d0..2b21a5b59 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php @@ -105,8 +105,6 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase public function testHasGetMetadata_NamespaceSeperatorIsNotNormalized() { require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php"; - AnnotationRegistry::registerFile(__DIR__ . - '/../../../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php'); $metadataDriver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/Global/'));