gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failing tests after tear down cleans everything

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-05-21 13:14:40 +02:00
parent afc734846d
commit f89f4c9f2c
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
15 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/classes/AbstractTestCase.php
View File

@ -125,11 +125,6 @@ abstract class AbstractTestCase extends TestCase
// phpcs:enable
}
protected function setUpEnv(): void
{
require ROOT_PATH . 'test/bootstrap-dist.php';
}
/**
* Desctroys the environment built for the test.
* Clean all variables

1
test/classes/CharsetsTest.php
View File

@ -17,7 +17,6 @@ class CharsetsTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::setUpEnv();
$GLOBALS['cfg']['DBG']['sql'] = false;
$GLOBALS['cfg']['Server']['DisableIS'] = false;
}

5
test/classes/CoreTest.php
View File

@ -30,6 +30,8 @@ class CoreTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::setTheme();
parent::setLanguage();
parent::loadDefaultConfig();
$GLOBALS['server'] = 0;
@ -598,7 +600,6 @@ class CoreTest extends PmaTestCase
public function testSendHeaderLocationWithoutSidWithIis()
{
$GLOBALS['server'] = 0;
parent::setGlobalConfig();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['PMA_Config']->set('PMA_IS_IIS', true);
@ -607,8 +608,6 @@ class CoreTest extends PmaTestCase
$this->mockResponse('Location: ' . $testUri);
Core::sendHeaderLocation($testUri); // sets $GLOBALS['header']
$this->tearDown();
$this->mockResponse('Refresh: 0; ' . $testUri);
Core::sendHeaderLocation($testUri, true); // sets $GLOBALS['header']
}

1
test/classes/CreateAddFieldTest.php
View File

@ -23,7 +23,6 @@ class CreateAddFieldTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::setUpEnv();
$this->createAddField = new CreateAddField($GLOBALS['dbi']);
}

22
test/classes/Database/EventsTest.php
View File

@ -10,6 +10,7 @@ use PhpMyAdmin\Database\Events;
use PhpMyAdmin\Response;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use ReflectionProperty;
class EventsTest extends AbstractTestCase
{
@ -22,16 +23,19 @@ class EventsTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
$GLOBALS['text_dir'] = 'ltr';
parent::setGlobalConfig();
parent::setLanguage();
$GLOBALS['text_dir'] = 'ltr';
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['server'] = 0;
$GLOBALS['db'] = 'db';
$GLOBALS['table'] = 'table';
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
$GLOBALS['cfg']['Server']['DisableIS'] = false;
$GLOBALS['tear_down']['server'] = true;
$response = new ReflectionProperty(Response::class, '_instance');
$response->setAccessible(true);
$response->setValue(null);
$response->setAccessible(false);
$this->events = new Events(
$GLOBALS['dbi'],
new Template(),
@ -39,18 +43,6 @@ class EventsTest extends AbstractTestCase
);
}
/**
* Tear down
*/
protected function tearDown(): void
{
parent::tearDown();
if ($GLOBALS['tear_down']['server']) {
unset($GLOBALS['cfg']['ServerDefault']);
}
unset($GLOBALS['tear_down']);
}
/**
* Test for getDataFromRequest
*

1
test/classes/Database/QbeTest.php
View File

@ -30,7 +30,6 @@ class QbeTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::setUpEnv();
$GLOBALS['server'] = 0;
$GLOBALS['db'] = 'pma_test';
$this->object = new Qbe(new Relation($GLOBALS['dbi']), new Template(), $GLOBALS['dbi'], 'pma_test');

2
test/classes/Database/RoutinesTest.php
View File

@ -23,8 +23,8 @@ class RoutinesTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::setUpEnv();
parent::setGlobalConfig();
parent::setLanguage();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['cfg']['Server']['DisableIS'] = false;
$GLOBALS['cfg']['ActionLinksMode'] = 'icons';

2
test/classes/Database/TriggersTest.php
View File

@ -21,8 +21,8 @@ class TriggersTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::setUpEnv();
parent::setGlobalConfig();
parent::setLanguage();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['cfg']['Server']['DisableIS'] = false;
$GLOBALS['db'] = 'pma_test';

1
test/classes/Engines/InnodbTest.php
View File

@ -26,7 +26,6 @@ class InnodbTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::setUpEnv();
$GLOBALS['server'] = 0;
$this->object = new Innodb('innodb');
}

16
test/classes/InsertEditTest.php
View File

@ -38,6 +38,8 @@ class InsertEditTest extends AbstractTestCase
{
parent::setUp();
parent::setLanguage();
parent::setGlobalConfig();
parent::loadDefaultConfig();
$GLOBALS['server'] = 1;
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
$GLOBALS['cfg']['ServerDefault'] = 1;
@ -65,11 +67,21 @@ class InsertEditTest extends AbstractTestCase
$GLOBALS['cfg']['Confirm'] = true;
$GLOBALS['cfg']['LoginCookieValidity'] = 1440;
$GLOBALS['cfg']['enable_drag_drop_import'] = true;
parent::setGlobalConfig();
$this->insertEdit = new InsertEdit($GLOBALS['dbi']);
}
/**
* Teardown all objects
*/
protected function tearDown(): void
{
parent::tearDown();
$response = new ReflectionProperty(Response::class, '_instance');
$response->setAccessible(true);
$response->setValue(null);
$response->setAccessible(false);
}
/**
* Call protected functions by setting visibility to public.
*

1
test/classes/RelationCleanupTest.php
View File

@ -31,7 +31,6 @@ class RelationCleanupTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::setUpEnv();
$GLOBALS['server'] = 1;
$_SESSION['relation'] = [];
$_SESSION['relation'][$GLOBALS['server']] = [

1
test/classes/ReplicationGuiTest.php
View File

@ -33,7 +33,6 @@ class ReplicationGuiTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::setUpEnv();
//$_POST
$_POST['mr_adduser'] = 'mr_adduser';

1
test/classes/Server/PluginsTest.php
View File

@ -14,7 +14,6 @@ class PluginsTest extends AbstractTestCase
public function testGetAll(): void
{
parent::setUpEnv();
$GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
$GLOBALS['cfg']['Server']['DisableIS'] = false;
$GLOBALS['server'] = 0;

1
test/classes/Table/SearchTest.php
View File

@ -14,7 +14,6 @@ class SearchTest extends AbstractTestCase
protected function setUp(): void
{
parent::setUp();
parent::setUpEnv();
global $dbi;
$this->search = new Search($dbi);

1
test/classes/TypesTest.php
View File

@ -23,7 +23,6 @@ class TypesTest extends PmaTestCase
protected function setUp(): void
{
parent::setUp();
parent::setUpEnv();
$this->object = new Types($GLOBALS['dbi']);
}