updated tests

Author: oohnoitz

src/Connection.php

@@ -116,6 +116,16 @@ public function getParams()
         return $this->connection_params;
     }
 
+    /**
+     * Returns the internal encoding.
+     *
+     * @return string current multibyte internal encoding
+     */
+    public function getInternalEncoding()
+    {
+        return $this->internal_encoding;
+    }
+
     /**
      * Returns the connection parameters (host, port) for the current instance.
      *
@@ -156,13 +166,13 @@ public function connect($suppress_error = false)
         $data = $this->getParams();
         $conn = mysqli_init();
 
-        if ( ! empty($data['options'])) {
+        if (!empty($data['options'])) {
             foreach ($data['options'] as $option => $value) {
                 $conn->options($option, $value);
             }
         }
 
-        if ( ! $suppress_error && ! $this->silence_connection_warning) {
+        if (!$suppress_error && ! $this->silence_connection_warning) {
             $conn->real_connect($data['host'], null, null, null, (int) $data['port'], $data['socket']);
         } else {
             @ $conn->real_connect($data['host'], null, null, null, (int) $data['port'], $data['socket']);
@@ -174,7 +184,6 @@ public function connect($suppress_error = false)
         }
 
         $conn->set_charset('utf8');
-
         $this->connection = $conn;
         $this->mbPush();
 
@@ -413,6 +422,8 @@ public function mbPush()
     {
         $this->internal_encoding = mb_internal_encoding();
         mb_internal_encoding('UTF-8');
+
+        return $this;
     }
 
     /**
@@ -422,5 +433,7 @@ public function mbPop()
     {
         mb_internal_encoding($this->internal_encoding);
         $this->internal_encoding = null;
+
+        return $this;
     }
 }

src/SphinxQL.php

@@ -789,6 +789,7 @@ function (&$val, $key) {
             $query .= 'OPTION '.implode(', ', $options);
         }
 
+        $query = trim($query);
         $this->last_compiled = $query;
 
         return $this;
@@ -826,6 +827,7 @@ public function compileInsert()
             $query .= implode(', ', $query_sub);
         }
 
+        $query = trim($query);
         $this->last_compiled = $query;
 
         return $this;
@@ -865,6 +867,7 @@ public function compileUpdate()
 
         $query .= $this->compileMatch().$this->compileWhere();
 
+        $query = trim($query);
         $this->last_compiled = $query;
 
         return $this;
@@ -887,6 +890,7 @@ public function compileDelete()
             $query .= $this->compileWhere();
         }
 
+        $query = trim($query);
         $this->last_compiled = $query;
 
         return $this;
@@ -1399,13 +1403,6 @@ public function reset()
         return $this;
     }
 
-    public function resetOrderBy()
-    {
-        $this->order_by = array();
-
-        return $this;
-    }
-
     public function resetWhere()
     {
         $this->where = array();
@@ -1434,6 +1431,13 @@ public function resetWithinGroupOrderBy()
         return $this;
     }
 
+    public function resetOrderBy()
+    {
+        $this->order_by = array();
+
+        return $this;
+    }
+
     public function resetOptions()
     {
         $this->options = array();

tests/classes/ConnectionTest.php

@@ -14,6 +14,11 @@ public function setUp()
         $this->connection->silenceConnectionWarning(false);
     }
 
+    public function tearDown()
+    {
+        $this->connection = null;
+    }
+
     public function test()
     {
         new Connection();
@@ -209,4 +214,16 @@ public function testQuoteArr()
             $this->connection->quoteArr(array(null, true, false, new Expression("fo'o'bar"), 123, 12.3, '12.3', '12'))
         );
     }
+
+    public function testMbPush()
+    {
+        $this->connection->mbPush();
+        $this->assertEquals('UTF-8', $this->connection->getInternalEncoding());
+    }
+
+    public function testMbPop()
+    {
+        $this->connection->mbPush()->mbPop();
+        $this->assertEquals(null, $this->connection->getInternalEncoding());
+    }
 }

tests/classes/HelperTest.php

@@ -34,7 +34,6 @@ public function testDescribe()
         array_shift($describe);
         $this->assertSame(
             array(
-                //	array('Field' => 'id', 'Type' => 'integer'), this can be bigint on id64 sphinx
                 array('Field' => 'title', 'Type' => 'field'),
                 array('Field' => 'content', 'Type' => 'field'),
                 array('Field' => 'gid', 'Type' => 'uint'),

tests/classes/SphinxQLTest.php

@@ -573,4 +573,31 @@ public function testQueue()
         $this->assertEquals('1', $result[1][0]['Value']);
         $this->assertEquals('11', $result[2][0]['id']);
     }
+
+    /**
+     * @covers \Foolz\SphinxQL\SphinxQL::resetWhere
+     * @covers \Foolz\SphinxQL\SphinxQL::resetMatch
+     * @covers \Foolz\SphinxQL\SphinxQL::resetGroupBy
+     * @covers \Foolz\SphinxQL\SphinxQL::resetWithinGroupOrderBy
+     * @covers \Foolz\SphinxQL\SphinxQL::resetOptions
+     */
+    public function testResetMethods()
+    {
+        $result = SphinxQL::create($this->conn)->select()
+            ->from('rt')
+            ->where('id', 'IN', array(10, 11))
+            ->resetWhere()
+            ->match('title', 'value')
+            ->resetMatch()
+            ->groupBy('gid')
+            ->resetGroupBy()
+            ->withinGroupOrderBy('id', 'desc')
+            ->resetWithinGroupOrderBy()
+            ->option('comment', 'this should be quoted')
+            ->resetOptions()
+            ->compile()
+            ->getCompiled();
+
+        $this->assertEquals('SELECT * FROM `rt`', $result);
+    }
 }