Fix expected data without html escaping

phpmyadmin · Aug 12, 2013 · d92c5e5 · d92c5e5
1 parent 6521ed2
commit d92c5e5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/test/classes/plugin/export/PMA_ExportCodegen_test.php b/test/classes/plugin/export/PMA_ExportCodegen_test.php
@@ -256,22 +256,22 @@ public function testExportData()
         $result = ob_get_clean();
 
         $this->assertContains(
-            '&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;',
+            '<?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?>',
             $result
         );
 
         $this->assertContains(
-            '&lt;class name=&quot;TestTable&quot; table=&quot;TestTable&quot;&gt;',
+            '<class name=&quot;TestTable&quot; table=&quot;TestTable&quot;>',
             $result
         );
 
         $this->assertContains(
-            '&lt;/class&gt;',
+            '</class>',
             $result
         );
 
         $this->assertContains(
-            '&lt;/hibernate-mapping&gt;',
+            '</hibernate-mapping>',
             $result
         );
 

diff --git a/test/classes/plugin/export/PMA_ExportHtmlword_test.php b/test/classes/plugin/export/PMA_ExportHtmlword_test.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin-test
  */
 require_once 'libraries/plugins/export/ExportHtmlword.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Config.class.php';
@@ -295,7 +296,7 @@ public function testExportDBHeader()
         $result = ob_get_clean();
 
         $this->assertEquals(
-            '&lt;h1&gt;Database d&amp;quot;b&lt;/h1&gt;',
+            '<h1>Database d&amp;quot;b</h1>',
             $result
         );
     }
@@ -828,7 +829,7 @@ public function testExportStructure()
         $result = ob_get_clean();
 
         $this->assertEquals(
-            '&lt;h2&gt;Table structure for table tbl&lt;/h2&gt;dumpText1',
+            '<h2>Table structure for table tbl</h2>dumpText1',
             $result
         );
 
@@ -841,7 +842,7 @@ public function testExportStructure()
         $result = ob_get_clean();
 
         $this->assertEquals(
-            '&lt;h2&gt;Triggers tbl&lt;/h2&gt;dumpText2',
+            '<h2>Triggers tbl</h2>dumpText2',
             $result
         );
 
@@ -854,7 +855,7 @@ public function testExportStructure()
         $result = ob_get_clean();
 
         $this->assertEquals(
-            '&lt;h2&gt;Structure for view tbl&lt;/h2&gt;dumpText3',
+            '<h2>Structure for view tbl</h2>dumpText3',
             $result
         );
 
@@ -867,7 +868,7 @@ public function testExportStructure()
         $result = ob_get_clean();
 
         $this->assertEquals(
-            '&lt;h2&gt;Stand-in structure for view tbl&lt;/h2&gt;dumpText4',
+            '<h2>Stand-in structure for view tbl</h2>dumpText4',
             $result
         );
     }

diff --git a/test/classes/plugin/export/PMA_ExportMediawiki_test.php b/test/classes/plugin/export/PMA_ExportMediawiki_test.php
@@ -300,9 +300,9 @@ public function testExportStructure()
         $result = ob_get_clean();
 
         $this->assertEquals(
-            "\n&lt;!--\n" .
+            "\n<!--\n" .
             "Table structure for `table`\n" .
-            "--&gt;\n" .
+            "-->\n" .
             "\n" .
             "{| class=&quot;wikitable&quot; style=&quot;text-align:center;&quot;\n" .
             "|+'''table'''\n" .
@@ -415,9 +415,9 @@ public function testExportData()
         $result = ob_get_clean();
 
         $this->assertEquals(
-            "\n&lt;!--\n" .
+            "\n<!--\n" .
             "Table data for `table`\n" .
-            "--&gt;\n" .
+            "-->\n" .
             "\n" .
             "{| class=&quot;wikitable sortable&quot; style=&quot;text-align:" .
             "center;&quot;\n" .