Cleaning up test for copy from other workspace

Author: dbu

fixtures/10_Writing/copy.xml

@@ -64,6 +64,11 @@
       </sv:property>
     </sv:node>
   </sv:node>
+  <sv:node sv:name="testWorkspaceCopyOther">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>nt:unstructured</sv:value>
+    </sv:property>
+  </sv:node>
   <sv:node sv:name="testCopyProperty">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
       <sv:value>nt:folder</sv:value>

fixtures/general/additionalWorkspace.xml

@@ -61,14 +61,17 @@
       </sv:property>
     </sv:node>
   </sv:node>
-  <sv:node sv:name="testCopyFromAnotherWorkspace">
+  <sv:node sv:name="testWorkspaceCopyOther">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
       <sv:value>nt:unstructured</sv:value>
     </sv:property>
     <sv:node sv:name="node">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
         <sv:value>nt:unstructured</sv:value>
       </sv:property>
+      <sv:property sv:name="x" sv:type="String">
+        <sv:value>y</sv:value>
+      </sv:property>
     </sv:node>
   </sv:node>
 </sv:node>

tests/10_Writing/CopyMethodsTest.php

@@ -71,18 +71,20 @@ public function testWorkspaceCopy()
         $this->assertNotEquals($sfile->getPropertyValue('jcr:data'), $dfile->getPropertyValue('jcr:data'));
     }
 
-    public function testCopyFromAnotherWorkspace()
+    public function testWorkspaceCopyOther()
     {
-        self::$staticSharedFixture['ie']->import('general/additionalWorkspace', 'additionalWorkspace');
-        $src = '/tests_additional_workspace/testCopyNoSuchWorkspace/node';
-        $dst = '/tests_write_manipulation_copy/testCopyFromAnotherWorkspace/foobar';
-
-        $this->ws->copy($src, $dst, 'testsAdditional');
-        $node = $this->session->getNode($dest);
+        self::$staticSharedFixture['ie']->import('general/additionalWorkspace', 'testsAdditional');
+        $src = '/tests_additional_workspace/testWorkspaceCopyOther/node';
+        $dst = '/tests_write_manipulation_copy/testWorkspaceCopyOther/foobar';
+
+        $this->ws->copy($src, $dst, self::$loader->getOtherWorkspaceName());
+        $node = $this->session->getNode($dst);
+        $this->assertTrue($node->hasProperty('x'));
+        $this->assertEquals('y', $node->getPropertyValue('x'));
     }
 
     /**
-     * @expectedException   \PHPCR\NoSuchWorkspaceException
+     * @expectedException \PHPCR\NoSuchWorkspaceException
      */
     public function testCopyNoSuchWorkspace()
     {
@@ -91,21 +93,16 @@ public function testCopyNoSuchWorkspace()
         $this->ws->copy($src, $dst, 'inexistentworkspace');
     }
 
-    public function testWorkspaceCopyBackend()
-    {
-        $this->markTestIncomplete('TODO: just do');
-    }
-
     /**
-     * @expectedException   \PHPCR\RepositoryException
+     * @expectedException \PHPCR\RepositoryException
      */
     public function testCopyRelativePaths()
     {
         $this->ws->copy('foo/moo', 'bar/mar');
     }
 
     /**
-     * @expectedException   \PHPCR\RepositoryException
+     * @expectedException \PHPCR\RepositoryException
      */
     public function testCopyInvalidDstPath()
     {
@@ -115,7 +112,7 @@ public function testCopyInvalidDstPath()
     }
 
     /**
-     * @expectedException   \PHPCR\RepositoryException
+     * @expectedException \PHPCR\RepositoryException
      */
     public function testCopyProperty()
     {
@@ -125,7 +122,7 @@ public function testCopyProperty()
     }
 
     /**
-     * @expectedException   \PHPCR\PathNotFoundException
+     * @expectedException \PHPCR\PathNotFoundException
      */
     public function testCopySrcNotFound()
     {
@@ -135,7 +132,7 @@ public function testCopySrcNotFound()
     }
 
     /**
-     * @expectedException   \PHPCR\PathNotFoundException
+     * @expectedException \PHPCR\PathNotFoundException
      */
     public function testCopyDstParentNotFound()
     {
@@ -147,7 +144,7 @@ public function testCopyDstParentNotFound()
     /**
      * Verifies that there is no update-on-copy if the target node already exists
      *
-     * @expectedException   \PHPCR\ItemExistsException
+     * @expectedException \PHPCR\ItemExistsException
      */
     public function testCopyNoUpdateOnCopy()
     {