diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php index ef2a4fed11..f986883aac 100644 --- a/test/classes/Display/ResultsTest.php +++ b/test/classes/Display/ResultsTest.php @@ -46,6 +46,7 @@ class ResultsTest extends PmaTestCase $GLOBALS['PMA_Config'] = new Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['text_dir'] = 'ltr'; + $_SESSION[' HMAC_secret '] = 'test'; $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') ->disableOriginalConstructor() @@ -1323,7 +1324,7 @@ class ResultsTest extends PmaTestCase $meta = new stdClass(); $meta->type = 'BLOB'; $meta->orgtable = 'bar'; - $url_params = array('db' => 'foo', 'table' => 'bar'); + $url_params = array('db' => 'foo', 'table' => 'bar', 'where_clause' => 'where_clause'); return array( array( @@ -1337,9 +1338,7 @@ class ResultsTest extends PmaTestCase $meta, $url_params, null, - '1001' + 'class="disableAjax">1001' ), array( true, @@ -1352,9 +1351,7 @@ class ResultsTest extends PmaTestCase $meta, $url_params, null, - '0x123456' + 'class="disableAjax">0x123456' ), array( true, @@ -1367,9 +1364,7 @@ class ResultsTest extends PmaTestCase $meta, $url_params, null, - '[BLOB - 4 B]' + 'class="disableAjax">[BLOB - 4 B]' ), array( false, @@ -1431,7 +1426,7 @@ class ResultsTest extends PmaTestCase $_SESSION['tmpval']['display_binary'] = $display_binary; $_SESSION['tmpval']['display_blob'] = $display_blob; $GLOBALS['cfg']['LimitChars'] = 50; - $this->assertEquals( + $this->assertContains( $output, $this->_callPrivateFunction( '_handleNonPrintableContents', @@ -1471,7 +1466,7 @@ class ResultsTest extends PmaTestCase $meta2->decimals = 0; $meta2->name = 'varchar'; $meta2->orgname = 'varchar'; - $url_params = array('db' => 'foo', 'table' => 'tbl'); + $url_params = array('db' => 'foo', 'table' => 'tbl', 'where_clause' => 'where_clause'); return array( array( @@ -1489,11 +1484,7 @@ class ResultsTest extends PmaTestCase array(), 0, 'binary', - '' . PHP_EOL - . ' [BLOB - 4 B]' . PHP_EOL + 'class="disableAjax">[BLOB - 4 B]' . PHP_EOL . '' . PHP_EOL ), array( @@ -1596,7 +1587,7 @@ class ResultsTest extends PmaTestCase $_SESSION['tmpval']['relational_display'] = false; $GLOBALS['cfg']['LimitChars'] = 50; $GLOBALS['cfg']['ProtectBinary'] = $protectBinary; - $this->assertEquals( + $this->assertContains( $output, $this->_callPrivateFunction( '_getDataCellForNonNumericColumns',