Minor implementation changes + unit tests

adamlundrigan · Jul 7, 2014 · ab574e4 · ab574e4
1 parent 2321a00
commit ab574e4
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 17 deletions.
diff --git a/src/LdcUserProfile/Options/ModuleOptions.php b/src/LdcUserProfile/Options/ModuleOptions.php
@@ -88,9 +88,9 @@ public function getRegisteredExtensions()
         return $this->registeredExtensions;
     }
 
-    public function setRegisteredExtensions($registeredExtensions)
+    public function setRegisteredExtensions(array $ext)
     {
-        $this->registeredExtensions = $registeredExtensions;
+        $this->registeredExtensions = $ext;
 
         return $this;
     }

diff --git a/src/LdcUserProfile/Service/ProfileService.php b/src/LdcUserProfile/Service/ProfileService.php
@@ -55,6 +55,16 @@ public function getExtensions()
         return $this->extensions;
     }
 
+    public function hasExtension($nameOrInstance)
+    {
+        return array_key_Exists(
+            $nameOrInstance instanceof AbstractExtension
+                ? $nameOrInstance->getName()
+                : (string) $nameOrInstance,
+            $this->extensions
+        );
+    }
+
     public function constructFormForUser(UserInterface $user)
     {
         $form = clone $this->getFormPrototype();

diff --git a/src/LdcUserProfile/Service/ProfileServiceFactory.php b/src/LdcUserProfile/Service/ProfileServiceFactory.php
@@ -29,24 +29,17 @@ public function createService(ServiceLocatorInterface $serviceLocator)
 
         // Register/Unregister the active/inactive extensions
         foreach ($moduleOptions->getRegisteredExtensions() as $extensionName => $isActive) {
-            if ($isActive) {
-                $this->registerExtension($extensionName, $service, $serviceLocator);
-            } else {
+            if (! $isActive) {
                 $service->unregisterExtension($extensionName);
+                continue;
+            }
+
+            $extension = $serviceLocator->get($extensionName);
+            if ($extension instanceof AbstractExtension) {
+                $service->registerExtension($extension);
             }
         }
 
         return $service;
     }
-
-    protected function registerExtension(
-        $extensionName,
-        ProfileService $service,
-        ServiceLocatorInterface $serviceLocator
-    ) {
-        $extension = $serviceLocator->get($extensionName);
-        if ($extension instanceof AbstractExtension) {
-            $service->registerExtension($extension);
-        }
-    }
 }
diff --git a/tests/LdcUserProfileTest/Options/ModuleOptionsTest.php b/tests/LdcUserProfileTest/Options/ModuleOptionsTest.php
@@ -48,4 +48,22 @@ public function testGetSetValidationGroupOverrides()
         $this->assertEquals($data, $this->options->getValidationGroupOverrides());
     }
 
+    public function testSetValidationGroupOverridesRequiresArray()
+    {
+        $this->setExpectedException('PHPUnit_Framework_Error');
+        $this->options->setValidationGroupOverrides('foo');
+    }
+
+    public function testGetSetRegisteredExtensions()
+    {
+        $data = array('foo', 'bar');
+        $this->options->setRegisteredExtensions($data);
+        $this->assertEquals($data, $this->options->getRegisteredExtensions());
+    }
+
+    public function testSetRegisteredExtensionsRequiresArray()
+    {
+        $this->setExpectedException('PHPUnit_Framework_Error');
+        $this->options->setRegisteredExtensions('foo');
+    }
 }
diff --git a/tests/LdcUserProfileTest/Service/ProfileServiceFactoryTest.php b/tests/LdcUserProfileTest/Service/ProfileServiceFactoryTest.php
@@ -9,7 +9,7 @@
 
 namespace LdcUserProfileTest\Service;
 
-use LdcUserProfile\Service\ProfileService;
+use LdcUserProfile\Options\ModuleOptions;
 
 class ProfileServiceFactoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -27,4 +27,47 @@ public function testCreateService()
         $this->assertInstanceOf('LdcUserProfile\Service\ProfileService', $svc);
         $this->assertSame($mockModuleOptions, $svc->getModuleOptions());
     }
+
+    public function testCreateServiceWithRegisteredExtension()
+    {
+        $moduleOptions = new ModuleOptions();
+        $moduleOptions->setRegisteredExtensions(array('foo' => true));
+
+        $mockExtension = \Mockery::mock('LdcUserProfile\Extensions\AbstractExtension');
+        $mockExtension->shouldReceive('getName')->andReturn('foo');
+
+        $serviceManager = new \Zend\ServiceManager\ServiceManager();
+        $serviceManager->setService('ldc-user-profile_module_options', $moduleOptions);
+        $serviceManager->setService('foo', $mockExtension);
+
+        $factory = new \LdcUserProfile\Service\ProfileServiceFactory();
+        $svc = $factory->createService($serviceManager);
+
+        $this->assertInstanceOf('LdcUserProfile\Service\ProfileService', $svc);
+        $this->assertTrue($svc->hasExtension('foo'));
+        $this->assertTrue($svc->hasExtension($mockExtension));
+
+        $extensions = $svc->getExtensions();
+        $this->assertSame($mockExtension, $extensions['foo']);
+    }
+
+    public function testCreateServiceWithUnregisterExtension()
+    {
+        $moduleOptions = new ModuleOptions();
+        $moduleOptions->setRegisteredExtensions(array('foo' => false));
+
+        $mockExtension = \Mockery::mock('LdcUserProfile\Extensions\AbstractExtension');
+        $mockExtension->shouldReceive('getName')->andReturn('foo');
+
+        $serviceManager = new \Zend\ServiceManager\ServiceManager();
+        $serviceManager->setService('ldc-user-profile_module_options', $moduleOptions);
+        //$serviceManager->setService('foo', $mockExtension);
+
+        $factory = new \LdcUserProfile\Service\ProfileServiceFactory();
+        $svc = $factory->createService($serviceManager);
+
+        $this->assertInstanceOf('LdcUserProfile\Service\ProfileService', $svc);
+        $this->assertFalse($svc->hasExtension('foo'));
+        $this->assertFalse($svc->hasExtension($mockExtension));
+    }
 }
diff --git a/tests/LdcUserProfileTest/Service/ProfileServiceTest.php b/tests/LdcUserProfileTest/Service/ProfileServiceTest.php
@@ -46,6 +46,12 @@ public function testRegisterExtensionRejectsInvalidExtension()
         $this->service->registerExtension(new \stdClass());
     }
 
+    public function testRegisterExtensionRejectsNullExtension()
+    {
+        $this->setExpectedException('PHPUnit_Framework_Error');
+        $this->service->registerExtension(null);
+    }
+
     public function testUnregisterExtensionByInstance()
     {
         $ext = $this->testRegisterExtension();
@@ -62,6 +68,20 @@ public function testUnregisterExtensionByName()
         $this->assertArrayNotHasKey('testext', $this->service->getExtensions());
     }
 
+    public function testHasExtensionByName()
+    {
+        $ext = $this->testRegisterExtension();
+
+        $this->assertTrue($this->service->hasExtension($ext->getName()));
+    }
+
+    public function testHasExtensionByInstance()
+    {
+        $ext = $this->testRegisterExtension();
+
+        $this->assertTrue($this->service->hasExtension($ext));
+    }
+
     public function testSaveCallsSaveOnEachRegsiteredExtension()
     {
         $payload = new \stdClass();