diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-20 10:29:01 +0300 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-20 10:29:01 +0300 |
| commit | b4958950178901ffd5b1d466f67b64558a8e5298 (patch) | |
| tree | 2c0aed2840c9f41c884ca8d5375c677be4e8e96a /tests | |
| parent | 67162e636e44957f17c5456807239ca6b4a988db (diff) | |
| parent | 54250ed06554cb59683f5c03a1e4529660febc52 (diff) | |
Merge pull request #24728 from owncloud/no-more-test_-files
Fix autoloader for Test* files
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bootstrap.php | 2 | ||||
| -rw-r--r-- | tests/lib/TestCase.php (renamed from tests/lib/testcase.php) | 0 | ||||
| -rw-r--r-- | tests/lib/autoloader.php | 10 |
3 files changed, 7 insertions, 5 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 86bedc3f325..e2b980b1c80 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -8,6 +8,8 @@ if ($configDir) { require_once __DIR__ . '/../lib/base.php'; +\OC::$composerAutoloader->addPsr4('Test\\', OC::$SERVERROOT . '/tests/lib/', true); +\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/', true); \OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests'); // load all enabled apps diff --git a/tests/lib/testcase.php b/tests/lib/TestCase.php index 7ed121d3556..7ed121d3556 100644 --- a/tests/lib/testcase.php +++ b/tests/lib/TestCase.php diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php index adea702eca9..3669f514bee 100644 --- a/tests/lib/autoloader.php +++ b/tests/lib/autoloader.php @@ -37,16 +37,16 @@ class AutoLoader extends TestCase { ], $this->loader->findClass('OC_Files')); } - public function testLoadTestNamespace() { + public function testLoadTestTestCase() { $this->assertEquals([ - \OC::$SERVERROOT . '/tests/lib/foo/bar.php' - ], $this->loader->findClass('Test\Foo\Bar')); + \OC::$SERVERROOT . '/tests/lib/TestCase.php' + ], $this->loader->findClass('Test\TestCase')); } - public function testLoadTest() { + public function testLoadTestNamespace() { $this->assertEquals([ \OC::$SERVERROOT . '/tests/lib/foo/bar.php' - ], $this->loader->findClass('Test_Foo_Bar')); + ], $this->loader->findClass('Test\Foo\Bar')); } public function testLoadCore() { |