Better unit test asset namespaces

zfcampus · Nov 17, 2014 · 0ef0114 · 0ef0114
1 parent e1d4f22
commit 0ef0114
Show file tree

Hide file tree

Showing 30 changed files with 65 additions and 93 deletions.
diff --git a/test/Bootstrap.php b/test/Bootstrap.php
@@ -4,7 +4,7 @@
  * @copyright Copyright (c) 2014 Zend Technologies USA Inc. (http://www.zend.com)
  */
 
-namespace ZFTest\Apigility\Admin;
+namespace ZFTest\Apigility;
 
 use Zend\Loader\AutoloaderFactory;
 use RuntimeException;

diff --git a/test/assets/documentation/ZFTest.ormdesigner2 b/test/assets/documentation/ZFTest.ormdesigner2
diff --git a/test/assets/module/DbApiOriginal/Module.php b/test/assets/module/DbApiOriginal/Module.php
@@ -1,2 +1,2 @@
 <?php
-require __DIR__ . '/src/DbApi/Module.php';
+require __DIR__ . '/src/ZFTestApigilityDbApi/Module.php';
diff --git a/...module/DbApiOriginal/src/DbApi/Module.php → ...ginal/src/ZFTestApigilityDbApi/Module.php b/...module/DbApiOriginal/src/DbApi/Module.php → ...ginal/src/ZFTestApigilityDbApi/Module.php
@@ -1,5 +1,5 @@
 <?php
-namespace DbApi;
+namespace ZFTestApigilityDbApi;
 
 use ZF\Apigility\Provider\ApigilityProviderInterface;
 

diff --git a/test/assets/module/DbMongoApiOriginal/Module.php b/test/assets/module/DbMongoApiOriginal/Module.php
@@ -1,2 +1,2 @@
 <?php
-require __DIR__ . '/src/DbMongoApi/Module.php';
+require __DIR__ . '/src/ZFTestApigilityDbMongoApi/Module.php';
diff --git a/...ssets/module/DbOriginal/src/Db/Module.php → .../src/ZFTestApigilityDbMongoApi/Module.php b/...ssets/module/DbOriginal/src/Db/Module.php → .../src/ZFTestApigilityDbMongoApi/Module.php
@@ -1,5 +1,5 @@
 <?php
-namespace Db;
+namespace ZFTestApigilityDbMongoApi;
 
 use ZF\Apigility\Provider\ApigilityProviderInterface;
 

diff --git a/test/assets/module/DbMongoOriginal/Module.php b/test/assets/module/DbMongoOriginal/Module.php
@@ -1,2 +1,2 @@
 <?php
-require __DIR__ . '/src/DbMongo/Module.php';
+require __DIR__ . '/src/ZFTestApigilityDbMongo/Module.php';
diff --git a/test/assets/module/DbMongoOriginal/config/module.config.php b/test/assets/module/DbMongoOriginal/config/module.config.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DbMongo;
+namespace ZFTestApigilityDbMongo;
 
 return [
     'doctrine' => [

diff --git a/.../config/yml/DbMongo.Document.Meta.dcm.yml → ...estApigilityDbMongo.Document.Meta.dcm.yml b/.../config/yml/DbMongo.Document.Meta.dcm.yml → ...estApigilityDbMongo.Document.Meta.dcm.yml
@@ -1,7 +1,7 @@
-DbMongo\Document\Meta:
+ZFTestApigilityDbMongo\Document\Meta:
   db: zf_apigility_doctrine_server_test
   collection: meta
-  repositoryClass: DbMongo\Repository\MetaRepository
+  repositoryClass: ZFTestApigilityDbMongo\Repository\MetaRepository
   fields:
     id:
       id: true

diff --git a/...ngoOriginal/src/DbMongo/Document/Meta.php → .../ZFTestApigilityDbMongo/Document/Meta.php b/...ngoOriginal/src/DbMongo/Document/Meta.php → .../ZFTestApigilityDbMongo/Document/Meta.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DbMongo\Document;
+namespace ZFTestApigilityDbMongo\Document;
 
 class Meta
 {

diff --git a/...ongoApiOriginal/src/DbMongoApi/Module.php → ...nal/src/ZFTestApigilityDbMongo/Module.php b/...ongoApiOriginal/src/DbMongoApi/Module.php → ...nal/src/ZFTestApigilityDbMongo/Module.php
@@ -1,5 +1,5 @@
 <?php
-namespace DbMongoApi;
+namespace ZFTestApigilityDbMongo;
 
 use ZF\Apigility\Provider\ApigilityProviderInterface;
 

diff --git a/...src/DbMongo/Repository/MetaRepository.php → ...lityDbMongo/Repository/MetaRepository.php b/...src/DbMongo/Repository/MetaRepository.php → ...lityDbMongo/Repository/MetaRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DbMongo\Repository;
+namespace ZFTestApigilityDbMongo\Repository;
 
 use Doctrine\ODM\MongoDB\DocumentRepository;
 

diff --git a/test/assets/module/DbOriginal/Module.php b/test/assets/module/DbOriginal/Module.php
@@ -1,2 +1,2 @@
 <?php
-require __DIR__ . '/src/Db/Module.php';
+require __DIR__ . '/src/ZFTestApigilityDb/Module.php';
diff --git a/test/assets/module/DbOriginal/config/module.config.php b/test/assets/module/DbOriginal/config/module.config.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Db;
+namespace ZFTestApigilityDb;
 
 return [
     'doctrine' => [

diff --git a/...iginal/config/xml/Db.Entity.Album.dcm.xml → ...ml/ZFTestApigilityDb.Entity.Album.dcm.xml b/...iginal/config/xml/Db.Entity.Album.dcm.xml → ...ml/ZFTestApigilityDb.Entity.Album.dcm.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Db\Entity\Album">
+  <entity name="ZFTestApigilityDb\Entity\Album">
     <id name="id" type="integer">
       <generator strategy="AUTO"/>
     </id>
     <field name="name" type="string" nullable="true"/>
     <field name="createdAt" type="datetime" nullable="true"/>
-    <many-to-one field="artist" target-entity="Db\Entity\Artist" inversed-by="album">
+    <many-to-one field="artist" target-entity="ZFTestApigilityDb\Entity\Artist" inversed-by="album">
       <join-columns>
         <join-column name="artist_id" referenced-column-name="id"/>
       </join-columns>

diff --git a/...ginal/config/xml/Db.Entity.Artist.dcm.xml → ...l/ZFTestApigilityDb.Entity.Artist.dcm.xml b/...ginal/config/xml/Db.Entity.Artist.dcm.xml → ...l/ZFTestApigilityDb.Entity.Artist.dcm.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Db\Entity\Artist">
+  <entity name="ZFTestApigilityDb\Entity\Artist">
     <id name="id" type="integer">
       <generator strategy="AUTO"/>
     </id>
     <field name="name" type="string" nullable="true"/>
     <field name="createdAt" type="datetime" nullable="true"/>
-    <one-to-many field="album" target-entity="Db\Entity\Album" mapped-by="artist"/>
+    <one-to-many field="album" target-entity="ZFTestApigilityDb\Entity\Album" mapped-by="artist"/>
   </entity>
 </doctrine-mapping>
diff --git a/...module/DbOriginal/src/Db/Entity/Album.php → ...al/src/ZFTestApigilityDb/Entity/Album.php b/...module/DbOriginal/src/Db/Entity/Album.php → ...al/src/ZFTestApigilityDb/Entity/Album.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Db\Entity;
+namespace ZFTestApigilityDb\Entity;
 
 class Album
 {

diff --git a/...odule/DbOriginal/src/Db/Entity/Artist.php → ...l/src/ZFTestApigilityDb/Entity/Artist.php b/...odule/DbOriginal/src/Db/Entity/Artist.php → ...l/src/ZFTestApigilityDb/Entity/Artist.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Db\Entity;
+namespace ZFTestApigilityDb\Entity;
 
 use \Doctrine\Common\Collections\ArrayCollection;
 
@@ -64,11 +64,11 @@ public function getAlbum()
      */
     public function addAlbum($album)
     {
-        if ($album instanceof \Db\Entity\Album) {
+        if ($album instanceof \ZFTestApigilityDb\Entity\Album) {
             $this->album[] = $album;
         } elseif ($album instanceof ArrayCollection) {
             foreach ($album as $a) {
-                if ( ! $a instanceof \Db\Entity\Album) {
+                if ( ! $a instanceof \ZFTestApigilityDb\Entity\Album) {
                     throw new \Exception('Invalid type in addAlbum');
                 }
                 $this->album->add($a);
@@ -85,11 +85,11 @@ public function addAlbum($album)
      */
     public function removeAlbum($album)
     {
-        if ($album instanceof \Db\Entity\Album) {
+        if ($album instanceof \ZFTestApigilityDb\Entity\Album) {
             $this->album[] = $album;
         } elseif ($album instanceof ArrayCollection) {
             foreach ($album as $a) {
-                if ( ! $a instanceof \Db\Entity\Album) {
+                if ( ! $a instanceof \ZFTestApigilityDb\Entity\Album) {
                     throw new \Exception('Invalid type remove addAlbum');
                 }
                 $this->album->removeElement($a);

diff --git a/...le/DbMongoOriginal/src/DbMongo/Module.php → ...Original/src/ZFTestApigilityDb/Module.php b/...le/DbMongoOriginal/src/DbMongo/Module.php → ...Original/src/ZFTestApigilityDb/Module.php
@@ -1,5 +1,6 @@
 <?php
-namespace DbMongo;
+
+namespace ZFTestApigilityDb;
 
 use ZF\Apigility\Provider\ApigilityProviderInterface;
 

diff --git a/test/assets/module/GeneralOriginal/Module.php b/test/assets/module/GeneralOriginal/Module.php
@@ -1,2 +1,2 @@
 <?php
-require __DIR__ . '/src/General/Module.php';
+require __DIR__ . '/src/ZFTestApigilityGeneral/Module.php';
diff --git a/test/assets/module/GeneralOriginal/config/module.config.php b/test/assets/module/GeneralOriginal/config/module.config.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Db;
+namespace ZFTestApigilityGeneral;
 
 return [
     'service_manager' => [
         'invokables' => [
-            'General\Listener\EventCatcher' => 'General\Listener\EventCatcher',
+            'ZFTestApigilityGeneral\Listener\EventCatcher' => 'ZFTestApigilityGeneral\Listener\EventCatcher',
         ]
     ]
 ];
diff --git a/...nal/src/General/Listener/EventCatcher.php → ...pigilityGeneral/Listener/EventCatcher.php b/...nal/src/General/Listener/EventCatcher.php → ...pigilityGeneral/Listener/EventCatcher.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace General\Listener;
+namespace ZFTestApigilityGeneral\Listener;
 
 use Zend\EventManager\Event;
 use Zend\EventManager\SharedEventManagerInterface;

diff --git a/...le/GeneralOriginal/src/General/Module.php → ...nal/src/ZFTestApigilityGeneral/Module.php b/...le/GeneralOriginal/src/General/Module.php → ...nal/src/ZFTestApigilityGeneral/Module.php
@@ -1,5 +1,5 @@
 <?php
-namespace General;
+namespace ZFTestApigilityGeneral;
 
 use Zend\EventManager\EventInterface;
 use Zend\ModuleManager\Feature\BootstrapListenerInterface;
@@ -37,7 +37,7 @@ public function onBootstrap(EventInterface $e)
         $eventManager = $application->getEventManager();
         $sharedEventManager = $eventManager->getSharedManager();
 
-        $eventCatcher = $serviceManager->get('General\Listener\EventCatcher');
+        $eventCatcher = $serviceManager->get('ZFTestApigilityGeneral\Listener\EventCatcher');
         $sharedEventManager->attachAggregate($eventCatcher);
     }
 

diff --git a/test/config/ODM/application.config.php b/test/config/ODM/application.config.php
@@ -16,18 +16,18 @@
         'ZF\ApiProblem',
         'ZF\Apigility\Doctrine\Admin',
         'ZF\Apigility\Doctrine\Server',
-        'General',
-        'DbMongo',
-        'DbMongoApi',
+        'ZFTestApigilityGeneral',
+        'ZFTestApigilityDbMongo',
+        'ZFTestApigilityDbMongoApi',
     ),
     'module_listener_options' => array(
         'config_glob_paths' => array(
             __DIR__ . '/local.php',
         ),
         'module_paths' => array(
-            'General' => __DIR__ . '/../../assets/module/General',
-            'DbMongo' => __DIR__ . '/../../assets/module/DbMongo',
-            'DbMongoApi' => __DIR__ . '/../../assets/module/DbMongoApi',
+            'ZFTestApigilityGeneral' => __DIR__ . '/../../assets/module/General',
+            'ZFTestApigilityDbMongo' => __DIR__ . '/../../assets/module/DbMongo',
+            'ZFTestApigilityDbMongoApi' => __DIR__ . '/../../assets/module/DbMongoApi',
         ),
     ),
 );
diff --git a/test/config/ORM/application.config.php b/test/config/ORM/application.config.php
@@ -16,18 +16,18 @@
         'ZF\ApiProblem',
         'ZF\Apigility\Doctrine\Admin',
         'ZF\Apigility\Doctrine\Server',
-        'General',
-        'Db',
-        'DbApi',
+        'ZFTestApigilityGeneral',
+        'ZFTestApigilityDb',
+        'ZFTestApigilityDbApi',
     ),
     'module_listener_options' => array(
         'config_glob_paths' => array(
             __DIR__ . '/local.php',
         ),
         'module_paths' => array(
-            'General' => __DIR__ . '/../../assets/module/General',
-            'Db' => __DIR__ . '/../../assets/module/Db',
-            'DbApi' => __DIR__ . '/../../assets/module/DbApi',
+            'ZFTestApigilityGeneral' => __DIR__ . '/../../assets/module/General',
+            'ZFTestApigilityDb' => __DIR__ . '/../../assets/module/Db',
+            'ZFTestApigilityDbApi' => __DIR__ . '/../../assets/module/DbApi',
         ),
     ),
 );
diff --git a/test/config/application.config.php b/test/config/application.config.php
@@ -16,18 +16,18 @@
         'ZF\ApiProblem',
         'ZF\Apigility\Doctrine\Admin',
         'ZF\Apigility\Doctrine\Server',
-        'General',
-        'Db',
-        'DbApi',
+        'ZFTestApigilityGeneral',
+        'ZFTestApigilityDb',
+        'ZFTestApigilityDbApi',
     ),
     'module_listener_options' => array(
         'config_glob_paths' => array(
             __DIR__ . '/testing.config.php',
         ),
         'module_paths' => array(
-            'General' => __DIR__ . '/../../assets/module/General',
-            'Db' => __DIR__ . '/../assets/module/Db',
-            'DbApi' => __DIR__ . '/../assets/module/DbApi',
+            'ZFTestApigilityGeneral' => __DIR__ . '/../../assets/module/General',
+            'ZFTestApigilityDb' => __DIR__ . '/../assets/module/Db',
+            'ZFTestApigilityDbApi' => __DIR__ . '/../assets/module/DbApi',
         ),
     ),
 );
diff --git a/test/src/Server/ODM/CRUD/CRUDTest.php b/test/src/Server/ODM/CRUD/CRUDTest.php
@@ -6,9 +6,9 @@
 
 namespace ZFTest\Apigility\Doctrine\Server\ODM\CRUD;
 
-use General\Listener\EventCatcher;
+use ZFTestApigilityGeneral\Listener\EventCatcher;
 use Zend\Http\Request;
-use DbMongo\Document\Meta as MetaEntity;
+use ZFTestApigilityDbMongo\Document\Meta as MetaEntity;
 use ZF\Apigility\Doctrine\Server\Event\DoctrineResourceEvent;
 
 class CRUDTest extends \Zend\Test\PHPUnit\Controller\AbstractHttpControllerTestCase
@@ -37,7 +37,7 @@ protected function clearData()
     protected function validateTriggeredEvents($expectedEvents)
     {
         $serviceManager = $this->getApplication()->getServiceManager();
-        $eventCatcher = $serviceManager->get('General\Listener\EventCatcher');
+        $eventCatcher = $serviceManager->get('ZFTestApigilityGeneral\Listener\EventCatcher');
 
         $this->assertEquals($expectedEvents, $eventCatcher->getCaughtEvents());
     }

diff --git a/test/src/Server/ODM/Setup/SetupTest.php b/test/src/Server/ODM/Setup/SetupTest.php
@@ -27,13 +27,13 @@ public function testBuildOdmApi()
         $metaResourceDefinition = [
             "objectManager"=> "doctrine.documentmanager.odm_default",
             "serviceName" => "Meta",
-            "entityClass" => "DbMongo\\Document\\Meta",
+            "entityClass" => "ZFTestApigilityDbMongo\\Document\\Meta",
             "routeIdentifierName" => "meta_id",
             "entityIdentifierName" => "id",
             "routeMatch" => "/test/meta",
         ];
 
-        $resource->setModuleName('DbMongoApi');
+        $resource->setModuleName('ZFTestApigilityDbMongoApi');
         $metaEntity = $resource->create($metaResourceDefinition);
 
         $this->assertInstanceOf('ZF\Apigility\Doctrine\Admin\Model\DoctrineRestServiceEntity', $metaEntity);

diff --git a/test/src/Server/ORM/CRUD/CRUDTest.php b/test/src/Server/ORM/CRUD/CRUDTest.php
@@ -8,7 +8,7 @@
 
 use Doctrine\ORM\Tools\SchemaTool;
 use Zend\Http\Request;
-use Db\Entity\Artist as ArtistEntity;
+use ZFTestApigilityDb\Entity\Artist as ArtistEntity;
 use ZF\Apigility\Doctrine\Server\Event\DoctrineResourceEvent;
 
 class CRUDTest extends \Zend\Test\PHPUnit\Controller\AbstractHttpControllerTestCase
@@ -33,7 +33,7 @@ public function setUp()
     protected function validateTriggeredEvents($expectedEvents)
     {
         $serviceManager = $this->getApplication()->getServiceManager();
-        $eventCatcher = $serviceManager->get('General\Listener\EventCatcher');
+        $eventCatcher = $serviceManager->get('ZFTestApigilityGeneral\Listener\EventCatcher');
 
         $this->assertEquals($expectedEvents, $eventCatcher->getCaughtEvents());
     }
@@ -124,7 +124,7 @@ public function testPatch()
         $body = json_decode($this->getResponse()->getBody(), true);
         $this->assertEquals('ArtistOnePatchEdit', $body['name']);
 
-        $foundEntity = $em->getRepository('Db\Entity\Artist')->find($artist->getId());
+        $foundEntity = $em->getRepository('ZFTestApigilityDb\Entity\Artist')->find($artist->getId());
         $this->assertEquals('ArtistOnePatchEdit', $foundEntity->getName());
         $this->validateTriggeredEvents([DoctrineResourceEvent::EVENT_PATCH_PRE, DoctrineResourceEvent::EVENT_PATCH_POST]);
     }
@@ -150,7 +150,7 @@ public function testPut()
         $body = json_decode($this->getResponse()->getBody(), true);
         $this->assertEquals('ArtistSevenPutEdit', $body['name']);
 
-        $foundEntity = $em->getRepository('Db\Entity\Artist')->find($artist->getId());
+        $foundEntity = $em->getRepository('ZFTestApigilityDb\Entity\Artist')->find($artist->getId());
         $this->assertEquals('ArtistSevenPutEdit', $foundEntity->getName());
         $this->validateTriggeredEvents([DoctrineResourceEvent::EVENT_UPDATE_PRE, DoctrineResourceEvent::EVENT_UPDATE_POST]);
     }
@@ -175,7 +175,7 @@ public function testDelete()
         $this->dispatch('/test/artist/' . $artist->getId());
         $this->assertEquals(204, $this->getResponseStatusCode());
 
-        $this->assertEmpty($em->getRepository('Db\Entity\Artist')->find($id));
+        $this->assertEmpty($em->getRepository('ZFTestApigilityDb\Entity\Artist')->find($id));
         $this->validateTriggeredEvents([DoctrineResourceEvent::EVENT_DELETE_PRE, DoctrineResourceEvent::EVENT_DELETE_POST]);
 
         // Test DELETE: entity not found