fix tests

diff --git a/tests/autoload.php b/tests/autoload.php
index d914f3f46bed756b5035990d3eb58a8e5516bda2..116defaf6fec1ae047e1d829fd872f60d9123ad4 100644 (file)
--- a/tests/autoload.php
+++ b/tests/autoload.php
@@ -1,4 +1,5 @@
 <?php
+set_include_path(__DIR__."/src:".get_include_path());
 spl_autoload_register(function($class) {
        if (strncmp($class, "pharext\\", strlen("pharext\\"))) {
                return false;

diff --git a/tests/src/pharext/CliArgsTest.php b/tests/src/pharext/CliArgsTest.php
index 4e77b208ab15efbc52aae17130f9e887ee6a6d05..887ce86f381a0f2c6b3ad5616ac1b91f18d6f45c 100644 (file)
--- a/tests/src/pharext/CliArgsTest.php
+++ b/tests/src/pharext/CliArgsTest.php
@@ -4,6 +4,8 @@ namespace pharext;
 
 require __DIR__."/../../autoload.php";
 
+use pharext\Cli\Args as CliArgs;
+
 class CliArgsTest extends \PHPUnit_Framework_TestCase
 {
        /**

diff --git a/tests/src/pharext/CliCommandTest.php b/tests/src/pharext/CliCommandTest.php
index 7fd24487d2888318328fce30d3ca7d2649b4819f..3968289819ae888a5c38f0dff99a19241e06871a 100644 (file)
--- a/tests/src/pharext/CliCommandTest.php
+++ b/tests/src/pharext/CliCommandTest.php
@@ -2,6 +2,11 @@
 
 namespace pharext;
 
+require __DIR__."/../../autoload.php";
+
+use pharext\Cli\Args as CliArgs;
+use pharext\Cli\Command as CliCommand;
+
 class CliCommandTest extends \PHPUnit_Framework_TestCase
 {
        use CliCommand;

diff --git a/tests/src/pharext/GitSourceDirTest.php b/tests/src/pharext/GitSourceDirTest.php
index 36f2f1ff3b375dd34873ad70035caa171ea6f4e0..5e6a989bbc8a9e82034327d522e989f332f41f2e 100644 (file)
--- a/tests/src/pharext/GitSourceDirTest.php
+++ b/tests/src/pharext/GitSourceDirTest.php
@@ -4,6 +4,9 @@ namespace pharext;
 
 require_once __DIR__."/../../autoload.php";
 
+use pharext\Cli\Args as CliArgs;
+use pharext\Cli\Command as CliCommand;
+
 class Cmd implements Command
 {
        use CliCommand;
@@ -22,7 +25,7 @@ class GitSourceDirTest extends \PHPUnit_Framework_TestCase
        protected $source;
        
        protected function setUp() {
-               $this->source = new GitSourceDir(new Cmd, ".");
+               $this->source = new SourceDir\Git(new Cmd, ".");
        }
        
        public function testGetBaseDir() {
@@ -30,7 +33,7 @@ class GitSourceDirTest extends \PHPUnit_Framework_TestCase
        }
        
        public function testIterator() {
-               $git_files = `git ls-files | xargs -I{} -n1 echo \$(pwd)/{}`;
+               $git_files = `git ls-tree --name-only -r HEAD | xargs -I{} -n1 echo \$(pwd)/{}`;
                $dir_files = implode("\n", iterator_to_array($this->source->getIterator()))."\n";
                $this->assertSame($git_files, $dir_files);
        }

diff --git a/tests/src/pharext/Version.php b/tests/src/pharext/Version.php
new file mode 120000 (symlink)
index 0000000..39773a5
--- /dev/null
+++ b/tests/src/pharext/Version.php
@@ -0,0 +1 @@
+../../../src/pharext/Version.php
\ No newline at end of file