Merge pull request #35 from symfony-cmf/test_reorder

Reorder tests

Author: wouterj

tests/Functional/PhpcrRepositoryTestCase.php

@@ -22,7 +22,12 @@ abstract class PhpcrRepositoryTestCase extends RepositoryTestCase
     /**
      * @var SessionInterface
      */
-    protected $session;
+    private $session;
+
+    /**
+     * @var NodeInterface
+     */
+    private $baseNode;
 
     protected function setUp()
     {
@@ -34,21 +39,21 @@ protected function setUp()
         $rootNode = $this->session->getRootNode();
 
         // the resource repository is based at "/test"
-        $node = $rootNode->addNode('/test');
-
-        $sub1 = $node->addNode('node-1');
-        $sub1->addNode('node-1-1');
-        $sub1->addNode('node-1-2');
-        $node->addNode('node-2');
-
-        $this->session->save();
+        $this->baseNode = $rootNode->addNode('/test');
     }
 
     /**
      * @dataProvider provideGet
      */
     public function testGet($path, $expectedName)
     {
+        $sub1 = $this->baseNode->addNode('node-1');
+        $sub1->addNode('node-1-1');
+        $sub1->addNode('node-1-2');
+        $this->baseNode->addNode('node-2');
+        $this->session->save();
+
+        $this->session->save();
         $res = $this->getRepository()->get($path);
         $this->assertNotNull($res);
         $payload = $res->getPayload();
@@ -73,6 +78,12 @@ public function provideGet()
      */
     public function testFind($pattern, $nbResults)
     {
+        $sub1 = $this->baseNode->addNode('node-1');
+        $sub1->addNode('node-1-1');
+        $sub1->addNode('node-1-2');
+        $this->baseNode->addNode('node-2');
+        $this->session->save();
+
         $res = $this->getRepository()->find($pattern);
         $this->assertCount($nbResults, $res);
     }
@@ -90,6 +101,12 @@ public function provideFind()
      */
     public function testMove($sourcePath, $targetPath, $expectedPaths)
     {
+        $sub1 = $this->baseNode->addNode('node-1');
+        $sub1->addNode('node-1-1');
+        $sub1->addNode('node-1-2');
+        $this->baseNode->addNode('node-2');
+        $this->session->save();
+
         $expectedNbMoved = count($expectedPaths);
 
         $nbMoved = $this->getRepository()->move($sourcePath, $targetPath);
@@ -121,6 +138,12 @@ public function provideMove()
      */
     public function testRemove($path, $expectedRemovedPaths)
     {
+        $sub1 = $this->baseNode->addNode('node-1');
+        $sub1->addNode('node-1-1');
+        $sub1->addNode('node-1-2');
+        $this->baseNode->addNode('node-2');
+        $this->session->save();
+
         $expectedNbRemoved = count($expectedRemovedPaths);
         $nbRemoved = $this->getRepository()->remove($path);
         $this->assertEquals($expectedNbRemoved, $nbRemoved);
@@ -144,4 +167,44 @@ public function provideRemove()
             ['/node-1/*', ['/test/node-1-1', '/test/node-1-2']],
         ];
     }
+
+    /**
+     * @dataProvider provideReorder
+     */
+    public function testReorder($path, $index, $newOrder)
+    {
+        $this->baseNode->addNode('node-1');
+        $this->baseNode->addNode('node-2');
+        $this->baseNode->addNode('node-3');
+        $this->session->save();
+
+        $this->getRepository()->reorder($path, $index);
+
+        $node = $this->session->getNode('/test'.$path);
+        $parent = $node->getParent();
+        $nodeNames = $parent->getNodeNames();
+        $this->assertEquals($newOrder, iterator_to_array($nodeNames));
+    }
+
+    public function provideReorder()
+    {
+        return [
+            ['/node-1', 1, ['node-2', 'node-1', 'node-3']],
+            ['/node-1', 2, ['node-2', 'node-3', 'node-1']],
+            ['/node-1', 0, ['node-1', 'node-2', 'node-3']],
+            ['/node-3', 0, ['node-3', 'node-1', 'node-2']],
+            ['/node-1', 66, ['node-2', 'node-3', 'node-1']],
+        ];
+    }
+
+    /**
+     * It should throw an exception if the reorder index is less than zero.
+     *
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Reorder position cannot be negative, got: -5
+     */
+    public function testReorderNegative()
+    {
+        $this->getRepository()->reorder('/foo', -5);
+    }
 }