Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable10] fix autoloading in LPAP integration tests, resolves #544 #580

Merged
merged 1 commit into from
Jul 27, 2016
Merged

[stable10] fix autoloading in LPAP integration tests, resolves #544 #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions apps/user_ldap/tests/Integration/Bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

/**
* @copyright Copyright (c) 2016 Arthur Schiwon <[email protected]>
*
* @author Arthur Schiwon <[email protected]>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/

define('CLI_TEST_RUN', true);
require_once __DIR__ . '/../../../../lib/base.php';
require_once __DIR__ . '/setup-scripts/config.php';
4 changes: 1 addition & 3 deletions apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@

namespace OCA\User_LDAP\Tests\Integration\Lib;


use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;

require_once __DIR__ . '/../../../../../lib/base.php';
require_once __DIR__ . '/../Bootstrap.php';

class IntegrationTestAccessGroupsMatchFilter extends AbstractIntegrationTest {

Expand Down Expand Up @@ -118,7 +117,6 @@ protected function initConnection() {
}
}

require_once(__DIR__ . '/../setup-scripts/config.php');
$test = new IntegrationTestAccessGroupsMatchFilter($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
3 changes: 1 addition & 2 deletions apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User_LDAP;

require_once __DIR__ . '/../../../../../lib/base.php';
require_once __DIR__ . '/../Bootstrap.php';

class IntegrationTestBackupServer extends AbstractIntegrationTest {
/** @var UserMapping */
Expand Down Expand Up @@ -113,7 +113,6 @@ protected function case3() {
}
}

require_once(__DIR__ . '/../setup-scripts/config.php');
$test = new IntegrationTestBackupServer($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
3 changes: 1 addition & 2 deletions apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;

require_once __DIR__ . '/../../../../../lib/base.php';
require_once __DIR__ . '/../Bootstrap.php';

class IntegrationTestBatchApplyUserAttributes extends AbstractIntegrationTest {
/**
Expand Down Expand Up @@ -68,7 +68,6 @@ protected function case1() {

}

require_once(__DIR__ . '/../setup-scripts/config.php');
$test = new IntegrationTestBatchApplyUserAttributes($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
3 changes: 1 addition & 2 deletions apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User_LDAP;

require_once __DIR__ . '/../../../../../lib/base.php';
require_once __DIR__ . '/../Bootstrap.php';

class IntegrationTestConnect extends AbstractIntegrationTest {
/** @var UserMapping */
Expand Down Expand Up @@ -161,7 +161,6 @@ protected function case6() {
}
}

require_once(__DIR__ . '/../setup-scripts/config.php');
$test = new IntegrationTestConnect($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
3 changes: 1 addition & 2 deletions apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;

require_once __DIR__ . '/../../../../../lib/base.php';
require_once __DIR__ . '/../Bootstrap.php';

class IntegrationTestCountUsersByLoginName extends AbstractIntegrationTest {

Expand Down Expand Up @@ -61,7 +61,6 @@ protected function case2() {
}
}

require_once(__DIR__ . '/../setup-scripts/config.php');
$test = new IntegrationTestCountUsersByLoginName($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
3 changes: 1 addition & 2 deletions apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User_LDAP;

require_once __DIR__ . '/../../../../../lib/base.php';
require_once __DIR__ . '/../Bootstrap.php';

class IntegrationTestFetchUsersByLoginName extends AbstractIntegrationTest {
/** @var UserMapping */
Expand Down Expand Up @@ -74,7 +74,6 @@ protected function case2() {

}

require_once(__DIR__ . '/../setup-scripts/config.php');
$test = new IntegrationTestFetchUsersByLoginName($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
3 changes: 1 addition & 2 deletions apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User_LDAP;

require_once __DIR__ . '/../../../../../lib/base.php';
require_once __DIR__ . '/../Bootstrap.php';

class IntegrationTestPaging extends AbstractIntegrationTest {
/** @var UserMapping */
Expand Down Expand Up @@ -76,7 +76,6 @@ protected function case1() {
}
}

require_once(__DIR__ . '/../setup-scripts/config.php');
$test = new IntegrationTestPaging($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
3 changes: 1 addition & 2 deletions apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User_LDAP;

require_once __DIR__ . '/../../../../../lib/base.php';
require_once __DIR__ . '/../Bootstrap.php';

class IntegrationTestUserHome extends AbstractIntegrationTest {
/** @var UserMapping */
Expand Down Expand Up @@ -169,7 +169,6 @@ protected function case3() {
}
}

require_once(__DIR__ . '/../setup-scripts/config.php');
$test = new IntegrationTestUserHome($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
3 changes: 1 addition & 2 deletions apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;

require_once __DIR__ . '/../../../../../../lib/base.php';
require_once __DIR__ . '/../../Bootstrap.php';

class IntegrationTestUserAvatar extends AbstractIntegrationTest {
/** @var UserMapping */
Expand Down Expand Up @@ -148,7 +148,6 @@ protected function initConnection() {
}
}

require_once(__DIR__ . '/../../setup-scripts/config.php');
$test = new IntegrationTestUserAvatar($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
3 changes: 1 addition & 2 deletions apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;

require_once __DIR__ . '/../../../../../../lib/base.php';
require_once __DIR__ . '/../../Bootstrap.php';

class IntegrationTestUserDisplayName extends AbstractIntegrationTest {
/** @var UserMapping */
Expand Down Expand Up @@ -100,7 +100,6 @@ protected function initConnection() {
}
}

require_once(__DIR__ . '/../../setup-scripts/config.php');
$test = new IntegrationTestUserDisplayName($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
2 changes: 1 addition & 1 deletion lib/private/legacy/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public static function registerAutoloading($app, $path) {
// Register on PSR-4 composer autoloader
$appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
\OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);
if (defined('PHPUNIT_RUN')) {
if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) {
\OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true);
}

Expand Down