Restructured tests

.travis.yml

@@ -12,7 +12,7 @@ before_script:
   - sed '/jackalope\/jackalope-transport/d' composer.json >> tmp; mv tmp composer.json
   - composer update --prefer-source
 
-script: phpunit -c tests/phpunit.xml.dist
+script: phpunit
 
 notifications:
   irc: "irc.freenode.org#jackalope"

tests/phpunit.xml.dist → phpunit.xml.dist

@@ -1,18 +1,18 @@
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         colors="false"
+         colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="true"
          strict="false"
-         bootstrap="bootstrap.php">
+         bootstrap="tests/bootstrap.php">
 
     <testsuites>
         <testsuite name="Jackalope Tests">
-            <directory>./Jackalope</directory>
+            <directory>./tests/Jackalope</directory>
         </testsuite>
     </testsuites>
 

src/Jackalope/Validation/InvalidPathException.php → src/Jackalope/Validation/Exception/InvalidPathException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Validation;
+namespace Jackalope\Validation\Exception;
 
 use PHPCR\ValueFormatException;
 

src/Jackalope/Validation/AbstractRegexValidator.php → src/Jackalope/Validation/Path/AbstractRegexValidator.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace Jackalope\Validation;
+namespace Jackalope\Validation\Path;
 
 use DOMElement;
+use Jackalope\Validation\Exception\InvalidPathException;
+use Jackalope\Validation\PathValidatorInterface;
 
 /**
  * Abstract class for regex based validators
@@ -14,8 +16,18 @@
  */
 abstract class AbstractRegexValidator implements PathValidatorInterface
 {
+    /**
+     * Return a regular expression for a valid path
+     *
+     * @return string
+     */
     abstract protected function getPathPattern();
 
+    /**
+     * Return a regular expression for a valid name
+     *
+     * @return string
+     */
     abstract protected function getNamePattern();
 
     /**
@@ -40,6 +52,18 @@ public function validateAbsPath($path)
         return $this->validatePath($path);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function validateDestPath($path)
+    {
+        if (']' === substr($path, -1)) {
+            throw new InvalidPathException(sprintf('Destination path "%s" must not end with an index', $path));
+        }
+
+        return $this->validatePath($path);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -50,6 +74,9 @@ public function validateName($path)
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
     private function validate($path, $pattern)
     {
         $pattern = '{' . $pattern . '}u';

src/Jackalope/Validation/JackrabbitPathValidator.php → src/Jackalope/Validation/Path/JackrabbitPathValidator.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Jackalope\Validation;
+namespace Jackalope\Validation\Path;
 
 use DOMElement;
 
 /**
- * Applies the same path validation rules as the Apache Jackrabbit PHPCR implementation.
+ * Applies the same path validation rules as the Apache Jackrabbit JCR implementation.
  *
  * Namespaces need to be valid XML elements according to the XML specification:
  *

src/Jackalope/Validation/SimplePathValidator.php → src/Jackalope/Validation/Path/SimplePathValidator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Validation;
+namespace Jackalope\Validation\Path;
 
 use DOMElement;
 

src/Jackalope/Validation/PathValidatorInterface.php

@@ -32,6 +32,16 @@ public function validatePath($path);
      */
     public function validateAbsPath($absPath);
 
+    /**
+     * Assert that the given path is a valid destination path
+     *
+     * @param string $path
+     *
+     * @return void
+     * @throws InvalidPathException
+     */
+    public function validateDestPath($destPath);
+
     /**
      * Assert that the given path is a valid absolute path
      *

tests/Jackalope/Validation/Path/JackrabbitPathValidatorTest.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Jackalope\NodeType\Path;
+
+use Jackalope\NodeType\NodeProcessor;
+use Jackalope\TestCase;
+use PHPCR\PropertyType;
+use Jackalope\Validation\PathValidatorTestCase;
+use Jackalope\Validation\Path\JackrabbitPathValidator;
+
+class JackrabbitPathValidatorTest extends PathValidatorTestCase
+{
+    public function getValidator()
+    {
+        return new JackrabbitPathValidator();
+    }
+
+    public function getPathAnswers()
+    {
+        return array(
+            'absolute_1' => true,
+            'absolute_2' => false,
+            'absolute_3' => false,
+            'normal_1' => true,
+            'normal_2' => true,
+            'normal_3' => true,
+            'normal_4' => true,
+            'normal_5' => true,
+            'normal_6' => true,
+            'normal_7' => true,
+            'normal_8' => true,
+            'normal_9' => true,
+            'normal_10' => false,
+            'normal_11' => false,
+            'normal_12' => false,
+            'normal_13' => false,
+            'normal_14' => false,
+        );
+    }
+
+    public function getNameAnswers()
+    {
+        return array(
+            'normal_1' => false,
+            'normal_2' => false,
+            'normal_3' => true,
+            'normal_4' => true,
+            'normal_5' => false,
+            'normal_6' => true,
+            'namespace_1' => true,
+            'namespace_2' => true,
+            'namespace_3' => true,
+            'namespace_4' => true,
+            'namespace_5' => false,
+            'namespace_6' => false,
+            'namespace_7' => false,
+            'namespace_8' => false,
+            'namespace_9' => false,
+            'localname_1' => true,
+            'localname_2' => true,
+            'localname_3' => true,
+            'localname_4' => true,
+            'localname_5' => true,
+        );
+    }
+}

tests/Jackalope/Validation/Path/SimplePathValidatorTest.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Jackalope\NodeType;
+
+use Jackalope\NodeType\NodeProcessor;
+use Jackalope\TestCase;
+use PHPCR\PropertyType;
+use Jackalope\Validation\PathValidatorTestCase;
+use Jackalope\Validation\Path\SimplePathValidator;
+
+class SimplePathValidatorTest extends PathValidatorTestCase
+{
+    public function getValidator()
+    {
+        return new SimplePathValidator();
+    }
+
+    public function getPathAnswers()
+    {
+        return array(
+            'absolute_1' => true,
+            'absolute_2' => false,
+            'absolute_3' => false,
+            'normal_1' => true,
+            'normal_2' => false,
+            'normal_3' => false,
+            'normal_4' => false,
+            'normal_5' => false,
+            'normal_6' => false,
+            'normal_7' => true,
+            'normal_8' => true,
+            'normal_9' => false,
+            'normal_10' => false,
+            'normal_11' => false,
+            'normal_12' => false,
+            'normal_13' => false,
+            'normal_14' => false,
+        );
+    }
+
+    public function getNameAnswers()
+    {
+        return array(
+            'normal_1' => false,
+            'normal_2' => false,
+            'normal_3' => true,
+            'normal_4' => false,
+            'normal_5' => false,
+            'normal_6' => true,
+            'namespace_1' => false,
+            'namespace_2' => false,
+            'namespace_3' => false,
+            'namespace_4' => false,
+            'namespace_5' => false,
+            'namespace_6' => false,
+            'namespace_7' => false,
+            'namespace_8' => false,
+            'namespace_9' => false,
+            'localname_1' => false,
+            'localname_2' => false,
+            'localname_3' => false,
+            'localname_4' => false,
+            'localname_5' => false,
+        );
+    }
+}