diff --git a/test/classes/plugin/export/ExportCodegenTest.php b/test/classes/plugin/export/ExportCodegenTest.php index ca6f30001f10..cf7bb3fb8a41 100644 --- a/test/classes/plugin/export/ExportCodegenTest.php +++ b/test/classes/plugin/export/ExportCodegenTest.php @@ -11,13 +11,15 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/config.default.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; + /** * tests for PMA\libraries\plugins\export\ExportCodegen class * * @package PhpMyAdmin-test * @group medium */ -class ExportCodegenTest extends PHPUnit_Framework_TestCase +class ExportCodegenTest extends PMATestCase { protected $object; diff --git a/test/classes/plugin/export/ExportCsvTest.php b/test/classes/plugin/export/ExportCsvTest.php index e748713234de..b1d6707943f8 100644 --- a/test/classes/plugin/export/ExportCsvTest.php +++ b/test/classes/plugin/export/ExportCsvTest.php @@ -11,13 +11,15 @@ require_once 'libraries/config.default.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; + /** * tests for PMA\libraries\plugins\export\ExportCsv class * * @package PhpMyAdmin-test * @group medium */ -class ExportCsvTest extends PHPUnit_Framework_TestCase +class ExportCsvTest extends PMATestCase { protected $object; diff --git a/test/classes/plugin/export/ExportExcelTest.php b/test/classes/plugin/export/ExportExcelTest.php index cd3d247e0b93..bedc852851ce 100644 --- a/test/classes/plugin/export/ExportExcelTest.php +++ b/test/classes/plugin/export/ExportExcelTest.php @@ -11,13 +11,15 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/config.default.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; + /** * tests for PMA\libraries\plugins\export\ExportExcel class * * @package PhpMyAdmin-test * @group medium */ -class ExportExcelTest extends PHPUnit_Framework_TestCase +class ExportExcelTest extends PMATestCase { protected $object; diff --git a/test/classes/plugin/export/ExportHtmlwordTest.php b/test/classes/plugin/export/ExportHtmlwordTest.php index 17b6d9299254..e036469757d5 100644 --- a/test/classes/plugin/export/ExportHtmlwordTest.php +++ b/test/classes/plugin/export/ExportHtmlwordTest.php @@ -13,13 +13,15 @@ require_once 'libraries/relation.lib.php'; require_once 'libraries/transformations.lib.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; + /** * tests for PMA\libraries\plugins\export\ExportHtmlword class * * @package PhpMyAdmin-test * @group medium */ -class ExportHtmlwordTest extends PHPUnit_Framework_TestCase +class ExportHtmlwordTest extends PMATestCase { protected $object; @@ -874,8 +876,6 @@ public function testExportStructure() */ public function testFormatOneColumnDefinition() { - $GLOBALS['cfg']['LimitChars'] = 40; - $method = new ReflectionMethod( 'PMA\libraries\plugins\export\ExportHtmlword', 'formatOneColumnDefinition' ); diff --git a/test/classes/plugin/export/ExportJsonTest.php b/test/classes/plugin/export/ExportJsonTest.php index 13c27f54e185..513efb2e987c 100644 --- a/test/classes/plugin/export/ExportJsonTest.php +++ b/test/classes/plugin/export/ExportJsonTest.php @@ -11,13 +11,15 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/config.default.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; + /** * tests for PMA\libraries\plugins\export\ExportJson class * * @package PhpMyAdmin-test * @group medium */ -class ExportJsonTest extends PHPUnit_Framework_TestCase +class ExportJsonTest extends PMATestCase { protected $object; diff --git a/test/classes/plugin/export/ExportLatexTest.php b/test/classes/plugin/export/ExportLatexTest.php index 034602fe6bb3..4fe1610b9a92 100644 --- a/test/classes/plugin/export/ExportLatexTest.php +++ b/test/classes/plugin/export/ExportLatexTest.php @@ -13,13 +13,15 @@ require_once 'libraries/relation.lib.php'; require_once 'libraries/transformations.lib.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; + /** * tests for PMA\libraries\plugins\export\ExportLatex class * * @package PhpMyAdmin-test * @group medium */ -class ExportLatexTest extends PHPUnit_Framework_TestCase +class ExportLatexTest extends PMATestCase { protected $object; @@ -754,7 +756,6 @@ public function testExportStructure() } $GLOBALS['cfgRelation']['relation'] = true; - $GLOBALS['cfg']['LimitChars'] = 40; $_SESSION['relation'][0] = array( 'PMA_VERSION' => PMA_VERSION, 'relwork' => true, diff --git a/test/classes/plugin/export/ExportMediawikiTest.php b/test/classes/plugin/export/ExportMediawikiTest.php index d66db87d0206..99840705047e 100644 --- a/test/classes/plugin/export/ExportMediawikiTest.php +++ b/test/classes/plugin/export/ExportMediawikiTest.php @@ -11,6 +11,7 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/config.default.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; /** * tests for PMA\libraries\plugins\export\ExportMediawiki class @@ -18,7 +19,7 @@ * @package PhpMyAdmin-test * @group medium */ -class ExportMediawikiTest extends PHPUnit_Framework_TestCase +class ExportMediawikiTest extends PMATestCase { protected $object; diff --git a/test/classes/plugin/export/ExportOdsTest.php b/test/classes/plugin/export/ExportOdsTest.php index 655dc305ea17..796132b953c9 100644 --- a/test/classes/plugin/export/ExportOdsTest.php +++ b/test/classes/plugin/export/ExportOdsTest.php @@ -14,6 +14,7 @@ require_once 'libraries/config.default.php'; require_once 'export.php'; require_once 'libraries/opendocument.lib.php'; +require_once 'test/PMATestCase.php'; /** * tests for PMA\libraries\plugins\export\ExportOds class @@ -21,7 +22,7 @@ * @package PhpMyAdmin-test * @group medium */ -class ExportOdsTest extends PHPUnit_Framework_TestCase +class ExportOdsTest extends PMATestCase { protected $object; diff --git a/test/classes/plugin/export/ExportOdtTest.php b/test/classes/plugin/export/ExportOdtTest.php index 3f51872c675f..244a0be9f1ca 100644 --- a/test/classes/plugin/export/ExportOdtTest.php +++ b/test/classes/plugin/export/ExportOdtTest.php @@ -15,6 +15,7 @@ require_once 'libraries/relation.lib.php'; require_once 'libraries/transformations.lib.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; /** * tests for PMA\libraries\plugins\export\ExportOdt class @@ -22,7 +23,7 @@ * @package PhpMyAdmin-test * @group medium */ -class ExportOdtTest extends PHPUnit_Framework_TestCase +class ExportOdtTest extends PMATestCase { protected $object; @@ -1051,8 +1052,6 @@ public function testExportStructure() */ public function testFormatOneColumnDefinition() { - $GLOBALS['cfg']['LimitChars'] = 40; - $method = new ReflectionMethod( 'PMA\libraries\plugins\export\ExportOdt', 'formatOneColumnDefinition' ); diff --git a/test/classes/plugin/export/ExportPdfTest.php b/test/classes/plugin/export/ExportPdfTest.php index 13cb0938e0e3..5f8bc666261b 100644 --- a/test/classes/plugin/export/ExportPdfTest.php +++ b/test/classes/plugin/export/ExportPdfTest.php @@ -12,6 +12,7 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/config.default.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; /** * tests for PMA\libraries\plugins\export\ExportPdf class @@ -19,7 +20,7 @@ * @package PhpMyAdmin-test * @group medium */ -class ExportPdfTest extends PHPUnit_Framework_TestCase +class ExportPdfTest extends PMATestCase { protected $object; diff --git a/test/classes/plugin/export/ExportPhparrayTest.php b/test/classes/plugin/export/ExportPhparrayTest.php index 6c5bd4c934ea..7082c2897193 100644 --- a/test/classes/plugin/export/ExportPhparrayTest.php +++ b/test/classes/plugin/export/ExportPhparrayTest.php @@ -11,6 +11,7 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/config.default.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; /** * tests for PMA\libraries\plugins\export\ExportPhparray class @@ -18,7 +19,7 @@ * @package PhpMyAdmin-test * @group medium */ -class ExportPhparrayTest extends PHPUnit_Framework_TestCase +class ExportPhparrayTest extends PMATestCase { protected $object; diff --git a/test/classes/plugin/export/ExportSqlTest.php b/test/classes/plugin/export/ExportSqlTest.php index fac1830b3385..14d2b88734e5 100644 --- a/test/classes/plugin/export/ExportSqlTest.php +++ b/test/classes/plugin/export/ExportSqlTest.php @@ -16,6 +16,7 @@ require_once 'libraries/transformations.lib.php'; require_once 'libraries/charset_conversion.lib.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; /** * tests for PMA\libraries\plugins\export\ExportSql class @@ -23,7 +24,7 @@ * @package PhpMyAdmin-test * @group medium */ -class ExportSqlTest extends PHPUnit_Framework_TestCase +class ExportSqlTest extends PMATestCase { protected $object; @@ -856,7 +857,6 @@ public function testGetTableDefForView() { $GLOBALS['sql_drop_table'] = true; $GLOBALS['sql_if_not_exists'] = true; - $GLOBALS['cfg']['LimitChars'] = 40; $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface') ->disableOriginalConstructor() diff --git a/test/classes/plugin/export/ExportTexytextTest.php b/test/classes/plugin/export/ExportTexytextTest.php index 04b0874d0f12..469b7f555bd6 100644 --- a/test/classes/plugin/export/ExportTexytextTest.php +++ b/test/classes/plugin/export/ExportTexytextTest.php @@ -13,6 +13,7 @@ require_once 'libraries/relation.lib.php'; require_once 'libraries/transformations.lib.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; /** * tests for PMA\libraries\plugins\export\ExportTexytext class @@ -20,7 +21,7 @@ * @package PhpMyAdmin-test * @group medium */ -class ExportTexytextTest extends PHPUnit_Framework_TestCase +class ExportTexytextTest extends PMATestCase { protected $object; @@ -617,8 +618,6 @@ public function testExportStructure() */ public function testFormatOneColumnDefinition() { - $GLOBALS['cfg']['LimitChars'] = 40; - $cols = array( 'Null' => 'Yes', 'Field' => 'field', diff --git a/test/classes/plugin/export/ExportXmlTest.php b/test/classes/plugin/export/ExportXmlTest.php index 305a8a5a926e..71b055ccfe15 100644 --- a/test/classes/plugin/export/ExportXmlTest.php +++ b/test/classes/plugin/export/ExportXmlTest.php @@ -14,6 +14,7 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/config.default.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; /** * tests for PMA\libraries\plugins\export\ExportXml class @@ -21,7 +22,7 @@ * @package PhpMyAdmin-test * @group medium */ -class ExportXmlTest extends PHPUnit_Framework_TestCase +class ExportXmlTest extends PMATestCase { protected $object; diff --git a/test/classes/plugin/export/ExportYamlTest.php b/test/classes/plugin/export/ExportYamlTest.php index 2793417ca9cc..6a37263bb5f6 100644 --- a/test/classes/plugin/export/ExportYamlTest.php +++ b/test/classes/plugin/export/ExportYamlTest.php @@ -12,6 +12,7 @@ require_once 'libraries/config.default.php'; require_once 'libraries/database_interface.inc.php'; require_once 'export.php'; +require_once 'test/PMATestCase.php'; /** * tests for PMA\libraries\plugins\export\ExportYaml class @@ -19,7 +20,7 @@ * @package PhpMyAdmin-test * @group medium */ -class ExportYamlTest extends PHPUnit_Framework_TestCase +class ExportYamlTest extends PMATestCase { protected $object; diff --git a/test/classes/plugin/export/TablePropertyTest.php b/test/classes/plugin/export/TablePropertyTest.php index 0041dcc7962b..7b4f4d2f16a0 100644 --- a/test/classes/plugin/export/TablePropertyTest.php +++ b/test/classes/plugin/export/TablePropertyTest.php @@ -9,13 +9,14 @@ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/config.default.php'; +require_once 'test/PMATestCase.php'; /** * tests for PMA\libraries\plugins\export\TableProperty class * * @package PhpMyAdmin-test */ -class TablePropertyTest extends PHPUnit_Framework_TestCase +class TablePropertyTest extends PMATestCase { protected $object;