Reinstated multivalue tests

Author: dantleech

fixtures/10_Writing/mixinreferenceable.xml

@@ -102,5 +102,32 @@
             <sv:value>nt:unstructured</sv:value>
         </sv:property>
     </sv:node>
+
+    <sv:node sv:name="testSetUuidNewReferenceable">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>nt:unstructured</sv:value>
+        </sv:property>
+    </sv:node>
+
+    <sv:node sv:name="testSetUuidNewButNonreferenceable">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>nt:unstructured</sv:value>
+        </sv:property>
+    </sv:node>
+
+    <sv:node sv:name="testSetUuidButNotReferenceableExisting">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>nt:unstructured</sv:value>
+        </sv:property>
+    </sv:node>
+
+    <sv:node sv:name="testSetUuidReferenceableButExisting">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>nt:unstructured</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+            <sv:value>mix:referenceable</sv:value>
+        </sv:property>
+    </sv:node>
 </sv:node>
 

tests/10_Writing/MixinReferenceableTest.php

@@ -159,15 +159,15 @@ private function doTestMultiValueReference($nodeNames, $nodeCollectionNames, $re
     public function testSetUuidNewReferenceable()
     {
         $uuid = 'aaaa61c0-09ab-42a9-87c0-308ccc93aaaa';
-        $node = $this->session->getNode('/tests_general_base/index.txt/jcr:content')->addNode('newId', 'nt:unstructured');
+        $node = $this->node->addNode('newId', 'nt:unstructured');
         $node->addMixin('mix:referenceable');
         $node->setProperty('jcr:uuid', $uuid);
         $this->session->save();
         $this->assertSame($uuid, $node->getIdentifier());
 
         $session = $this->renewSession();
 
-        $node = $session->getNode('/tests_general_base/index.txt/jcr:content/newId');
+        $node = $this->node->getNode('newId');
         $this->assertSame($uuid, $node->getIdentifier());
     }
 
@@ -176,7 +176,7 @@ public function testSetUuidNewReferenceable()
      */
     public function testSetUuidNewButNonreferenceable()
     {
-        $node = $this->session->getNode('/tests_general_base/index.txt/jcr:content')->addNode('newNonref', 'nt:unstructured');
+        $node = $this->node->addNode('newNonref', 'nt:unstructured');
         $node->setProperty('jcr:uuid', 'bbbb61c0-09ab-42a9-87c0-308ccc93aaaa');
     }
 
@@ -185,16 +185,14 @@ public function testSetUuidNewButNonreferenceable()
      */
     public function testSetUuidReferenceableButExisting()
     {
-        $node = $this->session->getNode('/tests_general_base/idExample');
-        $node->setProperty('jcr:uuid', 'cccc61c0-09ab-42a9-87c0-308ccc93aaaa');
+        $this->node->setProperty('jcr:uuid', 'cccc61c0-09ab-42a9-87c0-308ccc93aaaa');
     }
 
     /**
      * @expectedException \PHPCR\NodeType\ConstraintViolationException
      */
     public function testSetUuidButNotReferenceableExisting()
     {
-        $node = $this->session->getNode('/tests_general_base/index.txt/jcr:content');
-        $node->setProperty('jcr:uuid', 'dddd61c0-09ab-42a9-87c0-308ccc93aaaa');
+        $this->node->setProperty('jcr:uuid', 'dddd61c0-09ab-42a9-87c0-308ccc93aaaa');
     }
 }