Added remaining tests

Author: dantleech

src/PHPCR/Util/Console/Command/WorkspaceExportCommand.php

@@ -67,8 +67,9 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->getHelper('phpcr')->getSession();
+        $repo = $session->getRepository();
 
-        if (!$session->getRepository()->getDescriptor(RepositoryInterface::OPTION_XML_EXPORT_SUPPORTED)) {
+        if (!$repo->getDescriptor(RepositoryInterface::OPTION_XML_EXPORT_SUPPORTED)) {
             $output->writeln('<error>This repository does not support xml export</error>');
 
             return 1;

src/PHPCR/Util/Console/Command/WorkspaceImportCommand.php

@@ -67,16 +67,22 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        /** @var $session \PHPCR\SessionInterface */
+        $filename = $input->getArgument('filename');
+        $parentPath = $input->getOption('parentpath');
         $session = $this->getHelper('phpcr')->getSession();
-        if (! $session->getRepository()->getDescriptor(RepositoryInterface::OPTION_XML_IMPORT_SUPPORTED)) {
+        $repo = $session->getRepository();
+
+        if (!$repo->getDescriptor(RepositoryInterface::OPTION_XML_IMPORT_SUPPORTED)) {
             $output->writeln('<error>This repository does not support xml import</error>');
 
             return 1;
         }
 
-        $parentpath = $input->getOption('parentpath');
-        $session->importXml($parentpath, $input->getArgument('filename'), ImportUUIDBehaviorInterface::IMPORT_UUID_CREATE_NEW);
+        $session->importXml(
+            $parentPath, 
+            $filename, 
+            ImportUUIDBehaviorInterface::IMPORT_UUID_CREATE_NEW
+        );
         $session->save();
 
         return 0;

src/PHPCR/Util/Console/Command/WorkspacePurgeCommand.php

@@ -83,6 +83,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $output->writeln(sprintf('<info>Purging workspace:</info> %s', $workspaceName));
+
+        // Note that this is bad for testing purposes, we HAVE to
+        // use the concrete implementation of NodeHelper and mocking it
+        // is spreading behvioral dependencies. Even if we move it to
+        // the CommandHelper class, we need to test that class and have
+        // the same problem again.
         NodeHelper::purgeWorkspace($session);
         $session->save();
 

src/PHPCR/Util/Console/Command/WorkspaceQueryCommand.php

@@ -57,20 +57,26 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $sql = $input->getArgument('query');
-
-        $session = $this->getHelper('phpcr')->getSession();
-        $qm = $session->getWorkspace()->getQueryManager();
         $language = strtoupper($input->getOption('language'));
         $limit = $input->getOption('limit');
         $offset = $input->getOption('offset');
+
+        $session = $this->getHelper('phpcr')->getSession();
+        $qm = $session->getWorkspace()->getQueryManager();
+
         if (!defined('\PHPCR\Query\QueryInterface::'.$language)) {
-            throw new \RuntimeException("Query language '\\PHPCR\\Query\\QueryInterface::$language' not defined.");
+            throw new \RuntimeException(sprintf(
+                "Query language '\\PHPCR\\Query\\QueryInterface::%s' not defined.",
+                $language
+            ));
         }
 
         $query = $qm->createQuery($sql, constant('\PHPCR\Query\QueryInterface::'.$language));
+
         if ($limit) {
             $query->setLimit($limit);
         }
+
         if ($offset) {
             $query->setOffset($offset);
         }

tests/PHPCR/Tests/Util/Console/Command/BaseCommandTest.php

@@ -13,31 +13,22 @@ abstract class BaseCommandTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->session = $this->getMock('PHPCR\SessionInterface');
-        $this->dumperHelper = $this->getMockBuilder('PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper')
+        $this->workspace = $this->getMock('PHPCR\WorkspaceInterface');
+        $this->repository = $this->getMock('PHPCR\RepositoryInterface');
+
+        $this->node1 = $this->getMockBuilder('Jackalope\Node')
             ->disableOriginalConstructor()
             ->getMock();
+
+        $this->dumperHelper = $this->getMockBuilder(
+            'PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper'
+        )->disableOriginalConstructor()->getMock();
+
         $this->helperSet = new HelperSet(array(
             'session' => new PhpcrHelper($this->session),
             'phpcr_console_dumper' => $this->dumperHelper,
         ));
 
-        $this->application = new Application();
-        $this->application->setHelperSet($this->helperSet);
-
-        for ($i = 1; $i <= 3; $i++) {
-            $varName = 'node'.$i;
-            $this->$varName = $this->getMockBuilder('Jackalope\Node')
-                ->disableOriginalConstructor()
-                ->getMock();
-            if ($i > 1) {
-                $this->$varName->expects($this->any())
-                    ->method('getNodes')
-                    ->will($this->returnValue(array()));
-            }
-        }
-
-        $this->workspace = $this->getMock('PHPCR\WorkspaceInterface');
-
         $this->session->expects($this->any())
             ->method('getWorkspace')
             ->will($this->returnValue($this->workspace));
@@ -46,7 +37,8 @@ public function setUp()
             ->method('getName')
             ->will($this->returnValue('test'));
 
-        $this->repository = $this->getMock('PHPCR\RepositoryInterface');
+        $this->application = new Application();
+        $this->application->setHelperSet($this->helperSet);
     }
 
     public function executeCommand($name, $args)

tests/PHPCR/Tests/Util/Console/Command/NodeDumpCommandTest.php

@@ -23,12 +23,6 @@ public function testCommand()
         $this->session->expects($this->once())
             ->method('getNode')
             ->will($this->returnValue($this->node1));
-        $this->node1->expects($this->any())
-            ->method('getNodes')
-            ->will($this->returnValue(array(
-                $this->node1,
-                $this->node2,
-            )));
 
         $this->application->add(new NodeDumpCommand());
 

tests/PHPCR/Tests/Util/Console/Command/NodeTouchCommandTest.php

@@ -19,13 +19,14 @@ public function setUp()
 
     public function testTouch()
     {
-        $test = $this;
+        $node = $this->node1;
+
         $this->session->expects($this->exactly(2))
             ->method('getNode')
-            ->will($this->returnCallback(function ($path) use ($test) {
+            ->will($this->returnCallback(function ($path) use ($node) {
                 switch ($path) {
                     case '/':
-                        return $this->node1;
+                        return $node;
                     case '/cms':
                         return null;
                 }
@@ -42,4 +43,3 @@ public function testTouch()
         ));
     }
 }
-

tests/PHPCR/Tests/Util/Console/Command/NodeTypeListCommandTest.php

@@ -31,5 +31,3 @@ public function testNodeTypeList()
         ));
     }
 }
-
-

tests/PHPCR/Tests/Util/Console/Command/NodeTypeRegisterCommandTest.php

@@ -32,6 +32,3 @@ public function testNodeTypeList()
         ));
     }
 }
-
-
-

tests/PHPCR/Tests/Util/Console/Command/WorkspaceCreateCommandTest.php

@@ -35,7 +35,3 @@ public function testNodeTypeList()
         ));
     }
 }
-
-
-
-