Changed fixture node-types

Author: dantleech

fixtures/10_Writing/copy.xml

@@ -28,15 +28,15 @@
                     <sv:value>nt:unstructured</sv:value>
                 </sv:property>
 
-                <sv:property sv:name="block_1" sv:type="Reference">
+                <sv:property sv:name="block_1_ref" sv:type="Reference">
                     <sv:value>00000000-0000-0000-0000-000000000001</sv:value>
                 </sv:property>
 
-                <sv:property sv:name="block_2" sv:type="Reference">
+                <sv:property sv:name="block_2_ref" sv:type="Reference">
                     <sv:value>00000000-0000-0000-0000-000000000002</sv:value>
                 </sv:property>
 
-                <sv:property sv:name="block_3" sv:type="WeakReference">
+                <sv:property sv:name="block_3_ref" sv:type="WeakReference">
                     <sv:value>00000000-0000-0000-0000-000000000003</sv:value>
                 </sv:property>
 
@@ -86,7 +86,7 @@
 
         <sv:node sv:name="srcNode">
             <sv:property sv:name="jcr:primaryType" sv:type="Name">
-                <sv:value>nt:folder</sv:value>
+                <sv:value>nt:unstructured</sv:value>
             </sv:property>
             <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
                 <sv:value>mix:referenceable</sv:value>
@@ -130,7 +130,7 @@
         </sv:node>
         <sv:node sv:name="dstNode">
             <sv:property sv:name="jcr:primaryType" sv:type="Name">
-                <sv:value>nt:folder</sv:value>
+                <sv:value>nt:unstructured</sv:value>
             </sv:property>
             <sv:property sv:name="jcr:created" sv:type="Date">
                 <sv:value>2011-05-20T08:23:35.640+02:00</sv:value>

tests/10_Writing/CopyMethodsTest.php

@@ -84,9 +84,9 @@ public function testWorkspaceCopyReference()
         $this->assertNotEquals($snode->getIdentifier(), $dnode->getIdentifier());
 
         $homeNode = $dnode->getNode('home');
-        $block1Ref = $homeNode->getProperty('block_1')->getValue()->getIdentifier();
-        $block2Ref = $homeNode->getProperty('block_2')->getValue()->getIdentifier();
-        $block3Ref = $homeNode->getProperty('block_2')->getValue()->getIdentifier();
+        $block1Ref = $homeNode->getProperty('block_1_ref')->getValue()->getIdentifier();
+        $block2Ref = $homeNode->getProperty('block_2_ref')->getValue()->getIdentifier();
+        $block3Ref = $homeNode->getProperty('block_2_ref')->getValue()->getIdentifier();
 
         $externalRef = $homeNode->getProperty('external_reference')->getValue()->getIdentifier();