have workspace option for import, use that in clone methods test. try to create missing workspaces

Author: dbu

inc/AbstractLoader.php

@@ -2,6 +2,7 @@
 
 namespace PHPCR\Test;
 
+use PHPCR\NoSuchWorkspaceException;
 use PHPCR\RepositoryFactoryInterface;
 
 /**
@@ -204,6 +205,20 @@ private function getSessionForWorkspace($credentials, $workspaceName)
             $credentials = $this->getCredentials();
         }
 
-        return $repository->login($credentials, $workspaceName);
+        try {
+            return $repository->login($credentials, $workspaceName);
+        } catch (NoSuchWorkspaceException $e) {
+            $adminRepository = $this->getRepository(); // get a new repository to log into
+            $session = $adminRepository->login($this->getCredentials(), 'default');
+            $workspace = $session->getWorkspace();
+            if (in_array($workspaceName, $workspace->getAccessibleWorkspaceNames())) {
+                throw new \Exception("Failed to log into $workspaceName");
+            }
+            $workspace->createWorkspace($workspaceName);
+
+            $repository = $this->getRepository(); // get a new repository to log into
+
+            return $repository->login($credentials, $workspaceName);
+        }
     }
 }

inc/FixtureLoaderInterface.php

@@ -16,7 +16,9 @@ interface FixtureLoaderInterface
      * Default fixtures in the jcr system view format live folder fixtures/
      *
      * @param string $fixture the fixtures "name", i.e. "general/base"
+     * @param string $workspaceKey the config key for the target workspace, optional
+     *
      * @return void
      */
-    public function import($fixture);
+    public function import($fixture, $workspaceKey = 'workspace');
 }

tests/10_Writing/CloneMethodsTest.php

@@ -27,6 +27,8 @@ static public function setupBeforeClass($fixtures = '10_Writing/clone')
     {
         parent::setupBeforeClass($fixtures);
 
+        self::$staticSharedFixture['ie']->import('general/additionalWorkspace', 'additionalWorkspace');
+
         self::$destWs = self::$staticSharedFixture['additionalSession']->getWorkspace();
         self::$destWsName = self::$destWs->getName();