Add PMA_VERSION to fix failing tests

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

19 files changed, 32 insertions, 0 deletions

diff --git a/test/classes/PMA_SystemDatabase_test.php b/test/classes/PMA_SystemDatabase_test.php
index 35c973f747..88d7e7f1cb 100644
--- a/test/classes/PMA_SystemDatabase_test.php
+++ b/test/classes/PMA_SystemDatabase_test.php
@@ -39,6 +39,7 @@ class PMA_SystemDatabaseTest extends PHPUnit_Framework_TestCase
 
         //_SESSION
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
             'db' => "information_schema",
diff --git a/test/classes/plugin/export/PMA_ExportHtmlword_test.php b/test/classes/plugin/export/PMA_ExportHtmlword_test.php
index 1dfc41cd13..23d2f6a1e3 100644
--- a/test/classes/plugin/export/PMA_ExportHtmlword_test.php
+++ b/test/classes/plugin/export/PMA_ExportHtmlword_test.php
@@ -544,6 +544,7 @@ class PMA_ExportHtmlword_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfgRelation']['relation'] = true;
         $GLOBALS['controllink'] = null;
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
             'mimework' => true,
@@ -641,6 +642,7 @@ class PMA_ExportHtmlword_Test extends PHPUnit_Framework_TestCase
 
         $GLOBALS['cfgRelation']['relation'] = true;
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
             'mimework' => true,
@@ -709,6 +711,7 @@ class PMA_ExportHtmlword_Test extends PHPUnit_Framework_TestCase
 
         $GLOBALS['cfgRelation']['relation'] = true;
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'relwork' => false,
             'commwork' => false,
             'mimework' => false,
diff --git a/test/classes/plugin/export/PMA_ExportLatex_test.php b/test/classes/plugin/export/PMA_ExportLatex_test.php
index ae16bde416..ce3d50a9eb 100644
--- a/test/classes/plugin/export/PMA_ExportLatex_test.php
+++ b/test/classes/plugin/export/PMA_ExportLatex_test.php
@@ -763,6 +763,7 @@ class PMA_ExportLatex_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfgRelation']['relation'] = true;
         $GLOBALS['cfg']['LimitChars'] = 40;
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
             'mimework' => true,
@@ -877,6 +878,7 @@ class PMA_ExportLatex_Test extends PHPUnit_Framework_TestCase
 
         $GLOBALS['cfgRelation']['relation'] = true;
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
             'mimework' => true,
@@ -952,6 +954,7 @@ class PMA_ExportLatex_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['Server']['verbose'] = 'verb';
 
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'relwork' => false,
             'commwork' => false,
             'mimework' => false,
diff --git a/test/classes/plugin/export/PMA_ExportOdt_test.php b/test/classes/plugin/export/PMA_ExportOdt_test.php
index 4526a313b4..c625455aae 100644
--- a/test/classes/plugin/export/PMA_ExportOdt_test.php
+++ b/test/classes/plugin/export/PMA_ExportOdt_test.php
@@ -746,6 +746,7 @@ class PMA_ExportOdt_Test extends PHPUnit_Framework_TestCase
 
         $GLOBALS['cfgRelation']['relation'] = true;
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
             'mimework' => true,
@@ -856,6 +857,7 @@ class PMA_ExportOdt_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['odt_buffer'] = '';
         $GLOBALS['cfgRelation']['relation'] = true;
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
             'mimework' => true,
diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php
index c4f7a18f37..92d5f03589 100644
--- a/test/classes/plugin/export/PMA_ExportSql_test.php
+++ b/test/classes/plugin/export/PMA_ExportSql_test.php
@@ -1554,6 +1554,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
     public function testGetTableComments()
     {
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
             'mimework' => true,
diff --git a/test/classes/plugin/export/PMA_ExportTexytext_test.php b/test/classes/plugin/export/PMA_ExportTexytext_test.php
index eaaace230b..ecf3983c38 100644
--- a/test/classes/plugin/export/PMA_ExportTexytext_test.php
+++ b/test/classes/plugin/export/PMA_ExportTexytext_test.php
@@ -447,6 +447,7 @@ class PMA_ExportTexytext_Test extends PHPUnit_Framework_TestCase
 
         $GLOBALS['cfgRelation']['relation'] = true;
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
             'mimework' => true,
diff --git a/test/classes/schema/Dia_Relation_Schema_test.php b/test/classes/schema/Dia_Relation_Schema_test.php
index 04754a6d42..ca29aabc52 100644
--- a/test/classes/schema/Dia_Relation_Schema_test.php
+++ b/test/classes/schema/Dia_Relation_Schema_test.php
@@ -55,6 +55,7 @@ class PMA_Dia_Relation_Schema_Test extends PHPUnit_Framework_TestCase
 
         //_SESSION
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
             'db' => "information_schema",
diff --git a/test/classes/schema/Eps_Relation_Schema_test.php b/test/classes/schema/Eps_Relation_Schema_test.php
index 14daedd228..9576d8ff85 100644
--- a/test/classes/schema/Eps_Relation_Schema_test.php
+++ b/test/classes/schema/Eps_Relation_Schema_test.php
@@ -55,6 +55,7 @@ class PMA_Eps_Relation_Schema_Test extends PHPUnit_Framework_TestCase
 
         //_SESSION
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
             'db' => "information_schema",
diff --git a/test/classes/schema/Pdf_Relation_Schema_test.php b/test/classes/schema/Pdf_Relation_Schema_test.php
index 3ad8485049..ce66dba650 100644
--- a/test/classes/schema/Pdf_Relation_Schema_test.php
+++ b/test/classes/schema/Pdf_Relation_Schema_test.php
@@ -66,6 +66,7 @@ class PMA_Pdf_Relation_Schema_Test extends PHPUnit_Framework_TestCase
 
         //_SESSION
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
             'db' => "information_schema",
diff --git a/test/classes/schema/Svg_Relation_Schema_test.php b/test/classes/schema/Svg_Relation_Schema_test.php
index c630e04ee8..5648b3ca09 100644
--- a/test/classes/schema/Svg_Relation_Schema_test.php
+++ b/test/classes/schema/Svg_Relation_Schema_test.php
@@ -54,6 +54,7 @@ class PMA_Svg_Relation_Schema_Test extends PHPUnit_Framework_TestCase
 
         //_SESSION
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
             'db' => "information_schema",
diff --git a/test/libraries/PMA_Tracker_test.php b/test/libraries/PMA_Tracker_test.php
index ce9e15dafe..69332586ca 100644
--- a/test/libraries/PMA_Tracker_test.php
+++ b/test/libraries/PMA_Tracker_test.php
@@ -45,6 +45,7 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['DBG']['sql'] = false;
 
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'db' => 'pmadb',
             'tracking' => 'tracking'
         );
@@ -107,6 +108,7 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
         PMA_Tracker::enable();
 
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'trackingwork' => false
         );
 
@@ -115,6 +117,7 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
         );
 
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'trackingwork' => true,
             'db' => 'pmadb',
             'tracking' => 'tracking'
@@ -180,6 +183,7 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
 
         PMA_Tracker::enable();
 
+        $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
         $_SESSION['relation'][$GLOBALS['server']]['trackingwork'] = false;
 
         $this->assertFalse(
diff --git a/test/libraries/PMA_central_columns_test.php b/test/libraries/PMA_central_columns_test.php
index d7b408256d..250347fa3e 100644
--- a/test/libraries/PMA_central_columns_test.php
+++ b/test/libraries/PMA_central_columns_test.php
@@ -90,6 +90,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
         $_SESSION['PMA_Theme'] = new PMA_Theme();
         $_SESSION['relation'][1] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'centralcolumnswork' => true,
             'relwork' => 1,
             'db' => 'phpmyadmin',
diff --git a/test/libraries/PMA_mult_submits_test.php b/test/libraries/PMA_mult_submits_test.php
index b6523117b2..0691c9c301 100644
--- a/test/libraries/PMA_mult_submits_test.php
+++ b/test/libraries/PMA_mult_submits_test.php
@@ -56,6 +56,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
 
         //_SESSION
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
             'db' => "information_schema",
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index 24e84316cc..8fdf15523b 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -87,6 +87,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
         $_SESSION['PMA_Theme'] = new PMA_Theme();
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'db' => 'pmadb',
             'users' => 'users',
             'usergroups' => 'usergroups',
@@ -1862,6 +1863,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         $_REQUEST['old_hostname'] = "old_hostname";
         $_REQUEST['old_username'] = "old_username";
         $_SESSION['relation'][1] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'bookmarkwork' => false,
             'historywork' => false,
             'recentwork' => false,
diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php
index 3dd51133ae..8b44a9ac1a 100644
--- a/test/libraries/PMA_server_user_groups_test.php
+++ b/test/libraries/PMA_server_user_groups_test.php
@@ -36,6 +36,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
 
         $GLOBALS['server'] = 1;
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'db' => 'pmadb',
             'users' => 'users',
             'usergroups' => 'usergroups'
diff --git a/test/libraries/PMA_sql_query_form_test.php b/test/libraries/PMA_sql_query_form_test.php
index 1b0ad82f16..efccabb513 100644
--- a/test/libraries/PMA_sql_query_form_test.php
+++ b/test/libraries/PMA_sql_query_form_test.php
@@ -62,6 +62,7 @@ class PMA_SqlQueryForm_Test extends PHPUnit_Framework_TestCase
 
         //_SESSION
         $_SESSION['relation'][0] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
             'db' => "information_schema",
diff --git a/test/libraries/PMA_tbl_tracking_test.php b/test/libraries/PMA_tbl_tracking_test.php
index a226bf02bc..e7111c3b50 100644
--- a/test/libraries/PMA_tbl_tracking_test.php
+++ b/test/libraries/PMA_tbl_tracking_test.php
@@ -50,6 +50,7 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
 
         $_SESSION['relation'][$GLOBALS['server']] = array(
+            'PMA_VERSION' => PMA_VERSION,
             'db' => 'pmadb',
             'tracking' => 'tracking',
             'trackingwork' => true
diff --git a/test/libraries/PMA_transformation_test.php b/test/libraries/PMA_transformation_test.php
index 7fe949fba0..d070fe01f8 100644
--- a/test/libraries/PMA_transformation_test.php
+++ b/test/libraries/PMA_transformation_test.php
@@ -181,6 +181,7 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
      */
     public function testGetMime()
     {
+        $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
         $_SESSION['relation'][$GLOBALS['server']]['commwork'] = true;
         $_SESSION['relation'][$GLOBALS['server']]['db'] = "pmadb";
         $_SESSION['relation'][$GLOBALS['server']]['column_info'] = "column_info";
@@ -259,6 +260,7 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
             $actual
         );
 
+        $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
         $_SESSION['relation'][$GLOBALS['server']]['column_info'] = "column_info";
         $_SESSION['relation'][$GLOBALS['server']]['db'] = "pmadb";
 
diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php
index 56c078a9f1..ab7dc1a0c8 100644
--- a/test/libraries/PMA_user_preferences_test.php
+++ b/test/libraries/PMA_user_preferences_test.php
@@ -78,6 +78,8 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
      */
     public function testLoadUserprefs()
     {
+        $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
+
         $_SESSION['relation'][$GLOBALS['server']]['userconfigwork'] = null;
         unset($_SESSION['userconfig']);
 
@@ -152,6 +154,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
     public function testSaveUserprefs()
     {
         $GLOBALS['server'] = 2;
+        $_SESSION['relation'][2]['PMA_VERSION'] = PMA_VERSION;
         $_SESSION['relation'][2]['userconfigwork'] = null;
         unset($_SESSION['userconfig']);
 
@@ -322,6 +325,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
      */
     public function testPersistOption()
     {
+        $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
         $_SESSION['relation'][$GLOBALS['server']]['userconfigwork'] = null;
         $_SESSION['userconfig'] = array();
         $_SESSION['userconfig']['ts'] = "123";