Merge branch 'master' into importer-bug

Author: dbu

tests/PhpcrUtils/CndParserTest.php

@@ -43,7 +43,6 @@ public function testParseVerbose()
         $this->assertExampleCnd($res);
     }
 
-
     public function testParseString()
     {
         // the "worst case" example from http://jackrabbit.apache.org/node-type-notation.html
@@ -62,12 +61,13 @@ public function testParseString()
     mandatory autocreated protected VERSION
 EOT;
 
-
         $res = $this->cndParser->parseString($cnd);
         $this->assertExampleCnd($res);
     }
 
     /**
+     * Have invalid-string in the middle of options for a property
+     *
      * @expectedException \PHPCR\Util\CND\Exception\ParserException
      */
     public function testParseError()
@@ -99,6 +99,9 @@ public function testErrorNoFile()
     }
 
     /**
+     * Have a comment that is never closed. Starting that at the end of the
+     * file turned out to be particularly nasty.
+     *
      * @expectedException \PHPCR\Util\CND\Exception\ScannerException
      */
     public function testScannerErrorComment()
@@ -111,6 +114,8 @@ public function testScannerErrorComment()
     }
 
     /**
+     * Have a newline in a name (here the ns declaration)
+     *
      * @expectedException \PHPCR\Util\CND\Exception\ScannerException
      */
     public function testScannerErrorNewline()
@@ -179,7 +184,7 @@ protected function assertExampleCnd($res)
         /** @var $def NodeTypeDefinitionInterface */
         list($name, $def) = each($res['nodeTypes']);
 
-            $this->assertEquals('ns:NodeType', $name);
+        $this->assertEquals('ns:NodeType', $name);
         $this->assertInstanceOf('\PHPCR\NodeType\NodeTypeTemplateInterface', $def);
         $this->assertEquals('ns:NodeType', $def->getName());
         $this->assertEquals(array('ns:ParentType1', 'ns:ParentType2'), $def->getDeclaredSuperTypeNames());

tests/PhpcrUtils/CndWriterTest.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace PHPCR\Tests\PhpcrUtils;
+
+require_once(__DIR__ . '/../../inc/BaseCase.php');
+
+use PHPCR\NamespaceRegistryInterface;
+use PHPCR\PropertyType;
+
+use PHPCR\Util\CND\Writer\CndWriter;
+use PHPCR\Version\OnParentVersionAction;
+use PHPCR\WorkspaceInterface;
+
+class CndWriterTest extends \PHPCR\Test\BaseCase
+{
+    /**
+     * the "worst case" example from http://jackrabbit.apache.org/node-type-notation.html
+     */
+    public function testWorstCaseExample()
+    {
+        $cnd = <<<EOT
+<ns='http://namespace.com/ns'>
+<ex='http://namespace.com/example'>
+[ns:NodeType] > ns:ParentType1, ns:ParentType2
+orderable mixin query
+- ex:property (String)
+= 'default1', 'default2'
+mandatory autocreated protected multiple VERSION
+< 'constraint1', 'constraint2'
++ ns:node (ns:reqType1, ns:reqType2)
+= ns:defaultType
+mandatory autocreated protected VERSION
+
+EOT;
+
+        /** @var $workspace WorkspaceInterface */
+        $workspace = $this->sharedFixture['session']->getWorkspace();
+        $ntm = $workspace->getNodeTypeManager();
+
+        $tpl = $ntm->createNodeTypeTemplate();
+        $tpl->setName('ns:NodeType');
+        $tpl->setMixin(true);
+        $tpl->setDeclaredSuperTypeNames(array('ns:ParentType1', 'ns:ParentType2'));
+        $tpl->setOrderableChildNodes(true);
+
+        $prop = $ntm->createPropertyDefinitionTemplate();
+        $prop->setName('ex:property');
+        $prop->setRequiredType(PropertyType::STRING);
+        $prop->setDefaultValues(array('default1', 'default2'));
+        $prop->setMandatory(true);
+        $prop->setAutoCreated(true);
+        $prop->setProtected(true);
+        $prop->setMultiple(true);
+        $prop->setOnParentVersion(OnParentVersionAction::VERSION);
+        $prop->setValueConstraints(array('constraint1', 'constraint2'));
+        $prop->setFullTextSearchable(true);
+        $prop->setQueryOrderable(true);
+
+        $tpl->getPropertyDefinitionTemplates()->append($prop);
+
+        $child = $ntm->createNodeDefinitionTemplate();
+        $child->setName('ns:node');
+        $child->setRequiredPrimaryTypeNames(array('ns:reqType1', 'ns:reqType2'));
+        $child->setDefaultPrimaryTypeName('ns:defaultType');
+        $child->setMandatory(true);
+        $child->setAutoCreated(true);
+        $child->setProtected(true);
+        $child->setOnParentVersion(OnParentVersionAction::VERSION);
+
+        $tpl->getNodeDefinitionTemplates()->append($child);
+
+        $ns = $this->getMock('PHPCR\Tests\PhpcrUtils\MockNamespaceRegistry');
+        $ns->expects($this->any())
+            ->method('getUri')
+            ->will($this->returnCallback(
+                function($prefix) {
+                    switch($prefix) {
+                        case 'ns':
+                            return 'http://namespace.com/ns';
+                        case 'ex':
+                            return 'http://namespace.com/example';
+                        default:
+                            throw new \Exception($prefix);
+                    }
+                }
+            ))
+        ;
+        $cndWriter = new CndWriter($ns);
+        $res = $cndWriter->writeString(array($tpl));
+
+        $this->assertEquals($cnd, $res);
+    }
+}
+
+abstract class MockNamespaceRegistry implements \Iterator, NamespaceRegistryInterface
+{}