Merge branch 'QA_4_6'

1 files changed, 46 insertions, 15 deletions

diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php
index b50b4d9ab4..ddc4406f87 100644
--- a/test/classes/ErrorHandlerTest.php
+++ b/test/classes/ErrorHandlerTest.php
@@ -180,14 +180,43 @@ class ErrorHandlerTest extends PMATestCase
      */
     public function testCountErrors()
     {
+        $this->object->addError(
+            'Compile Error', E_WARNING, 'error.txt', 15
+        );
+        $this->assertEquals(
+            1,
+            $this->object->countErrors()
+        );
+    }
 
-        $err = array();
-        $err[] = new PMA\libraries\Error('256', 'Compile Error', 'error.txt', 15);
-        $errHandler = $this->getMock('PMA\libraries\ErrorHandler');
-        $errHandler->expects($this->any())
-            ->method('getErrors')
-            ->will($this->returnValue($err));
-
+    /**
+     * Test for sliceErrors
+     *
+     * @return void
+     *
+     * @group medium
+     */
+    public function testSliceErrors()
+    {
+        $this->object->addError(
+            'Compile Error', E_WARNING, 'error.txt', 15
+        );
+        $this->assertEquals(
+            1,
+            $this->object->countErrors()
+        );
+        $this->assertEquals(
+            array(),
+            $this->object->sliceErrors(1)
+        );
+        $this->assertEquals(
+            1,
+            $this->object->countErrors()
+        );
+        $this->assertEquals(
+            1,
+            count($this->object->sliceErrors(0))
+        );
         $this->assertEquals(
             0,
             $this->object->countErrors()
@@ -201,18 +230,20 @@ class ErrorHandlerTest extends PMATestCase
      */
     public function testCountUserErrors()
     {
-
-        $err = array();
-        $err[] = new PMA\libraries\Error('256', 'Compile Error', 'error.txt', 15);
-        $errHandler = $this->getMock('PMA\libraries\ErrorHandler');
-        $errHandler->expects($this->any())
-            ->method('countErrors', 'getErrors')
-            ->will($this->returnValue(1, $err));
-
+        $this->object->addError(
+            'Compile Error', E_WARNING, 'error.txt', 15
+        );
         $this->assertEquals(
             0,
             $this->object->countUserErrors()
         );
+        $this->object->addError(
+            'Compile Error', E_USER_WARNING, 'error.txt', 15
+        );
+        $this->assertEquals(
+            1,
+            $this->object->countUserErrors()
+        );
     }
 
     /**