Fixed test.

3 files changed, 7 insertions, 15 deletions

diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php
index ab0f02190f..c4f7a18f37 100644
--- a/test/classes/plugin/export/PMA_ExportSql_test.php
+++ b/test/classes/plugin/export/PMA_ExportSql_test.php
@@ -1248,7 +1248,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
 
         $result = $this->object->getTableDef(
-            'db', 'table', "\n", "example.com/err", true, true, true
+            'db', 'table', "\n", "example.com/err", true, true, false
         );
 
         $this->assertContains(
@@ -1402,7 +1402,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
 
         $row = array(
             '',
-            "CREATE TABLE `db`.`table` (\n" .
+            "CREATE TABLE `table` (\n" .
             "`id` INT NOT NULL AUTO_INCREMENT,\n" .
             "username VARCHAR(64) NULL,\n" .
             "`password` VARCHAR(256) DEFAULT '123456',\n" .
@@ -1420,7 +1420,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
 
         $result = $this->object->getTableDef(
-            'db', 'table', "\n", "example.com/err", true, true, true
+            'db', 'table', "\n", "example.com/err", true, true, false
         );
 
         $this->assertContains(
@@ -1533,7 +1533,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
 
         $result = $this->object->getTableDef(
-            'db', 'table', "\n", "example.com/err", true, true, true
+            'db', 'table', "\n", "example.com/err", true, true, false
         );
 
         $this->assertContains(
diff --git a/test/classes/plugin/import/ImportCsv_test.php b/test/classes/plugin/import/ImportCsv_test.php
index b1ac9c5e55..2707c0d859 100644
--- a/test/classes/plugin/import/ImportCsv_test.php
+++ b/test/classes/plugin/import/ImportCsv_test.php
@@ -145,10 +145,7 @@ class ImportCsv_Test extends PHPUnit_Framework_TestCase
                 $sql_query
             );
         }
-        $this->assertContains(
-            'SET utf8 COLLATE utf8_general_ci',
-            $sql_query
-        );
+
         $this->assertContains(
             'CREATE TABLE IF NOT EXISTS `CSV_DB`.`TBL_NAME`',
             $sql_query
@@ -158,7 +155,6 @@ class ImportCsv_Test extends PHPUnit_Framework_TestCase
             true,
             $GLOBALS['finished']
         );
-
     }
 
     /**
@@ -211,10 +207,7 @@ class ImportCsv_Test extends PHPUnit_Framework_TestCase
                 $sql_query
             );
         }
-        $this->assertContains(
-            'SET utf8 COLLATE utf8_general_ci',
-            $sql_query
-        );
+
         $this->assertContains(
             'CREATE TABLE IF NOT EXISTS `CSV_DB`.`TBL_NAME`',
             $sql_query
@@ -224,6 +217,5 @@ class ImportCsv_Test extends PHPUnit_Framework_TestCase
             true,
             $GLOBALS['finished']
         );
-
     }
 }
diff --git a/test/classes/plugin/import/ImportOds_test.php b/test/classes/plugin/import/ImportOds_test.php
index 79439f6d96..3a2778f0c6 100644
--- a/test/classes/plugin/import/ImportOds_test.php
+++ b/test/classes/plugin/import/ImportOds_test.php
@@ -138,7 +138,7 @@ class ImportOds_Test extends PHPUnit_Framework_TestCase
         //asset that all sql are executed
         if (PMA_DRIZZLE) {
             $this->assertContains(
-                'CREATE DATABASE IF NOT EXISTS `ODS_DB` DEFAULT COLLATE utf8_general_ci',
+                'CREATE DATABASE IF NOT EXISTS `ODS_DB` COLLATE utf8_general_ci',
                 $sql_query
             );
         } else {