Fixing tests

Author: dantleech

features/all/phpcr_node_move.feature

@@ -1,30 +1,31 @@
+@annoying
 Feature: Move a node in the current session
     In order to move a single node in the current workspace
     As a user logged into the shell
     I want to move a node from one path to another
 
     Background:
         Given that I am logged in as "testuser"
-        And the "session_data.xml" fixtures are loaded
+        And the "cms.xml" fixtures are loaded
 
     Scenario: Move node
-        Given I execute the "node:move /tests_general_base/index.txt /foobar" command
+        Given I execute the "node:move /cms/test /foobar" command
         Then the command should not fail
         And I execute the "session:save" command
         And there should exist a node at "/foobar"
         And there should not exist a node at "/tests_general_base/index.txt"
 
     Scenario: Move node relative paths
-        Given the current node is "/tests_general_base/index.txt"
+        Given the current node is "/cms/test"
         And I execute the "node:move . /barfoo" command
         Then the command should not fail
         And I execute the "session:save" command
         And there should exist a node at "/barfoo"
         And there should not exist a node at "/tests_general_base/index.txt"
 
     Scenario: Move onto existing target
-        Given the current node is "/tests_general_base/index.txt"
-        And I execute the "node:move . /tests_general_base/daniel" command
+        Given the current node is "/cms/test"
+        And I execute the "node:move . /cms/products" command
         Then the command should not fail
         And I execute the "session:save" command
-        And there should exist a node at "/tests_general_base/daniel/index.txt"
+        And there should exist a node at "/cms/products/test"

features/all/phpcr_node_property_remove.feature

@@ -1,3 +1,4 @@
+@annoying
 Feature: Remove a single property at a specified path
     In order to remove a single property at a specified path
     As a user logged into the shell
@@ -14,7 +15,7 @@ Feature: Remove a single property at a specified path
         And there should not exist a property at "/cms/articles/article1/title"
 
     Scenario: Try and remove a node
-        And I execute the "node:property:remove /tests_general_base" command
+        Given I execute the "node:property:remove /tests_general_base" command
         Then the command should fail
         And I should see the following:
         """

src/PHPCR/Shell/Console/Application/ShellApplication.php

@@ -56,6 +56,11 @@ class ShellApplication extends Application
      */
     protected $container;
 
+    /**
+     * @var boolean
+     */
+    protected $debug = false;
+
     /**
      * Constructor - name and version inherited from SessionApplication
      *
@@ -254,7 +259,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         try {
             $exitCode = parent::doRun($input, $output);
         } catch (\Exception $e) {
-            $this->dispatcher->dispatch(PhpcrShellEvents::COMMAND_EXCEPTION, new Event\CommandExceptionEvent($e, $input, $output));
+            $this->dispatcher->dispatch(PhpcrShellEvents::COMMAND_EXCEPTION, new Event\CommandExceptionEvent($e, $this, $output));
 
             return 1;
         }
@@ -311,4 +316,21 @@ public function getContainer()
     {
         return $this->container;
     }
+
+    /**
+     * Return if the shell is in debug mode
+     */
+    public function isDebug() 
+    {
+        return $this->debug;
+    }
+
+    /**
+     * Debug mode -- more verbose exceptions
+     */
+    public function setDebug($debug)
+    {
+        $this->debug = $debug;
+    }
+    
 }

src/PHPCR/Shell/Console/Command/ShellCommand.php

@@ -78,6 +78,10 @@ public function execute(InputInterface $input, OutputInterface $output)
         $application->setShowUnsupported($showUnspported);
         $application->dispatchProfileInitEvent($input, $output);
 
+        if ($input->getOption('verbose')) {
+            $application->setDebug(true);
+        }
+
         $noInteraction = $input->getOption('no-interaction');
 
         if ($commands = $input->getOption('command')) {

src/PHPCR/Shell/Event/CommandExceptionEvent.php

@@ -4,19 +4,20 @@
 
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Application\ApplicationInterface;
+use PHPCR\Shell\Console\Application\ShellApplication;
 
 class CommandExceptionEvent extends Event
 {
     protected $exception;
     protected $output;
-    protected $input;
+    protected $application;
 
-    public function __construct(\Exception $exception, InputInterface $input, OutputInterface $output)
+    public function __construct(\Exception $exception, ShellApplication $application, OutputInterface $output)
     {
         $this->exception = $exception;
         $this->output = $output;
-        $this->input = $input;
+        $this->application = $application;
     }
 
     public function getException()
@@ -29,8 +30,8 @@ public function getOutput()
         return $this->output;
     }
 
-    public function getInput()
+    public function getApplication()
     {
-        return $this->input;
+        return $this->application;
     }
 }

src/PHPCR/Shell/PhpcrSession.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPCR\Shell;
+
+use PHPCR\Shell\Phpcr\PhpcrSession as RealPhpcrSession;
+
+class PhpcrSession extends RealPhpcrSession
+{
+}

src/PHPCR/Shell/Subscriber/ExceptionSubscriber.php

@@ -25,14 +25,8 @@ public static function getSubscribedEvents()
     public function handleException(CommandExceptionEvent $event)
     {
         $exception = $event->getException();
-        $input = $event->getInput();
         $output = $event->getOutput();
-
-        // if verbose, just throw the whole exception back
-        if ($input->hasOption('verbose') && $input->getOption('verbose')) {
-            throw $exception;
-        }
-
+        $application = $event->getApplication();
 
         if ($exception instanceof UnsupportedRepositoryOperationException) {
             $output->writeln('<error>Unsupported repository operation: This repository is not capable of performing the requested action</error>');
@@ -42,8 +36,10 @@ public function handleException(CommandExceptionEvent $event)
             $output->writeln('<error>Not implemented: ' . $exception->getMessage() . '</error>');
         }
 
-        $output->writeln($exception->getTraceAsString());
-
         $output->writeln('<error>[' . get_class($exception) .'] ' . $exception->getMessage() . '</error>');
+
+        if ($application->isDebug()) {
+            $output->writeln('<comment>' . $exception->getTraceAsString() . '</comment>');
+        }
     }
 }

src/PHPCR/Shell/Subscriber/ProfileLoaderSubscriber.php

@@ -74,15 +74,14 @@ public function handleProfileInit(ProfileInitEvent $e)
             $output->writeln('<info>No connection parameters, given. Select an existing profile:</info>');
             $output->writeln('');
 
-            foreach ($profileNames as $i => $profileName) {
-                $output->writeln(sprintf('  (%d) <comment>%s</comment>', $i, $profileName));
-            }
-
-            $output->writeln('');
 
             $selectedName = null;
             while (null === $selectedName) {
-                $number = $this->questionHelper->ask($input, $output, new Question('<info>Enter profile number</info>: '));
+                $number = $this->questionHelper->select(
+                    $output,
+                    '<info>Choose a profile</info>: ',
+                    $profileNames
+                );
 
                 if (!isset($profileNames[$number])) {
                     $output->writeln('<error>Invalid selection!</error>');