adapt php tests to new directory constants

This commit is contained in:
Sarah Hoffmann 2020-12-17 16:50:52 +01:00
parent 867baab3d1
commit f62c65e9d9
14 changed files with 22 additions and 20 deletions

View File

@ -2,8 +2,8 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/AddressDetails.php');
require_once(CONST_LibDir.'/init-website.php');
require_once(CONST_LibDir.'/AddressDetails.php');
class AddressDetailsTest extends \PHPUnit\Framework\TestCase
@ -30,7 +30,7 @@ class AddressDetailsTest extends \PHPUnit\Framework\TestCase
//
// 5) copy&paste into file. Add commas between records
//
$json = file_get_contents(CONST_BasePath.'/test/php/fixtures/address_details_10_downing_street.json');
$json = file_get_contents(CONST_DataDir.'/test/php/fixtures/address_details_10_downing_street.json');
$data = json_decode($json, true);
$this->oDbStub = $this->getMockBuilder(\DB::class)

View File

@ -2,7 +2,7 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/ClassTypes.php');
require_once(CONST_LibDir.'/ClassTypes.php');
class ClassTypesTest extends \PHPUnit\Framework\TestCase
{

View File

@ -2,8 +2,8 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/lib.php');
require_once(CONST_BasePath.'/lib/DB.php');
require_once(CONST_LibDir.'/lib.php');
require_once(CONST_LibDir.'/DB.php');
// subclassing so we can set the protected connection variable
class NominatimSubClassedDB extends \Nominatim\DB

View File

@ -2,8 +2,8 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/DatabaseError.php');
require_once(CONST_LibDir.'/init-website.php');
require_once(CONST_LibDir.'/DatabaseError.php');
class DatabaseErrorTest extends \PHPUnit\Framework\TestCase
{

View File

@ -2,7 +2,7 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/DebugHtml.php');
require_once(CONST_LibDir.'/DebugHtml.php');
class DebugTest extends \PHPUnit\Framework\TestCase
{

View File

@ -2,8 +2,8 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/lib.php');
require_once(CONST_BasePath.'/lib/ClassTypes.php');
require_once(CONST_LibDir.'/lib.php');
require_once(CONST_LibDir.'/ClassTypes.php');
class LibTest extends \PHPUnit\Framework\TestCase
{

View File

@ -2,7 +2,7 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/output.php');
require_once(CONST_LibDir.'/output.php');
class OutputTest extends \PHPUnit\Framework\TestCase
{

View File

@ -2,7 +2,7 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/ParameterParser.php');
require_once(CONST_LibDir.'/ParameterParser.php');
function userError($sError)

View File

@ -2,7 +2,7 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/Phrase.php');
require_once(CONST_LibDir.'/Phrase.php');
class TokensFullSet
{

View File

@ -2,7 +2,7 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/SearchContext.php');
require_once(CONST_LibDir.'/SearchContext.php');
class SearchContextTest extends \PHPUnit\Framework\TestCase
{

View File

@ -2,7 +2,7 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/Shell.php');
require_once(CONST_LibDir.'/Shell.php');
class ShellTest extends \PHPUnit\Framework\TestCase
{

View File

@ -2,8 +2,8 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/DB.php');
require_once(CONST_BasePath.'/lib/Status.php');
require_once(CONST_LibDir.'/DB.php');
require_once(CONST_LibDir.'/Status.php');
class StatusTest extends \PHPUnit\Framework\TestCase

View File

@ -2,7 +2,7 @@
namespace Nominatim;
require_once(CONST_BasePath.'/lib/TokenList.php');
require_once(CONST_LibDir.'/TokenList.php');
class TokenTest extends \PHPUnit\Framework\TestCase

View File

@ -1,4 +1,6 @@
<?php
@define('CONST_BasePath', '../..');
@define('CONST_LibDir', '../../lib');
@define('CONST_DataDir', '../..');
@define('CONST_Debug', true);
@define('CONST_NoAccessControl', false);