Added trim() and test class; fixed comment.

module/VuFind/src/VuFind/Recommend/SwitchQuery.php

@@ -258,7 +258,7 @@ class SwitchQuery implements RecommendInterface
         // Remove escaped quotes as they are of no consequence:
         $query = str_replace('\"', ' ', $query);
         return (strpos($query, '"') === false)
-            ? false : str_replace('"', ' ', $query);
+            ? false : trim(str_replace('"', ' ', $query));
     }
 
     /**
@@ -320,7 +320,7 @@ class SwitchQuery implements RecommendInterface
     }
 
     /**
-     * Get the new search handler, or false if it does not apply.
+     * Get an array of suggestion messages.
      *
      * @return array
      */

module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SwitchQueryTest.php

+<?php
+/**
+ * SwitchQuery recommendation module Test Class
+ *
+ * PHP version 5
+ *
+ * Copyright (C) Villanova University 2010.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @category VuFind2
+ * @package  Tests
+ * @author   Demian Katz <demian.katz@villanova.edu>
+ * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
+ */
+namespace VuFindTest\Recommend;
+use VuFind\Recommend\SwitchQuery;
+
+/**
+ * SwitchQuery recommendation module Test Class
+ *
+ * @category VuFind2
+ * @package  Tests
+ * @author   Demian Katz <demian.katz@villanova.edu>
+ * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link     http://vufind.org/wiki/vufind2:unit_tests Wiki
+ */
+class SwitchQueryTest extends \VuFindTest\Unit\TestCase
+{
+    /**
+     * Test "getResults"
+     *
+     * @return void
+     */
+    public function testGetResults()
+    {
+        $results = $this->getMockResults();
+        $sq = $this->getSwitchQuery($results);
+        $this->assertEquals($results, $sq->getResults());
+    }
+
+    /**
+     * Test lowercase booleans
+     *
+     * @return void
+     */
+    public function testLowercaseBooleans()
+    {
+        $results = $this->getMockResults('a or b');
+        $sq = $this->getSwitchQuery($results);
+        $this->assertEquals(
+            array(
+                'switchquery_lowercasebools' => 'a OR b',
+                'switchquery_wildcard' => 'a or b*',
+            ),
+            $sq->getSuggestions()
+        );
+    }
+
+    /**
+     * Test id query
+     *
+     * @return void
+     */
+    public function testIdQuery()
+    {
+        $results = $this->getMockResults('id:foo');
+        $sq = $this->getSwitchQuery($results);
+        $this->assertEquals(
+            array(),
+            $sq->getSuggestions()
+        );
+    }
+
+    /**
+     * Test advanced query
+     *
+     * @return void
+     */
+    public function testAdvancedQuery()
+    {
+        $results = $this->getMockResults('', 'advanced');
+        $sq = $this->getSwitchQuery($results);
+        $this->assertEquals(
+            array(),
+            $sq->getSuggestions()
+        );
+    }
+
+    /**
+     * Test unwanted booleans
+     *
+     * @return void
+     */
+    public function testUnwantedBools()
+    {
+        $results = $this->getMockResults('AND NOT OR');
+        $sq = $this->getSwitchQuery($results);
+        $this->assertEquals(
+            array(
+                'switchquery_unwantedbools' => '"AND NOT OR"',
+                'switchquery_wildcard' => 'AND NOT OR*',
+            ),
+            $sq->getSuggestions()
+        );
+    }
+
+    /**
+     * Test unwanted quotes
+     *
+     * @return void
+     */
+    public function testUnwantedQuotes()
+    {
+        $results = $this->getMockResults('"my phrase"');
+        $sq = $this->getSwitchQuery($results);
+        $this->assertEquals(
+            array(
+                'switchquery_unwantedquotes' => 'my phrase'
+            ),
+            $sq->getSuggestions()
+        );
+    }
+
+    /**
+     * Test transform unwanted character
+     *
+     * @return void
+     */
+    public function testTransformUnwantedCharacter()
+    {
+        $results = $this->getMockResults('abcd');
+        $sq = $this->getSwitchQuery($results, ':wildcard:truncatechar');
+        $this->assertEquals(
+            array(
+                'switchquery_truncatechar' => 'abc'
+            ),
+            $sq->getSuggestions()
+        );
+    }
+
+    /**
+     * Get a fully configured module
+     *
+     * @param \VuFind\Search\Solr\Results $results  results object
+     * @param string                      $settings settings
+     *
+     * @return SwitchQuery
+     */
+    protected function getSwitchQuery($results = null, $settings = '')
+    {
+        if (null === $results) {
+            $results = $this->getMockResults();
+        }
+        $backendManager = $this->getMockBackendManager();
+        $sq = new SwitchQuery($backendManager);
+        $sq->setConfig($settings);
+        $sq->init($results->getParams(), new \Zend\StdLib\Parameters(array()));
+        $sq->process($results);
+        return $sq;
+    }
+
+    /**
+     * Get a mock backend manager.
+     *
+     * @return \VuFind\Search\BackendManager
+     */
+    protected function getMockBackendManager()
+    {
+        $helper = new \VuFindSearch\Backend\Solr\LuceneSyntaxHelper();
+        $queryBuilder = $this->getMockBuilder('VuFindSearch\Backend\Solr\QueryBuilder')
+            ->disableOriginalConstructor()->getMock();
+        $queryBuilder->expects($this->any())->method('getLuceneHelper')
+            ->will($this->returnValue($helper));
+        $backend = $this->getMockBuilder('VuFindSearch\Backend\Solr\Backend')
+            ->disableOriginalConstructor()->getMock();
+        $backend->expects($this->any())->method('getQueryBuilder')
+            ->will($this->returnValue($queryBuilder));
+        $loader = $this->getMockBuilder('VuFind\Search\BackendManager')
+            ->disableOriginalConstructor()->getMock();
+        $loader->expects($this->any())->method('get')->with($this->equalTo('Solr'))
+            ->will($this->returnValue($backend));
+        return $loader;
+    }
+
+    /**
+     * Get a mock results object.
+     *
+     * @param string $query Query to include
+     * @param string $type  Query type ('basic' or 'advanced')
+     *
+     * @return \VuFind\Search\Solr\Results
+     */
+    protected function getMockResults($query = '', $type = 'basic')
+    {
+        $params = $this->getMockParams($query, $type);
+        $results = $this->getMockBuilder('VuFind\Search\Solr\Results')
+            ->disableOriginalConstructor()->getMock();
+        $results->expects($this->any())->method('getParams')
+            ->will($this->returnValue($params));
+        return $results;
+    }
+
+    /**
+     * Get a mock params object.
+     *
+     * @param string $query Query to include
+     * @param string $type  Query type ('basic' or 'advanced')
+     *
+     * @return \VuFind\Search\Solr\Params
+     */
+    protected function getMockParams($query = '', $type = 'basic')
+    {
+        $params = $this->getMockBuilder('VuFind\Search\Solr\Params')
+            ->disableOriginalConstructor()->getMock();
+        $params->expects($this->any())->method('getDisplayQuery')
+            ->will($this->returnValue($query));
+        $params->expects($this->any())->method('getSearchType')
+            ->will($this->returnValue($type));
+        return $params;
+    }
+}
\ No newline at end of file