added tesst for Tokenizer and Search to get them under full coverage. relatex refactorings and coverage reports
This commit is contained in:
meus
parent
53b05c1d4a
commit
755316c3fc
@ -32,15 +32,6 @@
|
||||
*/
|
||||
class Doctrine_Tokenizer
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
|
||||
}
|
||||
public function tokenize()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* trims brackets
|
||||
*
|
||||
|
||||
@ -156,4 +156,22 @@ class Doctrine_Search_TestCase extends Doctrine_UnitTestCase
|
||||
|
||||
|
||||
}
|
||||
|
||||
public function testThrowExceptionIfInvalidTable()
|
||||
{
|
||||
try{
|
||||
$oQuery = new Doctrine_Search_Query(new Doctrine_Query());
|
||||
$this->fail("Should throw exception");
|
||||
}catch(Doctrine_Search_Exception $exception){
|
||||
$this->assertEqual($exception->getMessage(), "Invalid argument type. Expected instance of Doctrine_Table.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function testGenerateSearchQueryForWeightedSearch()
|
||||
{
|
||||
$oQuery = new Doctrine_Search_Query("SearchTest");
|
||||
$oQuery->query("^test");
|
||||
$this->assertEqual($oQuery->getSql(), "SELECT SUM(sub_relevance) AS relevance, id FROM WHERE keyword = ? GROUP BY id ORDER BY relevance");
|
||||
}
|
||||
}
|
||||
|
||||
@ -109,4 +109,11 @@ class Doctrine_Tokenizer_TestCase extends Doctrine_UnitTestCase
|
||||
|
||||
$this->assertEqual($a, array('rdbms (dbal OR database)'));
|
||||
}
|
||||
|
||||
|
||||
public function testQuoteExplodedShouldQuoteArray()
|
||||
{
|
||||
$term = Doctrine_Tokenizer::quoteExplode("test", array("'test'", "test2"));
|
||||
$this->assertEqual($term[0], "test");
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Sqlite.php 2963 2007-10-21 06:23:59Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Sqlite.php 3032 2007-10-29 19:50:16Z meus $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -103,7 +103,7 @@
|
||||
<td class="normal"> * @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
|
||||
</td></tr>
|
||||
<tr><td>32</td>
|
||||
<td class="normal"> * @version $Revision: 2963 $
|
||||
<td class="normal"> * @version $Revision: 3032 $
|
||||
</td></tr>
|
||||
<tr><td>33</td>
|
||||
<td class="normal"> * @link www.phpdoctrine.com
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Hydrate.php 3000 2007-10-24 13:44:58Z ppetermann $
|
||||
<td class="normal"> * $Id: Hydrate.php 3032 2007-10-29 19:50:16Z meus $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -103,7 +103,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>32</td>
|
||||
<td class="normal"> * @version $Revision: 3000 $
|
||||
<td class="normal"> * @version $Revision: 3032 $
|
||||
</td></tr>
|
||||
<tr><td>33</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Condition.php 2702 2007-10-03 21:43:22Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Condition.php 3032 2007-10-29 19:50:16Z meus $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -97,7 +97,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>30</td>
|
||||
<td class="normal"> * @version $Revision: 2702 $
|
||||
<td class="normal"> * @version $Revision: 3032 $
|
||||
</td></tr>
|
||||
<tr><td>31</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Having.php 2963 2007-10-21 06:23:59Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Having.php 3032 2007-10-29 19:50:16Z meus $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -97,7 +97,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>30</td>
|
||||
<td class="normal"> * @version $Revision: 2963 $
|
||||
<td class="normal"> * @version $Revision: 3032 $
|
||||
</td></tr>
|
||||
<tr><td>31</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Part.php 2963 2007-10-21 06:23:59Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Part.php 3032 2007-10-29 19:50:16Z meus $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -97,7 +97,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>30</td>
|
||||
<td class="normal"> * @version $Revision: 2963 $
|
||||
<td class="normal"> * @version $Revision: 3032 $
|
||||
</td></tr>
|
||||
<tr><td>31</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: RawSql.php 2963 2007-10-21 06:23:59Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: RawSql.php 3032 2007-10-29 19:50:16Z meus $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -97,7 +97,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>30</td>
|
||||
<td class="normal"> * @version $Revision: 2963 $
|
||||
<td class="normal"> * @version $Revision: 3032 $
|
||||
</td></tr>
|
||||
<tr><td>31</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
|
||||
113
tests/coverage/Doctrine_RawSql_Exception.html
Normal file
113
tests/coverage/Doctrine_RawSql_Exception.html
Normal file
@ -0,0 +1,113 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>Coverage for Doctrine_RawSql_Exception</title>
|
||||
<style type="text/css">
|
||||
.covered{ background: green;}
|
||||
.normal{ background: white;}
|
||||
.red{ background: red;}
|
||||
.orange{ background: #f90;}
|
||||
</style>
|
||||
</head>
|
||||
<body><h1>Coverage for Doctrine_RawSql_Exception</h1><p><a href="index.php">Back to coverage report</a></p><table>
|
||||
<tr><td>1</td>
|
||||
<td class="normal"><?php
|
||||
</td></tr>
|
||||
<tr><td>2</td>
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Exception.php 2702 2007-10-03 21:43:22Z Jonathan.Wage $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
</td></tr>
|
||||
<tr><td>5</td>
|
||||
<td class="normal"> * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
</td></tr>
|
||||
<tr><td>6</td>
|
||||
<td class="normal"> * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
</td></tr>
|
||||
<tr><td>7</td>
|
||||
<td class="normal"> * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
</td></tr>
|
||||
<tr><td>8</td>
|
||||
<td class="normal"> * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
</td></tr>
|
||||
<tr><td>9</td>
|
||||
<td class="normal"> * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
</td></tr>
|
||||
<tr><td>10</td>
|
||||
<td class="normal"> * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
</td></tr>
|
||||
<tr><td>11</td>
|
||||
<td class="normal"> * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
</td></tr>
|
||||
<tr><td>12</td>
|
||||
<td class="normal"> * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
</td></tr>
|
||||
<tr><td>13</td>
|
||||
<td class="normal"> * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
</td></tr>
|
||||
<tr><td>14</td>
|
||||
<td class="normal"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
</td></tr>
|
||||
<tr><td>15</td>
|
||||
<td class="normal"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
</td></tr>
|
||||
<tr><td>16</td>
|
||||
<td class="normal"> *
|
||||
</td></tr>
|
||||
<tr><td>17</td>
|
||||
<td class="normal"> * This software consists of voluntary contributions made by many individuals
|
||||
</td></tr>
|
||||
<tr><td>18</td>
|
||||
<td class="normal"> * and is licensed under the LGPL. For more information, see
|
||||
</td></tr>
|
||||
<tr><td>19</td>
|
||||
<td class="normal"> * <http://www.phpdoctrine.com>.
|
||||
</td></tr>
|
||||
<tr><td>20</td>
|
||||
<td class="normal"> */
|
||||
</td></tr>
|
||||
<tr><td>21</td>
|
||||
<td class="covered">Doctrine::autoload('Doctrine_Exception');
|
||||
</td></tr>
|
||||
<tr><td>22</td>
|
||||
<td class="normal">/**
|
||||
</td></tr>
|
||||
<tr><td>23</td>
|
||||
<td class="normal"> * Doctrine_RawSql_Exception
|
||||
</td></tr>
|
||||
<tr><td>24</td>
|
||||
<td class="normal"> *
|
||||
</td></tr>
|
||||
<tr><td>25</td>
|
||||
<td class="normal"> * @package Doctrine
|
||||
</td></tr>
|
||||
<tr><td>26</td>
|
||||
<td class="normal"> * @subpackage RawSql
|
||||
</td></tr>
|
||||
<tr><td>27</td>
|
||||
<td class="normal"> * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
||||
</td></tr>
|
||||
<tr><td>28</td>
|
||||
<td class="normal"> * @link www.phpdoctrine.com
|
||||
</td></tr>
|
||||
<tr><td>29</td>
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>30</td>
|
||||
<td class="normal"> * @version $Revision: 2702 $
|
||||
</td></tr>
|
||||
<tr><td>31</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
</td></tr>
|
||||
<tr><td>32</td>
|
||||
<td class="normal"> */
|
||||
</td></tr>
|
||||
<tr><td>33</td>
|
||||
<td class="covered">class Doctrine_RawSql_Exception extends Doctrine_Exception
|
||||
</td></tr>
|
||||
<tr><td>34</td>
|
||||
<td class="covered">{ }</td></tr>
|
||||
</table></body></html>
|
||||
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Record.php 3005 2007-10-25 14:21:25Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Record.php 3031 2007-10-29 19:26:22Z bschussek $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -103,7 +103,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>32</td>
|
||||
<td class="normal"> * @version $Revision: 3005 $
|
||||
<td class="normal"> * @version $Revision: 3031 $
|
||||
</td></tr>
|
||||
<tr><td>33</td>
|
||||
<td class="normal"> */
|
||||
@ -1369,7 +1369,7 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>454</td>
|
||||
<td class="covered"> $this->_values = $this->cleanData($data);
|
||||
<td class="covered"> $this->_values = array_merge($this->_values, $this->cleanData($data));
|
||||
</td></tr>
|
||||
<tr><td>455</td>
|
||||
<td class="covered"> $this->_data = array_merge($this->_data, $data);
|
||||
|
||||
113
tests/coverage/Doctrine_Search_Exception.html
Normal file
113
tests/coverage/Doctrine_Search_Exception.html
Normal file
@ -0,0 +1,113 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>Coverage for Doctrine_Search_Exception</title>
|
||||
<style type="text/css">
|
||||
.covered{ background: green;}
|
||||
.normal{ background: white;}
|
||||
.red{ background: red;}
|
||||
.orange{ background: #f90;}
|
||||
</style>
|
||||
</head>
|
||||
<body><h1>Coverage for Doctrine_Search_Exception</h1><p><a href="index.php">Back to coverage report</a></p><table>
|
||||
<tr><td>1</td>
|
||||
<td class="normal"><?php
|
||||
</td></tr>
|
||||
<tr><td>2</td>
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id$
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
</td></tr>
|
||||
<tr><td>5</td>
|
||||
<td class="normal"> * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
</td></tr>
|
||||
<tr><td>6</td>
|
||||
<td class="normal"> * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
</td></tr>
|
||||
<tr><td>7</td>
|
||||
<td class="normal"> * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
</td></tr>
|
||||
<tr><td>8</td>
|
||||
<td class="normal"> * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
</td></tr>
|
||||
<tr><td>9</td>
|
||||
<td class="normal"> * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
</td></tr>
|
||||
<tr><td>10</td>
|
||||
<td class="normal"> * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
</td></tr>
|
||||
<tr><td>11</td>
|
||||
<td class="normal"> * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
</td></tr>
|
||||
<tr><td>12</td>
|
||||
<td class="normal"> * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
</td></tr>
|
||||
<tr><td>13</td>
|
||||
<td class="normal"> * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
</td></tr>
|
||||
<tr><td>14</td>
|
||||
<td class="normal"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
</td></tr>
|
||||
<tr><td>15</td>
|
||||
<td class="normal"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
</td></tr>
|
||||
<tr><td>16</td>
|
||||
<td class="normal"> *
|
||||
</td></tr>
|
||||
<tr><td>17</td>
|
||||
<td class="normal"> * This software consists of voluntary contributions made by many individuals
|
||||
</td></tr>
|
||||
<tr><td>18</td>
|
||||
<td class="normal"> * and is licensed under the LGPL. For more information, see
|
||||
</td></tr>
|
||||
<tr><td>19</td>
|
||||
<td class="normal"> * <http://www.phpdoctrine.com>.
|
||||
</td></tr>
|
||||
<tr><td>20</td>
|
||||
<td class="normal"> */
|
||||
</td></tr>
|
||||
<tr><td>21</td>
|
||||
<td class="covered">Doctrine::autoload('Doctrine_Exception');
|
||||
</td></tr>
|
||||
<tr><td>22</td>
|
||||
<td class="normal">/**
|
||||
</td></tr>
|
||||
<tr><td>23</td>
|
||||
<td class="normal"> * Doctrine_Search_Exception
|
||||
</td></tr>
|
||||
<tr><td>24</td>
|
||||
<td class="normal"> *
|
||||
</td></tr>
|
||||
<tr><td>25</td>
|
||||
<td class="normal"> * @package Doctrine
|
||||
</td></tr>
|
||||
<tr><td>26</td>
|
||||
<td class="normal"> * @subpackage Search
|
||||
</td></tr>
|
||||
<tr><td>27</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
</td></tr>
|
||||
<tr><td>28</td>
|
||||
<td class="normal"> * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
||||
</td></tr>
|
||||
<tr><td>29</td>
|
||||
<td class="normal"> * @version $Revision$
|
||||
</td></tr>
|
||||
<tr><td>30</td>
|
||||
<td class="normal"> * @link www.phpdoctrine.com
|
||||
</td></tr>
|
||||
<tr><td>31</td>
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>32</td>
|
||||
<td class="normal"> */
|
||||
</td></tr>
|
||||
<tr><td>33</td>
|
||||
<td class="covered">class Doctrine_Search_Exception extends Doctrine_Exception
|
||||
</td></tr>
|
||||
<tr><td>34</td>
|
||||
<td class="covered">{ }</td></tr>
|
||||
</table></body></html>
|
||||
@ -178,7 +178,7 @@
|
||||
<td class="covered"> if ( ! $table instanceof Doctrine_Table) {
|
||||
</td></tr>
|
||||
<tr><td>57</td>
|
||||
<td class="red"> throw new Doctrine_Search_Exception('Invalid argument type. Expected instance of Doctrine_Table.');
|
||||
<td class="covered"> throw new Doctrine_Search_Exception('Invalid argument type. Expected instance of Doctrine_Table.');
|
||||
</td></tr>
|
||||
<tr><td>58</td>
|
||||
<td class="orange"> }
|
||||
@ -250,16 +250,16 @@
|
||||
<td class="normal"> // organize terms according weights
|
||||
</td></tr>
|
||||
<tr><td>81</td>
|
||||
<td class="red"> $weighted = true;
|
||||
<td class="covered"> $weighted = true;
|
||||
</td></tr>
|
||||
<tr><td>82</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>83</td>
|
||||
<td class="red"> $select = 'SELECT SUM(sub_relevance) AS relevance, ' . $foreignId;
|
||||
<td class="covered"> $select = 'SELECT SUM(sub_relevance) AS relevance, ' . $foreignId;
|
||||
</td></tr>
|
||||
<tr><td>84</td>
|
||||
<td class="red"> $from = 'FROM ' ;
|
||||
<td class="covered"> $from = 'FROM ' ;
|
||||
</td></tr>
|
||||
<tr><td>85</td>
|
||||
<td class="normal"> }
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Transaction.php 2963 2007-10-21 06:23:59Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Transaction.php 3032 2007-10-29 19:50:16Z meus $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -106,7 +106,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>33</td>
|
||||
<td class="normal"> * @version $Revision: 2963 $
|
||||
<td class="normal"> * @version $Revision: 3032 $
|
||||
</td></tr>
|
||||
<tr><td>34</td>
|
||||
<td class="normal"> */
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user