Minor improvements

- Skip autocreate writing tests if repository does not support
  autocreate
- Throw better exception

Author: dantleech

inc/AbstractLoader.php

@@ -253,7 +253,7 @@ private function getSessionForWorkspace($credentials, $workspaceName)
             $session = $adminRepository->login($this->getCredentials(), 'default');
             $workspace = $session->getWorkspace();
             if (in_array($workspaceName, $workspace->getAccessibleWorkspaceNames())) {
-                throw new \Exception("Failed to log into $workspaceName");
+                throw new \Exception(sprintf('Workspace "%s" already exists but could not login to it', $workspaceName), null, $e);
             }
             $workspace->createWorkspace($workspaceName);
 

inc/BaseCase.php

@@ -269,4 +269,21 @@ protected function assertSimilarDateTime($expected, $data)
             $data->format('c') . ' is not close to the expected ' . $expected->format('c')
         );
     }
+
+    /**
+     * Check to see if the given descriptor evaluates to false, if it does
+     * mark the test as skipped and return False, else return True.
+     *
+     * @param sting $descriptor
+     * @return boolean
+     */
+    protected function skipIfNotSupported($descriptor)
+    {
+        if (false === $this->session->getRepository()->getDescriptor($descriptor)) {
+            $this->markTestSkipped('Descriptor "' . $descriptor . '" not supported');
+            return false;
+        }
+
+        return true;
+    }
 }

tests/10_Writing/AddMethodsTest.php

@@ -4,6 +4,7 @@
 require_once(__DIR__ . '/../../inc/BaseCase.php');
 
 use PHPCR\PropertyType as Type;
+use PHPCR\RepositoryInterface;
 
 /**
  * Covering jcr-283 spec $10.4
@@ -386,6 +387,10 @@ public function testAddPropertyWithUnregisteredNamespace()
 
     public function testAddNodeWithAutoCreatedNode()
     {
+        if ($this->skipIfNotSupported(RepositoryInterface::NODE_TYPE_MANAGEMENT_AUTOCREATED_DEFINITIONS_SUPPORTED)) {
+            return;
+        }
+
         $workspace = $this->session->getWorkspace();
         $cnd = file_get_contents(__DIR__.'/../../fixtures/10_Writing/add_auto_create.cnd');
         $workspace->getNodeTypeManager()->registerNodeTypesCnd($cnd, true);