holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move tests into app/tests subdirectory (not app/inc/test or app/test)

Browse Source
This commit is contained in:
nathangray 2017-10-18 15:43:35 +02:00
parent 4d4658e711
commit 237d81ce36
25 changed files with 33 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Db/test/SchemaTest.php → api/src/Db/tests/SchemaTest.php
View File

@ -18,7 +18,7 @@ use EGroupware\Api\Db;
use EGroupware\Api\Db\Schema; use EGroupware\Api\Db\Schema;
// test base providing Egw environment // test base providing Egw environment
require_once realpath(__DIR__.'/../../test/LoggedInTest.php'); require_once realpath(__DIR__.'/../../../tests/LoggedInTest.php');
// For security reasons we exit by default if called via the webserver // For security reasons we exit by default if called via the webserver
if (php_sapi_name() !== 'cli') if (php_sapi_name() !== 'cli')

2
api/src/Etemplate/Widget/test/DateTest.php → api/src/Etemplate/Widget/tests/DateTest.php
View File

@ -13,7 +13,7 @@
namespace EGroupware\Api\Etemplate\Widget; namespace EGroupware\Api\Etemplate\Widget;
require_once realpath(__DIR__.'/../../test/WidgetBaseTest.php'); require_once realpath(__DIR__.'/../../tests/WidgetBaseTest.php');
use EGroupware\Api\Etemplate; use EGroupware\Api\Etemplate;
use EGroupware\Api\DateTime; use EGroupware\Api\DateTime;

2
api/src/Etemplate/Widget/test/FloatTest.php → api/src/Etemplate/Widget/tests/FloatTest.php
View File

@ -12,7 +12,7 @@
namespace EGroupware\Api\Etemplate\Widget; namespace EGroupware\Api\Etemplate\Widget;
require_once realpath(__DIR__.'/../../test/WidgetBaseTest.php'); require_once realpath(__DIR__.'/../../tests/WidgetBaseTest.php');
use EGroupware\Api\Etemplate; use EGroupware\Api\Etemplate;

2
api/src/Etemplate/Widget/test/IntegerTest.php → api/src/Etemplate/Widget/tests/IntegerTest.php
View File

@ -12,7 +12,7 @@
namespace EGroupware\Api\Etemplate\Widget; namespace EGroupware\Api\Etemplate\Widget;
require_once realpath(__DIR__.'/../../test/WidgetBaseTest.php'); require_once realpath(__DIR__.'/../../tests/WidgetBaseTest.php');
use EGroupware\Api\Etemplate; use EGroupware\Api\Etemplate;

2
api/src/Etemplate/Widget/test/SelectTest.php → api/src/Etemplate/Widget/tests/SelectTest.php
View File

@ -12,7 +12,7 @@
namespace EGroupware\Api\Etemplate\Widget; namespace EGroupware\Api\Etemplate\Widget;
require_once realpath(__DIR__.'/../../test/WidgetBaseTest.php'); require_once realpath(__DIR__.'/../../tests/WidgetBaseTest.php');
use EGroupware\Api\Etemplate; use EGroupware\Api\Etemplate;

2
api/src/Etemplate/Widget/test/TemplateTest.php → api/src/Etemplate/Widget/tests/TemplateTest.php
View File

@ -13,7 +13,7 @@
namespace EGroupware\Api\Etemplate\Widget; namespace EGroupware\Api\Etemplate\Widget;
require_once realpath(__DIR__.'/../../test/WidgetBaseTest.php'); require_once realpath(__DIR__.'/../../tests/WidgetBaseTest.php');
/** /**
* Description of TemplateTest * Description of TemplateTest

2
api/src/Etemplate/Widget/test/TextboxTest.php → api/src/Etemplate/Widget/tests/TextboxTest.php
View File

@ -13,7 +13,7 @@
namespace EGroupware\Api\Etemplate\Widget; namespace EGroupware\Api\Etemplate\Widget;
require_once realpath(__DIR__.'/../../test/WidgetBaseTest.php'); require_once realpath(__DIR__.'/../../tests/WidgetBaseTest.php');
use EGroupware\Api\Etemplate; use EGroupware\Api\Etemplate;

2
api/src/Etemplate/Widget/test/UrlEmailTest.php → api/src/Etemplate/Widget/tests/UrlEmailTest.php
View File

@ -13,7 +13,7 @@
namespace EGroupware\Api\Etemplate\Widget; namespace EGroupware\Api\Etemplate\Widget;
require_once realpath(__DIR__.'/../../test/WidgetBaseTest.php'); require_once realpath(__DIR__.'/../../tests/WidgetBaseTest.php');
use EGroupware\Api\Etemplate; use EGroupware\Api\Etemplate;

2
api/src/Etemplate/Widget/test/UrlTest.php → api/src/Etemplate/Widget/tests/UrlTest.php
View File

@ -13,7 +13,7 @@
namespace EGroupware\Api\Etemplate\Widget; namespace EGroupware\Api\Etemplate\Widget;
require_once realpath(__DIR__.'/../../test/WidgetBaseTest.php'); require_once realpath(__DIR__.'/../../tests/WidgetBaseTest.php');
use EGroupware\Api\Etemplate; use EGroupware\Api\Etemplate;

2
api/src/Etemplate/test/WidgetBaseTest.php → api/src/Etemplate/tests/WidgetBaseTest.php
View File

@ -15,7 +15,7 @@ namespace EGroupware\Api\Etemplate;
use Egroupware\Api\Etemplate; use Egroupware\Api\Etemplate;
// test base providing Egw environment, since we need the DB // test base providing Egw environment, since we need the DB
require_once realpath(__DIR__.'/../../test/LoggedInTest.php'); require_once realpath(__DIR__.'/../../../tests/LoggedInTest.php');
// Store request in the session, file access probably won't work due to permissions // Store request in the session, file access probably won't work due to permissions
\EGroupware\Api\Etemplate\Request::$request_class = 'EGroupware\Api\Etemplate\Request\Session'; \EGroupware\Api\Etemplate\Request::$request_class = 'EGroupware\Api\Etemplate\Request\Session';

0
api/src/Etemplate/test/WidgetTest.php → api/src/Etemplate/tests/WidgetTest.php
View File

0
api/src/test/AppTest.php → api/tests/AppTest.php
View File

2
api/src/test/CacheTest.php → api/tests/CacheTest.php
View File

@ -14,8 +14,6 @@
namespace EGroupware\Api; namespace EGroupware\Api;
require_once realpath(__DIR__.'/../loader/common.php'); // autoloader & check_load_extension
use EGroupware\Api; use EGroupware\Api;
use PHPUnit\Framework\TestCase as TestCase; use PHPUnit\Framework\TestCase as TestCase;
use ReflectionClass; use ReflectionClass;

2
api/src/test/DateTimeTest.php → api/tests/DateTimeTest.php
View File

@ -11,8 +11,6 @@
*/ */
namespace EGroupware\Api; namespace EGroupware\Api;
require_once realpath(__DIR__.'/../loader/common.php'); // autoloader & check_load_extension
use PHPUnit\Framework\TestCase as TestCase; use PHPUnit\Framework\TestCase as TestCase;
/** /**

2
api/src/test/EtemplateTest.php → api/tests/EtemplateTest.php
View File

@ -12,7 +12,7 @@
namespace EGroupware\Api; namespace EGroupware\Api;
require_once realpath(__DIR__.'/../Etemplate/test/WidgetBaseTest.php'); require_once realpath(__DIR__.'/../src/Etemplate/tests/WidgetBaseTest.php');
/** /**
* Test the main class of Etemplate * Test the main class of Etemplate

2
api/src/test/IncludeMgrTest.php → api/tests/IncludeMgrTest.php
View File

@ -13,8 +13,6 @@
namespace EGroupware\Api; namespace EGroupware\Api;
require_once realpath(__DIR__.'/../loader/common.php'); // autoloader & check_load_extension
use EGroupware\Api\Framework; use EGroupware\Api\Framework;
use PHPUnit\Framework\TestCase as TestCase; use PHPUnit\Framework\TestCase as TestCase;

6
api/src/test/LoggedInTest.php → api/tests/LoggedInTest.php
View File

@ -14,8 +14,6 @@
namespace EGroupware\Api; namespace EGroupware\Api;
require_once realpath(__DIR__.'/../loader/common.php'); // autoloader & check_load_extension
use PHPUnit\Framework\TestCase as TestCase; use PHPUnit\Framework\TestCase as TestCase;
use EGroupware\Api; use EGroupware\Api;
@ -136,7 +134,7 @@ abstract class LoggedInTest extends TestCase
try try
{ {
include(realpath(__DIR__ . '/../../../header.inc.php')); include(realpath(__DIR__ . '/../../header.inc.php'));
} }
catch (Exception $e) catch (Exception $e)
{ {
@ -146,7 +144,7 @@ abstract class LoggedInTest extends TestCase
return; return;
} }
require_once realpath(__DIR__.'/../loader/common.php'); // autoloader & check_load_extension require_once realpath(__DIR__.'/../src/loader/common.php'); // autoloader & check_load_extension
// egw is normally created when a file is loaded using require_once // egw is normally created when a file is loaded using require_once
if(empty($GLOBALS['egw']) || !is_a($GLOBALS['egw'], 'EGroupware\Api\Egw\Base')) if(empty($GLOBALS['egw']) || !is_a($GLOBALS['egw'], 'EGroupware\Api\Egw\Base'))

0
api/src/test/Test classes.odg → api/tests/Test classes.odg
View File

0
api/src/test/Test classes.pdf → api/tests/Test classes.pdf
View File

2
calendar/test/TimezoneTest.php → calendar/tests/TimezoneTest.php
View File

@ -13,7 +13,7 @@
namespace EGroupware\calendar; namespace EGroupware\calendar;
require_once realpath(__DIR__.'/../../api/src/test/AppTest.php'); // Application test base require_once realpath(__DIR__.'/../../api/tests/AppTest.php'); // Application test base
use Egroupware\Api; use Egroupware\Api;

12
doc/phpunit.xml
View File

@ -12,21 +12,17 @@
</php> </php>
<testsuites> <testsuites>
<testsuite name="Api"> <testsuite name="Api">
<directory>../api/tests</directory>
<directory>../api/src/test/</directory> <directory>../api/src/test/</directory>
<directory>../api/src/*/test/</directory> <directory>../api/src/*/test/</directory>
<directory>../api/tests</directory>
</testsuite> </testsuite>
<testsuite name="Etemplate"> <testsuite name="Etemplate">
<file>../api/src/test/EtemplateTest.php</file> <file>../api/src/tests/EtemplateTest.php</file>
<directory>../api/src/Etemplate/test/</directory> <directory>../api/src/Etemplate/tests/</directory>
<directory>../api/src/Etemplate/Widget/test/</directory> <directory>../api/src/Etemplate/Widget/tests/</directory>
</testsuite> </testsuite>
<testsuite name="Apps"> <testsuite name="Apps">
<!-- Apps with test directory --> <!-- Apps with test directory -->
<directory>../*/test/</directory>
<!-- Apps with namespace -->
<directory>../*/src/test/</directory>
<directory>../*/src/*/test/</directory>
<directory>../*/tests/</directory> <directory>../*/tests/</directory>
<exclude>../api</exclude> <exclude>../api</exclude>

2
infolog/test/ContactTest.php → infolog/tests/ContactTest.php
View File

@ -15,7 +15,7 @@
namespace EGroupware\Infolog; namespace EGroupware\Infolog;
require_once realpath(__DIR__.'/../../api/src/test/AppTest.php'); // Application test base require_once realpath(__DIR__.'/../../api/tests/AppTest.php'); // Application test base
use Egroupware\Api\Contacts; use Egroupware\Api\Contacts;

2
infolog/test/SetProjectManagerTest.php → infolog/tests/SetProjectManagerTest.php
View File

@ -3,7 +3,7 @@
namespace EGroupware\Infolog; namespace EGroupware\Infolog;
require_once realpath(__DIR__.'/../../api/src/test/AppTest.php'); // Application test base require_once realpath(__DIR__.'/../../api/tests/AppTest.php'); // Application test base
use Egroupware\Api; use Egroupware\Api;

2
infolog/test/StatusTest.php → infolog/tests/StatusTest.php
View File

@ -20,7 +20,7 @@
namespace EGroupware\Infolog; namespace EGroupware\Infolog;
require_once realpath(__DIR__.'/../../api/src/test/AppTest.php'); // Application test base require_once realpath(__DIR__.'/../../api/tests/AppTest.php'); // Application test base
use Egroupware\Api; use Egroupware\Api;

0
infolog/test/status_map.json → infolog/tests/status_map.json
View File