cleaning up config files a bit. more weeding out jackalope is needed

Author: dbu

README.md

@@ -22,9 +22,6 @@ clean out the jackalope references and move all jackalope specific stuff (the .j
 into the jackalope api-tests folder. These tests should be clean. The only relevant folders are
 tests and fixtures, plus the .sample files, the rest should go out of this.
 
-TODO: convert all fixtures into system view to have the expected types
-
-
 ## Usage
 
 The phpcr-api-tests is a suite to test compliance for implementations of
@@ -34,17 +31,21 @@ the java content repository specification.
 You need to provide a couple of files in order to let the tests detect your
 implementation:
 
-TODO: configuration should be handled by bootstrap and not by baseClass
 
-* Copy phpunit.xml.sample to phpunit.xml and adapt if necessary. All <php /> vars beginning
-  with "jcr." are copied to the configuration array that is passed to the functions `getJCRSession`,
-  `getRepository` and `getFixtureLoader`.
-* Write your own bootstrap file. Have a look at inc/bootstrap.php.sample. You
+* Add the api tests as submodule of your project, for example in a folder tests/api
+* Copy phpunit.dist.xml to the parent folder of where you added the submodule,
+    rename it to phpunit.xml and adapt as necessary.
+* All <php /> vars beginning with "jcr." are copied to the configuration array
+    that is passed to the functions `getJCRSession`,
+    `getRepository` and `getFixtureLoader`.
+    TODO: configuration should be handled by bootstrap and not by baseClass
+* Write your own bootstrap file. Have a look at bootstrap.dist.php You
   have to implement the following methods:
     ** getJCRSession()
     ** getRepository()
     ** getSimpleCredentials()
     ** getFixtureLoader()
+    TODO: make this a class and move logic for configuration into the bootstrap
 * Implement data for all the necessary fixtures. See the "fixtures/" folder for
   a JCR XML system view export of the fixture data. If your implementation can
   not import this format, you will need to convert them into a suitable format.
@@ -65,18 +66,6 @@ your own fixtures if you want.
 The test suite provides default fixtures in the fixtures folder in the JCR
 system view export format. It is recommended to use those.
 
-Current list of fixtures (subject to be extended):
-
-* general/base
-* general/query
-* 10_Writing/add
-* 10_Writing/copy
-* 10_Writing/delete
-* 10_Writing/move
-* 10_Writing/nodetype
-* 15_Versioning/base
-
-
 
 ### Using jackrabbit_importexport for load your own fixtures
 

inc/bootstrap.php.sample bootstrap.dist.phpinc/bootstrap.php.sample renamed to bootstrap.dist.php

@@ -24,7 +24,8 @@
     }
 }
 
-/** autoloader: jackalope-api-tests relies on this autoloader.
+/** 
+ * autoloader: jackalope-api-tests relies on this autoloader.
  */
 function jackalopeApiTestsAutoload($class) {
     $incFile = dirname(__FILE__) . '/../lib/' . str_replace("_", DIRECTORY_SEPARATOR, $class).".php";

inc/PHP_importexport.php

@@ -2,7 +2,8 @@
 /* 
  * An autoload array to enable autoloading in sf2 (jackrabbit_importexport is used
  * in CoreBundle). Further classes can be added if needed
+ * TODO: Temporary hack, remove once importXML is implemented and use session->importXML
  */
 return array(
   'jackrabbit_importexport' => __DIR__.'/importexport.php',
-);
+);

inc/autoload.php

@@ -0,0 +1,49 @@
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+         strict="true"
+         bootstrap="bootstrap.php">
+    <php>
+        <!-- set some globals for connection handling.
+           the following is an example of the jackalope-jackrabbit implementation -->
+        <var name="jcr.url" value="http://localhost:8080/server" />
+        <var name="jcr.user" value="admin" />
+        <var name="jcr.pass" value="admin" />
+        <var name="jcr.workspace" value="tests" />
+        <var name="jcr.transport" value="davex" />
+    </php>
+
+    <testsuites>
+        <testsuite name="all">
+            <directory>[name-of-directory-with-test-submodule]/tests/</directory>
+            <directory>[your-unit-tests-directory]</directory>
+        </testsuite>
+    </testsuites>
+
+    <!-- configuration for code coverage report -->
+    <filter>
+        <whitelist>
+            <directory>../</directory>
+
+            <exclude>
+                <!-- ignore the unit tests -->
+                <directory>../tests</directory>
+
+                <!-- ignore the api tests -->
+                <directory>.</directory>
+
+                <!-- ignore whats not implemented yet -->
+                <directory>../lib/phpcr/src/PHPCR/Lock</directory>
+                <directory>../lib/phpcr/src/PHPCR/Observation</directory>
+                <directory>../lib/phpcr/src/PHPCR/Retention</directory>
+                <directory>../lib/phpcr/src/PHPCR/Security</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>