From 414c1979c1eeca8830fd1632f3d153a3de56bf9b Mon Sep 17 00:00:00 2001
From: Leonardo Strozzi <laps15@inf.ufpr.br>
Date: Wed, 20 Jun 2018 21:02:03 -0300
Subject: [PATCH] Change search test

Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
---
 test/classes/Database/SearchTest.php | 35 +++++++++++-----------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php
index eea72e99dc..bcc511eee4 100644
--- a/test/classes/Database/SearchTest.php
+++ b/test/classes/Database/SearchTest.php
@@ -181,44 +181,35 @@ class SearchTest extends PmaTestCase
      *
      * @return void
      */
-    public function testGetSelectionForm()
+    public function testGetMainHtml()
     {
-        $form = $this->object->getSelectionForm();
-        $this->assertContains('<form', $form);
-        $this->assertContains('<a id="togglesearchformlink">', $form);
-        $this->assertContains('criteriaSearchType', $form);
-    }
+        $main = $this->object->getMainHtml();
 
-    /**
-     * Test for getResultDivs
-     *
-     * @return void
-     */
-    public function testGetResultDivs()
-    {
-        $actual = $this->callProtectedFunction(
-            'getResultDivs',
-            []
-        );
+        // test selection form
+        $this->assertContains('<form', $main);
+        $this->assertContains('<a id="togglesearchformlink">', $main);
+        $this->assertContains('criteriaSearchType', $main);
+
+        // test result divs
         $this->assertContains(
             '<div id="table-info"',
-            $actual
+            $main
         );
         $this->assertContains(
             '<a id="table-link"',
-            $actual
+            $main
         );
         $this->assertContains(
             '<div id="browse-results"',
-            $actual
+            $main
         );
         $this->assertContains(
             '<div id="sqlqueryform"',
-            $actual
+            $main
         );
         $this->assertContains(
             '<a id="togglequerybox"',
-            $actual
+            $main
         );
     }
 }