adding some missing nodehelper tests

Author: dbu

tests/PHPCR/Tests/Util/NodeHelperTest.php

@@ -4,6 +4,8 @@
 
 use PHPCR\Util\NodeHelper;
 
+require_once(__DIR__.'/../Stubs/MockNode.php');
+
 class NodeHelperTest extends \PHPUnit_Framework_TestCase
 {
     private $namespaces = array('a' => 'http://phpcr', 'b' => 'http://jcr');
@@ -27,7 +29,10 @@ public static function invalidHints() {
             array('a'), // no colon
             array('a:foo:'),
             array('{foo'),
-            array('x'), // not an existing namespace
+            array('x:'), // not an existing namespace prefix
+            array('{http://xy}'), // not an existing namespace uri
+            array('x:a'), // not an existing namespace prefix with a local name prefix
+            array('{http://xy}a'), // not an existing namespace uri with a local name prefix
         );
     }
 
@@ -59,6 +64,49 @@ public function testGenerateAutoNodeNameInvalid($hint)
         NodeHelper::generateAutoNodeName($this->usedNames, $this->namespaces, 'a', $hint);
     }
 
+    public function testIsSystemItem()
+    {
+        $sys = $this->getMock('PHPCR\Tests\Stubs\MockNode');
+        $sys->expects($this->once())
+            ->method('getDepth')
+            ->will($this->returnValue(0))
+        ;
+        $sys->expects($this->once())
+            ->method('getName')
+            ->will($this->returnValue('jcr:root'))
+        ;
+        $this->assertTrue(NodeHelper::isSystemItem($sys));
+
+        $sys = $this->getMock('PHPCR\Tests\Stubs\MockNode');
+        $sys->expects($this->once())
+            ->method('getDepth')
+            ->will($this->returnValue(1))
+        ;
+        $sys->expects($this->once())
+            ->method('getName')
+            ->will($this->returnValue('jcr:system'))
+        ;
+        $this->assertTrue(NodeHelper::isSystemItem($sys));
+
+        $top = $this->getMock('PHPCR\Tests\Stubs\MockNode');
+        $top->expects($this->once())
+            ->method('getDepth')
+            ->will($this->returnValue(1))
+        ;
+        $top->expects($this->once())
+            ->method('getName')
+            ->will($this->returnValue('jcrname')) // this is NOT in the jcr namespace
+        ;
+        $this->assertFalse(NodeHelper::isSystemItem($top));
+
+        $deep = $this->getMock('PHPCR\Tests\Stubs\MockNode');
+        $deep->expects($this->once())
+            ->method('getDepth')
+            ->will($this->returnValue(2))
+        ;
+        $this->assertFalse(NodeHelper::isSystemItem($deep));
+    }
+
     public function testCalculateOrderBeforeSwapLast()
     {
         $old = array('one', 'two', 'three', 'four');
@@ -102,6 +150,21 @@ public function testCalculateOrderBeforeReverse()
         $this->assertEquals($expected, $reorders);
     }
 
+    public function testCalculateOrderBeforeDeleted()
+    {
+        $old = array('one', 'two', 'three', 'four');
+        $new = array('one', 'three', 'two');
+
+        $reorders = NodeHelper::calculateOrderBefore($old, $new);
+
+        $expected = array(
+            'two' => null,
+            'one'   => 'three', // TODO: this is an unnecessary but harmless NOOP. we should try to eliminate
+        );
+        $this->assertEquals($expected, $reorders);
+    }
+
+
     /**
      * @group benchmark
      */

tests/PHPCR/Tests/Util/ValueConverterTest.php

@@ -4,6 +4,8 @@
 use PHPCR\PropertyType;
 use PHPCR\Util\ValueConverter;
 
+require_once(__DIR__.'/../Stubs/MockNode.php');
+
 /**
  * a test for the PHPCR\PropertyType class
  */
@@ -42,7 +44,7 @@ public function dataConversionMatrix()
         $datetimeLong = new \DateTime();
         $datetimeLong->setTimestamp(123);
 
-        $nodemock = $this->getMock('PHPCR\\Tests\\Util\\NodeMock');
+        $nodemock = $this->getMock('PHPCR\Tests\Stubs\MockNode');
         $nodemock
             ->expects($this->any())
             ->method('getIdentifier')
@@ -383,7 +385,7 @@ public function testConvertInvalidDate()
      */
     public function testConvertNewNode()
     {
-        $nodemock = $this->getMock('PHPCR\\Tests\\Util\\NodeMock');
+        $nodemock = $this->getMock('PHPCR\Tests\Stubs\MockNode');
         $nodemock
             ->expects($this->once())
             ->method('isNew')
@@ -396,7 +398,7 @@ public function testConvertNewNode()
      */
     public function testConvertNonrefNode()
     {
-        $nodemock = $this->getMock('PHPCR\\Tests\\Util\\NodeMock');
+        $nodemock = $this->getMock('PHPCR\Tests\Stubs\MockNode');
         $nodemock
             ->expects($this->once())
             ->method('isNew')
@@ -438,6 +440,3 @@ public function testConvertTypeInvalidTarget()
         $this->valueConverter->convertType('test', PropertyType::UNDEFINED);
     }
 }
-
-interface NodeMock extends \Iterator, \PHPCR\NodeInterface
-{}