From 0762418a536d87c3988420e3ecfd28e67be7a63c Mon Sep 17 00:00:00 2001
From: poef <auke@muze.nl>
Date: Sat, 21 Jun 2014 13:38:49 +0200
Subject: [PATCH] fixed tests to run in the new directory structure

---
 tests/bootstrap.php     | 1 +
 tests/test.hash.php     | 2 +-
 tests/test.lambda.php   | 2 +-
 tests/test.path.php     | 2 +-
 tests/test.template.php | 2 +-
 tests/test.tree.php     | 2 +-
 tests/testall.php       | 4 ++--
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a3e37c5..a9ebadc 100755
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,6 +1,7 @@
 <?php
 
 	error_reporting(E_ALL|E_STRICT);
+	include_once( __DIR__ . '/../../../autoload.php'); // arc/arc autoloader
 	require_once( __DIR__ . '/../autoload.php');
 //	require_once( __DIR__ . '/vendor/autoload.php');	
 
diff --git a/tests/test.hash.php b/tests/test.hash.php
index 57dd6fb..db7cb61 100644
--- a/tests/test.hash.php
+++ b/tests/test.hash.php
@@ -10,7 +10,7 @@
 	 * file that was distributed with this source code.
 	 */
 
-	require_once( __DIR__ . 'bootstrap.php' );
+	require_once( __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php' );
 	 
 	class TestHash extends UnitTestCase {
 
diff --git a/tests/test.lambda.php b/tests/test.lambda.php
index 2cf04fd..337d208 100644
--- a/tests/test.lambda.php
+++ b/tests/test.lambda.php
@@ -9,7 +9,7 @@
      * file that was distributed with this source code.
      */
 
-    require_once( __DIR__.'bootstrap.php' );
+    require_once( __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php' );
      
     class TestLambda extends UnitTestCase {
 
diff --git a/tests/test.path.php b/tests/test.path.php
index ed47a88..b6767af 100644
--- a/tests/test.path.php
+++ b/tests/test.path.php
@@ -9,7 +9,7 @@
 	 * file that was distributed with this source code.
 	 */
 
-	require_once( __DIR__ . 'bootstrap.php' );
+	require_once( __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php' );
 	 
 	class TestPath extends UnitTestCase {
 
diff --git a/tests/test.template.php b/tests/test.template.php
index fc13468..ce09b3f 100644
--- a/tests/test.template.php
+++ b/tests/test.template.php
@@ -9,7 +9,7 @@
 	 * file that was distributed with this source code.
 	 */
 
-	require_once( __DIR__.'bootstrap.php' );
+	require_once( __DIR__ . DIRECTORY_SEPARATOR .'bootstrap.php' );
 	 
 	class TestTemplate extends UnitTestCase {
 
diff --git a/tests/test.tree.php b/tests/test.tree.php
index 4cdc4ed..0d23ff8 100644
--- a/tests/test.tree.php
+++ b/tests/test.tree.php
@@ -9,7 +9,7 @@
 	 * file that was distributed with this source code.
 	 */
 
-	require_once( __DIR__ . 'bootstrap.php' );
+	require_once( __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php' );
 	 
 	class TestTree extends UnitTestCase {
 
diff --git a/tests/testall.php b/tests/testall.php
index 2790d55..c1c9982 100644
--- a/tests/testall.php
+++ b/tests/testall.php
@@ -3,7 +3,7 @@
 	
 	$files = scandir( __DIR__ );
 	foreach ( $files as $file ) {
-		if( is_file( __DIR__ . $file ) && preg_match( '/\btest\..*\.php/', basename( __DIR__ .  $file ) ) ) {
-			include( __DIR__ . $file );
+		if ( is_file( __DIR__ . DIRECTORY_SEPARATOR . $file ) && preg_match( '/^test\..*\.php$/i', $file ) ) {
+			include( __DIR__ . DIRECTORY_SEPARATOR . $file );
 		}
 	}