From 22f8c572feaa45e1eb73ea7152cade2c26833b26 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Tue, 27 Jan 2015 18:48:50 +0100 Subject: [PATCH] Revert "Multivalue reference tests" --- fixtures/10_Writing/mixinreferenceable.xml | 106 -------------------- tests/10_Writing/MixinReferenceableTest.php | 106 +++++--------------- 2 files changed, 24 insertions(+), 188 deletions(-) delete mode 100644 fixtures/10_Writing/mixinreferenceable.xml diff --git a/fixtures/10_Writing/mixinreferenceable.xml b/fixtures/10_Writing/mixinreferenceable.xml deleted file mode 100644 index 5203aee0..00000000 --- a/fixtures/10_Writing/mixinreferenceable.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - nt:unstructured - - - 2009-04-27T13:00:54.082+02:00 - - - - - nt:unstructured - - - - nt:unstructured - - - - - nt:unstructured - - - - - - - nt:unstructured - - - - - nt:unstructured - - - - - nt:unstructured - - - - - - - nt:unstructured - - - - - nt:unstructured - - - mix:referenceable - - - 842e61c0-09ab-42a9-87c0-308ccc90e6f4 - - - - - nt:unstructured - - - - - - - nt:unstructured - - - - - nt:unstructured - - - mix:referenceable - - - 242e61c0-09ab-42a9-82c0-398cc690e6f4 - - - - - nt:unstructured - - - - - nt:unstructured - - - - - - - nt:unstructured - - - - - - nt:unstructured - - - - diff --git a/tests/10_Writing/MixinReferenceableTest.php b/tests/10_Writing/MixinReferenceableTest.php index 600a2256..d7824823 100644 --- a/tests/10_Writing/MixinReferenceableTest.php +++ b/tests/10_Writing/MixinReferenceableTest.php @@ -1,8 +1,6 @@ renewSession(); // discard changes @@ -29,11 +22,11 @@ public function setUp() public function testReferenceOnNonReferenceableNode() { // Load a non-referenceable node - $nonReferenceableNode = $this->node->getNode('non-referenceable'); + $referenced_node = $this->session->getNode('/tests_general_base/emptyExample'); // Try to reference it - $sourceNode = $this->node->getNode('node'); - $sourceNode->setProperty('reference', $nonReferenceableNode, \PHPCR\PropertyType::WEAKREFERENCE); + $source_node = $this->session->getNode('/tests_general_base/index.txt/jcr:content'); + $source_node->setProperty('reference', $referenced_node, \PHPCR\PropertyType::WEAKREFERENCE); $this->session->save(); } @@ -43,24 +36,24 @@ public function testReferenceOnNonReferenceableNode() public function testReferenceOnNewlyReferenceableNode() { // Load a non-referenceable node and make it referenceable - $referencedNode = $this->node->getNode('node'); - $referencedNode->addMixin('mix:referenceable'); + $referenced_node = $this->session->getNode('/tests_general_base/emptyExample'); + $referenced_node->addMixin('mix:referenceable'); // Re-read the node to be sure it has a UUID $this->saveAndRenewSession(); - $referencedNode = $this->node->getNode('node'); + $referenced_node = $this->session->getNode('/tests_general_base/emptyExample'); // Reference it from another node - $sourceNode = $this->node->getNode('other-node'); - $sourceNode->setProperty('reference', $referencedNode, \PHPCR\PropertyType::WEAKREFERENCE); + $source_node = $this->session->getNode('/tests_general_base/index.txt/jcr:content'); + $source_node->setProperty('reference', $referenced_node, \PHPCR\PropertyType::WEAKREFERENCE); $this->session->save(); - $this->assertInstanceOf('PHPCR\NodeInterface', $sourceNode->getPropertyValue('reference')); + $this->assertInstanceOf('PHPCR\NodeInterface', $source_node->getPropertyValue('reference')); // referrers only required to work once save happened - $this->assertCount(0, $referencedNode->getReferences()); - $this->assertCount(1, $referencedNode->getWeakReferences()); + $this->assertCount(0, $referenced_node->getReferences()); + $this->assertCount(1, $referenced_node->getWeakReferences()); } /** @@ -69,14 +62,14 @@ public function testReferenceOnNewlyReferenceableNode() public function testReferenceOnReferenceableNode() { // Load a referenceable node - $referencedNode = $this->node->getNode('referenceable'); + $referenced_node = $this->session->getNode('/tests_general_base/idExample'); // Reference it from another node - $sourceNode = $this->node->getNode('node'); - $sourceNode->setProperty('oreference', $referencedNode, \PHPCR\PropertyType::WEAKREFERENCE); + $source_node = $this->session->getNode('/tests_general_base/index.txt/jcr:content'); + $source_node->setProperty('oreference', $referenced_node, \PHPCR\PropertyType::WEAKREFERENCE); $this->session->save(); - $this->assertInstanceOf('PHPCR\NodeInterface', $sourceNode->getPropertyValue('oreference')); + $this->assertInstanceOf('PHPCR\NodeInterface', $source_node->getPropertyValue('oreference')); } /** @@ -84,76 +77,25 @@ public function testReferenceOnReferenceableNode() */ public function testUpdateReference() { - $referenced1 = $this->node->getNode('node'); + $referenced1 = $this->session->getNode('/tests_general_base/emptyExample'); $referenced1->addMixin('mix:referenceable'); $this->session->save(); // Load a referenceable node - $referenced2 = $this->node->getNode('referenceable'); + $referenced2 = $this->session->getNode('/tests_general_base/idExample'); // Reference it from another node - $sourceNode = $this->node->getNode('other-node'); + $source_node = $this->session->getNode('/tests_general_base/index.txt/jcr:content'); - $sourceNode->setProperty('reference', $referenced1, \PHPCR\PropertyType::WEAKREFERENCE); + $source_node->setProperty('reference', $referenced1, \PHPCR\PropertyType::WEAKREFERENCE); $this->session->save(); - $sourceNode->setProperty('reference', $referenced2, \PHPCR\PropertyType::WEAKREFERENCE); + $source_node->setProperty('reference', $referenced2, \PHPCR\PropertyType::WEAKREFERENCE); $this->session->save(); - $this->assertSame($referenced2, $sourceNode->getPropertyValue('reference')); - - $this->renewSession(); - $referenced2 = $this->node->getNode('referenceable'); - $this->assertSame($referenced2, $this->node->getNode('other-node')->getProperty('reference')->getValue()); - } - - public function testMultiValueReference() - { - $this->doTestMultiValueReference( - array('one', 'two', 'three'), - array('one', 'two', 'one', 'one', 'two', 'three'), - PropertyType::REFERENCE - ); - } - - public function testMultiValueWeakReference() - { - $this->doTestMultiValueReference( - array('one', 'two', 'three'), - array('one', 'two', 'one', 'one', 'two', 'three'), - PropertyType::WEAKREFERENCE - ); - } + $this->assertSame($referenced2, $source_node->getPropertyValue('reference')); - private function doTestMultiValueReference($nodeNames, $nodeCollectionNames, $referenceType) - { - $baseNode = $this->node; - $nodes = array(); - foreach ($nodeNames as $nodeName) { - $node = $baseNode->addNode($nodeName); - $node->addMixin('mix:referenceable'); - $nodes[$nodeName] = $node; - } - - $this->session->save(); - - $referrer = $baseNode->addNode('referrer'); - - $nodeCollection = array(); - - foreach ($nodeCollectionNames as $nodeCollectionName) { - $nodeCollection[] = $nodes[$nodeCollectionName]; - } - $referrer->setProperty('references', $nodeCollection, $referenceType); - - $this->session->save(); - - $this->renewSession(); - $referrer = $this->node->getNode('referrer'); - $values = $referrer->getProperty('references'); - - foreach ($values as $referencedNode) { - $name = array_shift($nodeCollectionNames); - $this->assertSame($name, $referencedNode->getName()); - } + $session = $this->renewSession(); + $referenced2 = $session->getNode('/tests_general_base/idExample'); + $this->assertSame($referenced2, $session->getProperty('/tests_general_base/index.txt/jcr:content/reference')->getValue()); } public function testSetUuidNewReferenceable()