Fixed command and tests

dantleech · dantleech · commit 4d826efb4c8e · 2014-04-09T21:09:44.000+02:00
diff --git a/features/node_clone.feature b/features/node_clone.feature
@@ -12,19 +12,19 @@ Feature: Clone a node from a given workspace to the current workspace
 
     Scenario: Clone node
         Given the current workspace is "default"
-        And I execute the "workspace:node:clone default_1 /cms/articles/article1 /cms/clone" command
+        And I execute the "node:clone /cms/articles/article1 /cms/clone default_1" command
         Then the command should not fail
         And I save the session
         And there should exist a node at "/cms/clone"
 
     Scenario: Clone onto existing
-        Given I execute the "workspace:node:clone default_1 /cms/articles/article1 /cms/articles" command
+        Given I execute the "node:clone /cms/articles/article1 /cms/articles default_1" command
         Then the command should fail
         And I should see the following:
         """
         Node already exists at destination
         """
 
     Scenario: Clone onto existing but remove
-        Given I execute the "workspace:node:clone --remove-existing default_1 /cms/articles/article1 /cms/articles/article1" command
+        Given I execute the "node:clone --remove-existing /cms/articles/article1 /cms/articles/article1 default_1" command
         Then the command should not fail
diff --git a/features/node_copy.feature b/features/node_copy.feature
@@ -11,12 +11,12 @@ Feature: Copy a node from a given workspace to the current workspace
         And I purge the current workspace
 
     Scenario: Copy node from a different workspace
-        Given I execute the "workspace:node:copy /tests_general_base/index.txt /index.txt default_1" command
+        Given I execute the "node:copy /tests_general_base/index.txt /index.txt default_1" command
         Then the command should not fail
         And there should exist a node at "/index.txt"
 
     Scenario: Copy node in the same workspace
-        And I execute the "workspace:node:copy /tests_general_base/index.txt /tests_general_base/index.txt.2" command
+        Given I execute the "node:copy /tests_general_base/index.txt /tests_general_base/index.txt.2" command
         Then the command should not fail
         And I save the session
         And there should exist a node at "/tests_general_base/index.txt.2"
diff --git a/features/node_corresponding.feature b/features/node_corresponding.feature
@@ -11,9 +11,9 @@ Feature: Display the path of any corresponding node in a given workspace
         And the "session_data.xml" fixtures are loaded
         And the current workspace is "default"
 
-    Scenario: Rename a node
+    Scenario: Show corresponding nodes
         Given the current node is "/tests_general_base/idExample"
-        And I execute the "node:corresponding default" command
+        And I execute the "node:corresponding . default" command
         Then the command should not fail
         And I should see the following:
         """
diff --git a/features/node_move.feature b/features/node_move.feature
@@ -8,8 +8,16 @@ Feature: Move a node in the current session
         And the "session_data.xml" fixtures are loaded
 
     Scenario: Move node
-        Given I execute the "session:node:move /tests_general_base/index.txt /foobar" command
+        Given I execute the "node:move /tests_general_base/index.txt /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"
+        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"
diff --git a/features/node_property_edit.feature b/features/node_property_edit.feature
@@ -14,18 +14,18 @@ Feature: Edit a single property
 
         Examples:
             | command | 
-            | session:property:edit /properties/multivalue 1|
+            | node:property:edit /properties/multivalue 1|
 
     Scenario: Edit multivalue property, no index
-        Given I execute the "session:property:edit /properties/multivalue" command
+        Given I execute the "node:property:edit /properties/multivalue" command
         Then the command should fail
         And I should see the following:
         """
         You specified a multivalue property but did not provide an index
         """
 
     Scenario: Edit multivalue property, out of range
-        Given I execute the "session:property:edit /properties/multivalue 100" command
+        Given I execute the "node:property:edit /properties/multivalue 100" command
         Then the command should fail
         And I should see the following:
         """
diff --git a/features/node_property_remove.feature b/features/node_property_remove.feature
@@ -8,13 +8,13 @@ Feature: Remove a single property at a specified path
         And the "cms.xml" fixtures are loaded
 
     Scenario: Remove a property
-        Given I execute the "session:property:remove /cms/articles/article1/title" command
+        Given I execute the "node:property:remove /cms/articles/article1/title" command
         Then the command should not fail
         And I save the session
         And there should not exist a property at "/cms/articles/article1/title"
 
     Scenario: Try and remove a node
-        And I execute the "session:property:remove /tests_general_base" command
+        And I execute the "node:property:remove /tests_general_base" command
         Then the command should fail
         And I should see the following:
         """
diff --git a/features/node_property_show.feature b/features/node_property_show.feature
@@ -8,7 +8,7 @@ Feature: Display the contents of a single property
         And the "session_data.xml" fixtures are loaded
 
     Scenario: Show binary property
-        Given I execute the "session:property:show /tests_general_base/index.txt/jcr:content/jcr:data" command
+        Given I execute the "node:property:show /tests_general_base/index.txt/jcr:content/jcr:data" command
         Then the command should not fail
         And I should see the following:
         """
@@ -29,15 +29,15 @@ hello world
 """
 
     Scenario: Show date property
-        Given I execute the "session:property:show /tests_general_base/index.txt/jcr:content/mydateprop" command
+        Given I execute the "node:property:show /tests_general_base/index.txt/jcr:content/mydateprop" command
         Then the command should not fail
         And I should see the following:
         """
 2011-04-21T14:34:20+01:00
 """
 
     Scenario: Try to show non-existing property
-        Given I execute the "session:property:show /this/path/does/not/exist" command
+        Given I execute the "node:property:show /this/path/does/not/exist" command
         Then the command should fail
         And I should see the following:
         """
diff --git a/features/node_set.feature b/features/node_set.feature
@@ -16,10 +16,10 @@ Feature: Set a node property
 
         Examples:
             | command | name | type |
-            | node:set uri http://foobar | uri | http://foobar |
-            | node:set double 12.12 | double | 12.12 |
-            | node:set long 123 | long | 123 |
-            | node:set thisisnew foobar --type=string | /properties/thisisnew | foobar |
+            | node:property:set uri http://foobar | uri | http://foobar |
+            | node:property:set double 12.12 | double | 12.12 |
+            | node:property:set long 123 | long | 123 |
+            | node:property:set thisisnew foobar --type=string | /properties/thisisnew | foobar |
 
     Scenario: Update a property but do not specify the type
         Given I execute the "node:set /properties/decimal 1234" command
diff --git a/features/node_shared_remove.feature b/features/node_shared_remove.feature
@@ -12,7 +12,7 @@ Feature: Remove the current node from any shared set to which it belongs
 
     Scenario: Remove the current node and all of its shared paths
         Given the current node is "/foobar"
-        And I execute the "node:shared:remove" command
+        And I execute the "node:shared:remove ." command
         Then the command should fail
         And I should see the following:
         """
diff --git a/features/node_shared_show.feature b/features/node_shared_show.feature
@@ -12,7 +12,7 @@ Feature: Show the current nodes shared set
 
     Scenario: Show the current nodes shared set
         Given the current node is "/foobar"
-        And I execute the "node:shared:show" command
+        And I execute the "node:shared:show ." command
         Then the command should fail
         And I should see the following:
         """
diff --git a/features/session_node_show.feature b/features/session_node_show.feature
diff --git a/features/version_checkout.feature b/features/version_checkout.feature
@@ -11,7 +11,7 @@ Feature: Checkout a version
         Given I execute the "version:checkout /tests_version_base/versioned" command
         Then the command should not fail
         And the current node is "/tests_version_base/versioned"
-        And I execute the "node:info" command
+        And I execute the "node:info ." command
         Then I should see the following:
         """
         | Checked out?      | yes
diff --git a/features/version_checkpoint.feature b/features/version_checkpoint.feature
@@ -10,18 +10,18 @@ Feature: Checkpoint
     Scenario: Checkpoint a a given node
         Given I execute the following commands:
             | cd /tests_version_base/versioned |
-            | node:set foo bar |
+            | node:property:set foo bar |
             | session:save |
             | version:checkpoint /tests_version_base/versioned |
-            | node:set foo baz |
+            | node:property:set foo baz |
             | session:save |
             | version:checkpoint /tests_version_base/versioned |
         Then the command should not fail
         And I should see the following:
         """
         Version: 1.1
         """
-        And I execute the "node:info" command
+        And I execute the "node:info ." command
         Then I should see the following:
         """
         | Checked out?      | yes
diff --git a/features/version_remove.feature b/features/version_remove.feature
@@ -11,11 +11,11 @@ Feature: Remove node version
         Given I execute the following commands:
             | cd /tests_version_base/versioned |
             | version:checkout /tests_version_base/versioned |
-            | node:set foo baz |
+            | node:property:set foo baz |
             | session:save |
             | version:checkin /tests_version_base/versioned |
             | version:checkout /tests_version_base/versioned |
-            | node:set foo bar |
+            | node:property:set foo bar |
             | session:save |
             | version:checkin /tests_version_base/versioned |
         And I execute the "version:remove /tests_version_base/versioned 1.0" command
diff --git a/features/version_restore.feature b/features/version_restore.feature
@@ -10,10 +10,10 @@ Feature: Restore a version
     Scenario: Restore node version
         Given I execute the following commands:
             | cd /tests_version_base/versioned |
-            | node:set foo initalbar |
+            | node:property:set foo initalbar |
             | session:save |
             | version:checkpoint /tests_version_base/versioned |
-            | node:set foo baz |
+            | node:property:set foo baz |
             | session:save |
             | version:checkpoint /tests_version_base/versioned |
         And I execute the "version:restore /tests_version_base/versioned 1.0" command
diff --git a/src/PHPCR/Shell/Console/Application/ShellApplication.php b/src/PHPCR/Shell/Console/Application/ShellApplication.php
@@ -30,7 +30,7 @@
 use PHPCR\Shell\Console\Command\Phpcr\NodeReferencesCommand;
 use PHPCR\Shell\Console\Command\Phpcr\NodeRemoveCommand;
 use PHPCR\Shell\Console\Command\Phpcr\NodeRenameCommand;
-use PHPCR\Shell\Console\Command\Phpcr\NodeSetCommand;
+use PHPCR\Shell\Console\Command\Phpcr\NodePropertySetCommand;
 use PHPCR\Shell\Console\Command\Phpcr\NodeSetPrimaryTypeCommand;
 use PHPCR\Shell\Console\Command\Phpcr\NodeSharedRemoveCommand;
 use PHPCR\Shell\Console\Command\Phpcr\NodeSharedShowCommand;
@@ -57,7 +57,7 @@
 use PHPCR\Shell\Console\Command\Phpcr\SessionLogoutCommand;
 use PHPCR\Shell\Console\Command\Phpcr\SessionNamespaceListCommand;
 use PHPCR\Shell\Console\Command\Phpcr\SessionNamespaceSetCommand;
-use PHPCR\Shell\Console\Command\Phpcr\SessionNodeMoveCommand;
+use PHPCR\Shell\Console\Command\Phpcr\NodeMoveCommand;
 use PHPCR\Shell\Console\Command\Phpcr\SessionNodeShowCommand;
 use PHPCR\Shell\Console\Command\Phpcr\NodePropertyEditCommand;
 use PHPCR\Shell\Console\Command\Phpcr\NodePropertyRemoveCommand;
@@ -76,8 +76,8 @@
 use PHPCR\Shell\Console\Command\Phpcr\WorkspaceNamespaceListCommand;
 use PHPCR\Shell\Console\Command\Phpcr\WorkspaceNamespaceRegisterCommand;
 use PHPCR\Shell\Console\Command\Phpcr\WorkspaceNamespaceUnregisterCommand;
-use PHPCR\Shell\Console\Command\Phpcr\WorkspaceNodeCloneCommand;
-use PHPCR\Shell\Console\Command\Phpcr\WorkspaceNodeCopyCommand;
+use PHPCR\Shell\Console\Command\Phpcr\NodeCloneCommand;
+use PHPCR\Shell\Console\Command\Phpcr\NodeCopyCommand;
 use PHPCR\Shell\Console\Command\Phpcr\WorkspaceUseCommand;
 use PHPCR\Shell\Console\Command\Shell\ChangePathCommand;
 use PHPCR\Shell\Console\Command\Shell\ExitCommand;
@@ -92,7 +92,6 @@
 use PHPCR\Shell\PhpcrSession;
 use PHPCR\SimpleCredentials;
 use PHPCR\Util\Console\Command\NodeDumpCommand;
-use PHPCR\Util\Console\Command\NodeMoveCommand;
 use PHPCR\Util\Console\Command\NodeTouchCommand;
 use PHPCR\Util\Console\Command\NodeTypeRegisterCommand;
 use PHPCR\Util\Console\Command\NodesUpdateCommand;
@@ -181,8 +180,8 @@ public function init()
         $this->add(new WorkspaceCreateCommand());
         $this->add(new WorkspaceDeleteCommand());
         $this->add(new WorkspaceListCommand());
-        $this->add(new WorkspaceNodeCloneCommand());
-        $this->add(new WorkspaceNodeCopyCommand());
+        $this->add(new NodeCloneCommand());
+        $this->add(new NodeCopyCommand());
         $this->add(new WorkspaceNamespaceListCommand());
         $this->add(new WorkspaceNamespaceRegisterCommand());
         $this->add(new WorkspaceNamespaceUnregisterCommand());
@@ -201,9 +200,10 @@ public function init()
         $this->add(new NodeCreateCommand());
         $this->add(new NodeCorrespondingCommand());
         $this->add(new NodeDefinitionCommand());
-        $this->add(new NodeSetCommand());
+        $this->add(new NodePropertySetCommand());
         $this->add(new NodeSetPrimaryTypeCommand());
         $this->add(new NodeRenameCommand());
+        $this->add(new NodeMoveCommand());
         $this->add(new NodeMixinAddCommand());
         $this->add(new NodeMixinRemoveCommand());
         $this->add(new NodeOrderBeforeCommand());
@@ -239,9 +239,6 @@ public function init()
 
         $this->add(new ListTreeCommand());
 
-        $this->add($this->wrap(new NodeMoveCommand())
-            ->setName('mv')
-        );
         $this->add($this->wrap(new NodeListCommand())
             ->setName('ls')
         );
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeCloneCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/NodeCloneCommand.php
@@ -8,15 +8,15 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
-class WorkspaceNodeCloneCommand extends Command
+class NodeCloneCommand extends Command
 {
     protected function configure()
     {
-        $this->setName('workspace:node:clone');
+        $this->setName('node:clone');
         $this->setDescription('Copy a node from one workspace to another');
-        $this->addArgument('srcWorkspace', InputArgument::REQUIRED, 'If specified, copy from this workspace');
         $this->addArgument('srcAbsPath', InputArgument::REQUIRED, 'Absolute path to source node');
         $this->addArgument('destAbsPath', InputArgument::REQUIRED, 'Absolute path to destination node');
+        $this->addArgument('srcWorkspace', InputArgument::OPTIONAL, 'If specified, copy from this workspace');
         $this->addOption('remove-existing', null, InputOption::VALUE_NONE, 'Remove existing nodes');
         $this->setHelp(<<<HERE
 Clones the subgraph at the node <info>srcAbsPath</info> in
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeCopyCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/NodeCopyCommand.php
@@ -7,12 +7,12 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 
-class WorkspaceNodeCopyCommand extends Command
+class NodeCopyCommand extends Command
 {
     protected function configure()
     {
-        $this->setName('workspace:node:copy');
-        $this->setDescription('Copy a node from one workspace to another');
+        $this->setName('node:copy');
+        $this->setDescription('Copy a node');
         $this->addArgument('srcAbsPath', InputArgument::REQUIRED, 'Absolute path to source node');
         $this->addArgument('destAbsPath', InputArgument::REQUIRED, 'Absolute path to destination node');
         $this->addArgument('srcWorkspace', InputArgument::OPTIONAL, 'If specified, copy from this workspace');
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeMoveCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/NodeMoveCommand.php
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodePropertySetCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/NodePropertySetCommand.php
