Added GenerateAdminCommandTest. Fixed bug: The "type" option does not exist.

Command/GenerateAdminCommand.php

@@ -72,7 +72,7 @@ class GenerateAdminCommand extends ContainerAwareCommand
             $adminGenerator->generate($bundle, $adminClassBasename, $modelClass);
             $output->writeln(sprintf(
                 '%sThe admin class "<info>%s</info>" has been generated under the file "<info>%s</info>".',
-                "\n",
+                PHP_EOL,
                 $adminGenerator->getClass(),
                 realpath($adminGenerator->getFile())
             ));
@@ -88,7 +88,7 @@ class GenerateAdminCommand extends ContainerAwareCommand
                 $controllerGenerator->generate($bundle, $controllerClassBasename);
                 $output->writeln(sprintf(
                     '%sThe controller class "<info>%s</info>" has been generated under the file "<info>%s</info>".',
-                    "\n",
+                    PHP_EOL,
                     $controllerGenerator->getClass(),
                     realpath($controllerGenerator->getFile())
                 ));
@@ -111,7 +111,7 @@ class GenerateAdminCommand extends ContainerAwareCommand
                 $servicesManipulator->addResource($id, $modelClass, $adminClass, $controllerName, $managerType);
                 $output->writeln(sprintf(
                     '%sThe service "<info>%s</info>" has been appended to the file <info>"%s</info>".',
-                    "\n",
+                    PHP_EOL,
                     $id,
                     realpath($file)
                 ));
@@ -154,10 +154,10 @@ class GenerateAdminCommand extends ContainerAwareCommand
             $managerType = $this->askAndValidate(
                 $output,
                 'The manager type',
-                $input->getOption('type') ?: $this->getDefaultManagerType(),
+                $input->getOption('manager') ?: $this->getDefaultManagerType(),
                 array($this, 'validateManagerType')
             );
-            $input->setOption('type', $managerType);
+            $input->setOption('manager', $managerType);
         }
 
         $question = $dialog->getQuestion('Do you want to generate a controller', 'no', '?');

Tests/Command/GenerateAdminCommandTest.php

@@ -0,0 +1,346 @@
+<?php
+
+/*
+ * This file is part of the Sonata package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\AdminBundle\Tests\Command;
+
+use Sonata\AdminBundle\Model\ModelManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Console\Tester\CommandTester;
+use Sonata\AdminBundle\Command\GenerateAdminCommand;
+use Sonata\AdminBundle\Tests\Fixtures\Bundle\DemoAdminBundle;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @author Andrej Hudec <pulzarraider@gmail.com>
+ */
+class GenerateAdminCommandTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Application
+     */
+    private $application;
+
+    /**
+     * @var string
+     */
+    private $tempDirectory;
+
+    /**
+     * @var Container
+     */
+    private $container;
+
+    /**
+     * @var GenerateAdminCommand
+     */
+    private $command;
+
+    protected function setUp()
+    {
+        //create temp dir
+        $tempfile=tempnam(sys_get_temp_dir(),'sonata_admin');
+        if (file_exists($tempfile)) {
+            unlink($tempfile);
+        }
+        mkdir($tempfile);
+        $this->tempDirectory = $tempfile;
+
+        $bundle = new DemoAdminBundle();
+        $bundle->setPath($this->tempDirectory);
+
+        $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+        $kernel->expects($this->any())
+            ->method('getBundles')
+            ->will($this->returnValue(array($bundle)));
+
+        $parameterBag = new ParameterBag();
+        $this->container = new Container($parameterBag);
+
+        $kernel->expects($this->any())
+            ->method('getBundle')
+            ->with($this->equalTo('AcmeDemoBundle'))
+            ->will($this->returnValue($bundle));
+
+        $this->application = new Application($kernel);
+        $this->command = new GenerateAdminCommand();
+
+        $this->application->add($this->command);
+    }
+
+    public function tearDown()
+    {
+        if ($this->tempDirectory) {
+            if (file_exists($this->tempDirectory.'/Controller/FooAdminController.php')) {
+                unlink($this->tempDirectory.'/Controller/FooAdminController.php');
+            }
+
+            if (file_exists($this->tempDirectory.'/Admin/FooAdmin.php')) {
+                unlink($this->tempDirectory.'/Admin/FooAdmin.php');
+            }
+
+            if (file_exists($this->tempDirectory.'/Resources/config/admin.yml')) {
+                unlink($this->tempDirectory.'/Resources/config/admin.yml');
+            }
+
+            if (is_dir($this->tempDirectory.'/Controller')) {
+                rmdir($this->tempDirectory.'/Controller');
+            }
+
+            if (is_dir($this->tempDirectory.'/Admin')) {
+                rmdir($this->tempDirectory.'/Admin');
+            }
+
+            if (is_dir($this->tempDirectory.'/Resources/config')) {
+                rmdir($this->tempDirectory.'/Resources/config');
+            }
+
+            if (is_dir($this->tempDirectory.'/Resources')) {
+                rmdir($this->tempDirectory.'/Resources');
+            }
+
+            if (file_exists($this->tempDirectory) && is_dir($this->tempDirectory)) {
+                rmdir($this->tempDirectory);
+            }
+        }
+    }
+
+    public function testExecute()
+    {
+        $this->command->setContainer($this->container);
+        $this->container->set('sonata.admin.manager.foo', $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface'));
+
+        $command = $this->application->find('sonata:admin:generate');
+        $commandTester = new CommandTester($command);
+        $commandTester->execute(array(
+            'command' => $command->getName(),
+            'model'=>'Sonata\AdminBundle\Tests\Fixtures\Bundle\Entity\Foo',
+            '--bundle'=>'AcmeDemoBundle',
+            '--admin'=>'FooAdmin',
+            '--controller'=>'FooAdminController',
+            '--services'=>'admin.yml',
+            '--id'=>'acme_demo_admin.admin.foo',
+            ), array('interactive'=>false,));
+
+        $expectedOutput = '';
+        $expectedOutput .= sprintf('%3$sThe admin class "Sonata\AdminBundle\Tests\Fixtures\Bundle\Admin\FooAdmin" has been generated under the file "%1$s%2$sAdmin%2$sFooAdmin.php".%3$s', $this->tempDirectory, DIRECTORY_SEPARATOR, PHP_EOL);
+        $expectedOutput .= sprintf('%3$sThe controller class "Sonata\AdminBundle\Tests\Fixtures\Bundle\Controller\FooAdminController" has been generated under the file "%1$s%2$sController%2$sFooAdminController.php".%3$s', $this->tempDirectory, DIRECTORY_SEPARATOR, PHP_EOL);
+        $expectedOutput .= sprintf('%3$sThe service "acme_demo_admin.admin.foo" has been appended to the file "%1$s%2$sResources%2$sconfig%2$sadmin.yml".%3$s', $this->tempDirectory, DIRECTORY_SEPARATOR, PHP_EOL);
+
+        $this->assertEquals($expectedOutput, $commandTester->getDisplay());
+
+        $this->assertFileExists($this->tempDirectory.'/Admin/FooAdmin.php');
+        $this->assertFileExists($this->tempDirectory.'/Controller/FooAdminController.php');
+        $this->assertFileExists($this->tempDirectory.'/Resources/config/admin.yml');
+
+        $adminContent = file_get_contents($this->tempDirectory.'/Admin/FooAdmin.php');
+        $this->assertContains('class FooAdmin extends Admin', $adminContent);
+        $this->assertContains('use Sonata\AdminBundle\Admin\Admin;', $adminContent);
+        $this->assertContains('use Sonata\AdminBundle\Datagrid\DatagridMapper;', $adminContent);
+        $this->assertContains('use Sonata\AdminBundle\Datagrid\ListMapper;', $adminContent);
+        $this->assertContains('use Sonata\AdminBundle\Form\FormMapper;', $adminContent);
+        $this->assertContains('use Sonata\AdminBundle\Show\ShowMapper;', $adminContent);
+        $this->assertContains('protected function configureDatagridFilters(DatagridMapper $datagridMapper)', $adminContent);
+        $this->assertContains('protected function configureListFields(ListMapper $listMapper)', $adminContent);
+        $this->assertContains('protected function configureFormFields(FormMapper $formMapper)', $adminContent);
+        $this->assertContains('protected function configureShowFields(ShowMapper $showMapper)', $adminContent);
+
+        $controllerContent = file_get_contents($this->tempDirectory.'/Controller/FooAdminController.php');
+        $this->assertContains('class FooAdminController extends CRUDController', $controllerContent);
+        $this->assertContains('use Sonata\AdminBundle\Controller\CRUDController;', $controllerContent);
+
+        $configServiceContent = file_get_contents($this->tempDirectory.'/Resources/config/admin.yml');
+        $this->assertContains('services:'."\n".'    acme_demo_admin.admin.foo', $configServiceContent);
+        $this->assertContains('            - {name: sonata.admin, manager_type: foo, group: admin, label: Foo}', $configServiceContent);
+    }
+
+    public function testExecuteWithExceptionNoModelManagers()
+    {
+        $this->setExpectedException('RuntimeException', 'There are no model managers registered.');
+
+        $this->command->setContainer($this->container);
+
+        $command = $this->application->find('sonata:admin:generate');
+        $commandTester = new CommandTester($command);
+        $commandTester->execute(array(
+            'command' => $command->getName(),
+            'model'=>'Sonata\AdminBundle\Tests\Fixtures\Bundle\Entity\Foo',
+            '--bundle'=>'AcmeDemoBundle',
+            '--admin'=>'FooAdmin',
+            '--controller'=>'FooAdminController',
+            '--services'=>'admin.yml',
+            '--id'=>'acme_demo_admin.admin.foo',
+            ), array('interactive'=>false,));
+    }
+
+    /**
+     * @dataProvider getExecuteInteractiveTests
+     */
+    public function testExecuteInteractive($modelEntity)
+    {
+        $this->command->setContainer($this->container);
+        $this->container->set('sonata.admin.manager.foo', $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface'));
+        $this->container->set('sonata.admin.manager.bar', $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface'));
+
+        $command = $this->application->find('sonata:admin:generate');
+
+        $dialog = $this->getMock('Sensio\Bundle\GeneratorBundle\Command\Helper\DialogHelper', array('askConfirmation', 'askAndValidate'));
+
+        $dialog->expects($this->any())
+            ->method('askConfirmation')
+            ->will($this->returnCallback(function(OutputInterface $output, $question, $default) {
+                $questionClean = substr($question, 6, strpos($question, '</info>')-6);
+
+                switch ($questionClean) {
+                    case 'Do you want to generate a controller':
+                        return 'yes';
+                        break;
+
+                    case 'Do you want to update the services YAML configuration file':
+                        return 'yes';
+                        break;
+                }
+
+                return $default;
+            }));
+
+        $dialog->expects($this->any())
+            ->method('askAndValidate')
+            ->will($this->returnCallback(function(OutputInterface $output, $question, $validator, $attempts = false, $default = null) use ($modelEntity) {
+
+                $questionClean = substr($question, 6, strpos($question, '</info>')-6);
+
+                switch ($questionClean) {
+                    case 'The fully qualified model class':
+                        return $modelEntity;;
+                        break;
+
+                    case 'The bundle name':
+                        return 'AcmeDemoBundle';
+                        break;
+
+                    case 'The admin class basename':
+                        return 'FooAdmin';
+                        break;
+
+                    case 'The controller class basename':
+                        return 'FooAdminController';
+                        break;
+
+                    case 'The services YAML configuration file':
+                        return 'admin.yml';
+                        break;
+
+                    case 'The admin service ID':
+                        return 'acme_demo_admin.admin.foo';
+                        break;
+
+                    case 'The manager type':
+                        return 'foo';
+                        break;
+                }
+
+                return $default;
+            }));
+
+        $command->getHelperSet()->set($dialog, 'dialog');
+
+        $commandTester = new CommandTester($command);
+        $commandTester->execute(array(
+            'command' => $command->getName(),
+            'model' => $modelEntity,
+            ));
+
+        $expectedOutput = PHP_EOL.str_pad('', 41, ' ').PHP_EOL.'  Welcome to the Sonata admin generator  '.PHP_EOL.str_pad('', 41, ' ').PHP_EOL.PHP_EOL;
+        $expectedOutput .= sprintf('%3$sThe admin class "Sonata\AdminBundle\Tests\Fixtures\Bundle\Admin\FooAdmin" has been generated under the file "%1$s%2$sAdmin%2$sFooAdmin.php".%3$s', $this->tempDirectory, DIRECTORY_SEPARATOR, PHP_EOL);
+        $expectedOutput .= sprintf('%3$sThe controller class "Sonata\AdminBundle\Tests\Fixtures\Bundle\Controller\FooAdminController" has been generated under the file "%1$s%2$sController%2$sFooAdminController.php".%3$s', $this->tempDirectory, DIRECTORY_SEPARATOR, PHP_EOL);
+        $expectedOutput .= sprintf('%3$sThe service "acme_demo_admin.admin.foo" has been appended to the file "%1$s%2$sResources%2$sconfig%2$sadmin.yml".%3$s', $this->tempDirectory, DIRECTORY_SEPARATOR, PHP_EOL);
+
+        $this->assertEquals($expectedOutput, str_replace("\n", PHP_EOL, str_replace(PHP_EOL, "\n", $commandTester->getDisplay())));
+
+        $this->assertFileExists($this->tempDirectory.'/Admin/FooAdmin.php');
+        $this->assertFileExists($this->tempDirectory.'/Controller/FooAdminController.php');
+        $this->assertFileExists($this->tempDirectory.'/Resources/config/admin.yml');
+
+        $adminContent = file_get_contents($this->tempDirectory.'/Admin/FooAdmin.php');
+        $this->assertContains('class FooAdmin extends Admin', $adminContent);
+        $this->assertContains('use Sonata\AdminBundle\Admin\Admin;', $adminContent);
+        $this->assertContains('use Sonata\AdminBundle\Datagrid\DatagridMapper;', $adminContent);
+        $this->assertContains('use Sonata\AdminBundle\Datagrid\ListMapper;', $adminContent);
+        $this->assertContains('use Sonata\AdminBundle\Form\FormMapper;', $adminContent);
+        $this->assertContains('use Sonata\AdminBundle\Show\ShowMapper;', $adminContent);
+        $this->assertContains('protected function configureDatagridFilters(DatagridMapper $datagridMapper)', $adminContent);
+        $this->assertContains('protected function configureListFields(ListMapper $listMapper)', $adminContent);
+        $this->assertContains('protected function configureFormFields(FormMapper $formMapper)', $adminContent);
+        $this->assertContains('protected function configureShowFields(ShowMapper $showMapper)', $adminContent);
+
+        $controllerContent = file_get_contents($this->tempDirectory.'/Controller/FooAdminController.php');
+        $this->assertContains('class FooAdminController extends CRUDController', $controllerContent);
+        $this->assertContains('use Sonata\AdminBundle\Controller\CRUDController;', $controllerContent);
+
+        $configServiceContent = file_get_contents($this->tempDirectory.'/Resources/config/admin.yml');
+        $this->assertContains('services:'."\n".'    acme_demo_admin.admin.foo', $configServiceContent);
+        $this->assertContains('            - {name: sonata.admin, manager_type: foo, group: admin, label: Foo}', $configServiceContent);
+    }
+
+    public function getExecuteInteractiveTests()
+    {
+        return array(
+            array('Sonata\AdminBundle\Tests\Fixtures\Bundle\Entity\Foo'),
+            array('Sonata\AdminBundle\Tests\Fixtures\Entity\Foo'),
+        );
+    }
+
+    /**
+     * @dataProvider getValidateManagerTypeTests
+     */
+    public function testValidateManagerType($expected, $managerType)
+    {
+        $this->command->setContainer($this->container);
+        $this->container->set('sonata.admin.manager.foo', $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface'));
+        $this->container->set('sonata.admin.manager.bar', $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface'));
+
+        $this->assertEquals($expected, $this->command->validateManagerType($managerType));
+    }
+
+    public function getValidateManagerTypeTests()
+    {
+        return array(
+            array('foo', 'foo'),
+            array('bar', 'bar'),
+        );
+    }
+
+    public function testValidateManagerTypeWithException1()
+    {
+        $this->command->setContainer($this->container);
+        $this->setExpectedException('InvalidArgumentException', 'Invalid manager type "foo". Available manager types are "".');
+        $this->command->validateManagerType('foo');
+    }
+
+    public function testValidateManagerTypeWithException2()
+    {
+        $this->command->setContainer($this->container);
+        $this->container->set('sonata.admin.manager.foo', $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface'));
+        $this->container->set('sonata.admin.manager.bar', $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface'));
+
+        $this->setExpectedException('InvalidArgumentException', 'Invalid manager type "baz". Available manager types are "foo", "bar".');
+        $this->command->validateManagerType('baz');
+    }
+
+    public function testValidateManagerTypeWithException3()
+    {
+        $this->setExpectedException('InvalidArgumentException', 'Invalid manager type "baz". Available manager types are "".');
+        $this->command->validateManagerType('baz');
+    }
+}

Tests/Fixtures/Bundle/DemoAdminBundle.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Sonata\AdminBundle\Tests\Fixtures\Bundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class DemoAdminBundle  extends Bundle
+{
+    private $path = null;
+
+    public function setPath($path)
+    {
+        $this->path = $path;
+    }
+
+    public function getPath()
+    {
+        return $this->path;
+    }
+}

Tests/Fixtures/Bundle/Entity/Foo.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Sonata\AdminBundle\Tests\Fixtures\Bundle\Entity;
+
+class Foo
+{
+    private $bar;
+
+    private $baz;
+
+    public function getBar()
+    {
+        return $this->bar;
+    }
+
+    public function setBar($bar)
+    {
+        $this->bar = $bar;
+    }
+
+    public function getBaz()
+    {
+        return $this->baz;
+    }
+
+    public function setBaz($baz)
+    {
+        $this->baz = $baz;
+    }
+}

Tests/Fixtures/Entity/Foo.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Sonata\AdminBundle\Tests\Fixtures\Entity;
+
+class Foo
+{
+    private $bar;
+
+    private $baz;
+
+    public function getBar()
+    {
+        return $this->bar;
+    }
+
+    public function setBar($bar)
+    {
+        $this->bar = $bar;
+    }
+
+    public function getBaz()
+    {
+        return $this->baz;
+    }
+
+    public function setBaz($baz)
+    {
+        $this->baz = $baz;
+    }
+}