Merge pull request #106 from phpcr/jcr-sync

Jcr sync

Author: dbu

fixtures/12_Observation/manager.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node
+        xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
+        xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        xmlns:jcr="http://www.jcp.org/jcr/1.0"
+        xmlns:sv="http://www.jcp.org/jcr/sv/1.0"
+        sv:name="tests_observation_manager">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>nt:unstructured</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:created" sv:type="Date">
+        <sv:value>2013-04-27T13:00:54.082+02:00</sv:value>
+    </sv:property>
+    <sv:node sv:name="testGetUnfilteredEventJournal">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>nt:unstructured</sv:value>
+        </sv:property>
+    </sv:node>
+    <sv:node sv:name="testFilteredEventJournal">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>nt:unstructured</sv:value>
+        </sv:property>
+    </sv:node>
+    <sv:node sv:name="testFilteredEventJournalUuid">
+        <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:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>842e61c0-09ab-42a9-4444-308ccc90e6f4</sv:value>
+        </sv:property>
+    </sv:node>
+    <sv:node sv:name="testFilteredEventJournalNodeType">
+        <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:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>842e61c0-09ab-42a9-3333-308ccc90e6f4</sv:value>
+        </sv:property>
+    </sv:node>
+    <sv:node sv:name="testUserData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>nt:unstructured</sv:value>
+        </sv:property>
+    </sv:node>
+</sv:node>

tests/05_Reading/NodeReadMethodsTest.php

@@ -149,9 +149,15 @@ public function testGetNodeRepositoryException()
 
     public function testGetNodes()
     {
-        $node1 = $this->rootNode->getNode('tests_general_base');
-        $iterator = $this->rootNode->getNodes();
+        $parent = $this->rootNode->getNode('tests_general_base');
+        $iterator = $parent->getNodes();
         $this->assertInstanceOf('Iterator', $iterator);
+        $this->assertInstanceOf('Countable', $iterator);
+
+        $this->assertCount(8, $iterator);
+        foreach($iterator as $node) {
+            $this->assertInstanceOf('PHPCR\NodeInterface', $node);
+        }
     }
 
     /**
@@ -175,19 +181,44 @@ public function testGetNodesPattern()
         $this->assertNotContains('index.txt', $nodes);
     }
 
-    public function testGetNodesPatternAdvanced()
+    public function testGetNodesTypeFilter()
     {
         $this->node = $this->rootNode->getNode('tests_general_base');
-        $iterator = $this->node->getNodes("test:* | idExample");
+        $iterator = $this->node->getNodes(null, 'nt:file');
         $nodes = array();
         foreach ($iterator as $n) {
             $this->assertInstanceOf('PHPCR\NodeInterface', $n);
             /** @var $n \PHPCR\NodeInterface */
             array_push($nodes, $n->getName());
         }
+        $this->assertContains('index.txt', $nodes);
         $this->assertContains('idExample', $nodes);
-        $this->assertContains('test:namespacedNode', $nodes);
+        $this->assertNotContains('test:namespacedNode', $nodes);
+        $this->assertNotContains('emptyExample', $nodes);
+        $this->assertNotContains('multiValueProperty', $nodes);
+        $this->assertContains('numberPropertyNode', $nodes);
+        $this->assertContains('NumberPropertyNodeToCompare1', $nodes);
+        $this->assertContains('NumberPropertyNodeToCompare2', $nodes);
+    }
+
+    public function testGetNodesTypeFilterList()
+    {
+        $this->node = $this->rootNode->getNode('tests_general_base');
+        $iterator = $this->node->getNodes("id*", array('nt:file', 'nt:folder'));
+        $nodes = array();
+        foreach ($iterator as $n) {
+            $this->assertInstanceOf('PHPCR\NodeInterface', $n);
+            /** @var $n \PHPCR\NodeInterface */
+            array_push($nodes, $n->getName());
+        }
         $this->assertNotContains('index.txt', $nodes);
+        $this->assertContains('idExample', $nodes);
+        $this->assertNotContains('test:namespacedNode', $nodes);
+        $this->assertNotContains('emptyExample', $nodes);
+        $this->assertNotContains('multiValueProperty', $nodes);
+        $this->assertNotContains('numberPropertyNode', $nodes);
+        $this->assertNotContains('NumberPropertyNodeToCompare1', $nodes);
+        $this->assertNotContains('NumberPropertyNodeToCompare2', $nodes);
     }
 
     public function testGetNodesNameGlobs()