mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

No more Test_* files exist, remove autoloading

This commit is contained in:
Joas Schilling 2016-05-19 15:38:16 +02:00
parent 3b3940df6b
commit ffa4633822
No known key found for this signature in database
GPG Key ID: 70A0B324C41C0946
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/autoloader.php
View File

@ -94,7 +94,7 @@ class Autoloader {
$paths[] = \OC::$CLASSPATH[$class]; $paths[] = \OC::$CLASSPATH[$class];
/** /**
* @TODO: Remove this when necessary * @TODO: Remove this when necessary
* Remove "apps/" from inclusion path for smooth migration to mutli app dir * Remove "apps/" from inclusion path for smooth migration to multi app dir
*/ */
if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) { if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
\OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG); \OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG);
@ -113,8 +113,6 @@ class Autoloader {
// If not found in the root of the app directory, insert '/lib' after app id and try again. // If not found in the root of the app directory, insert '/lib' after app id and try again.
$paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php'); $paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
} }
} elseif (strpos($class, 'Test_') === 0) {
$paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('_', '/', substr($class, 5)) . '.php');
} elseif (strpos($class, 'Test\\') === 0) { } elseif (strpos($class, 'Test\\') === 0) {
$paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php'); $paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php');
} }

6
tests/lib/autoloader.php
View File

@ -43,12 +43,6 @@ class AutoLoader extends TestCase {
], $this->loader->findClass('Test\Foo\Bar')); ], $this->loader->findClass('Test\Foo\Bar'));
} }
public function testLoadTest() {
$this->assertEquals([
\OC::$SERVERROOT . '/tests/lib/foo/bar.php'
], $this->loader->findClass('Test_Foo_Bar'));
}
public function testLoadCore() { public function testLoadCore() {
$this->assertEquals([ $this->assertEquals([
\OC::$SERVERROOT . '/lib/private/legacy/foo/bar.php', \OC::$SERVERROOT . '/lib/private/legacy/foo/bar.php',