Commit 01a2043d authored by Bas de Nooijer's avatar Bas de Nooijer

fixed tests and some bugs

parent 26b2df7e
...@@ -73,8 +73,8 @@ class Solarium_Client_Request_SelectTest extends PHPUnit_Framework_TestCase ...@@ -73,8 +73,8 @@ class Solarium_Client_Request_SelectTest extends PHPUnit_Framework_TestCase
); );
$this->assertEquals( $this->assertEquals(
'http://127.0.0.1:80/solr/select?q=%2A%3A%2A&start=0&rows=10&fl=%2A%2Cscore&sort=id+asc%2Cname+desc&wt=json', 'http://127.0.0.1:80/solr/select?q=*:*&start=0&rows=10&fl=*,score&sort=id asc,name desc&wt=json',
$request->getUrl() urldecode($request->getUrl())
); );
} }
...@@ -92,8 +92,8 @@ class Solarium_Client_Request_SelectTest extends PHPUnit_Framework_TestCase ...@@ -92,8 +92,8 @@ class Solarium_Client_Request_SelectTest extends PHPUnit_Framework_TestCase
); );
$this->assertEquals( $this->assertEquals(
'http://127.0.0.1:80/solr/select?q=%2A%3A%2A&start=0&rows=10&fl=%2A%2Cscore&sort=id+asc%2Cname+desc&wt=json&fq=%7B%21tag%3Df1%7Dpublished%3Atrue&fq=%7B%21tag%3Df2%7Dcategory%3A23', 'http://127.0.0.1:80/solr/select?q=*:*&start=0&rows=10&fl=*,score&sort=id asc, name desc&wt=json&fq={!tag=f1}published:true&fq={!tag=f2}category:23',
$request->getUrl() urldecode($request->getUrl())
); );
} }
...@@ -109,8 +109,8 @@ class Solarium_Client_Request_SelectTest extends PHPUnit_Framework_TestCase ...@@ -109,8 +109,8 @@ class Solarium_Client_Request_SelectTest extends PHPUnit_Framework_TestCase
); );
$this->assertEquals( $this->assertEquals(
'http://127.0.0.1:80/solr/select?q=%2A%3A%2A&start=0&rows=10&fl=%2A%2Cscore&wt=json&facet=true', 'http://127.0.0.1:80/solr/select?q=*:*&start=0&rows=10&fl=*,score&wt=json&facet=true&facet.field={!key=f1}owner&facet.query={!key=f2}category:23',
$request->getUrl() urldecode($request->getUrl())
); );
} }
} }
...@@ -121,7 +121,7 @@ class Solarium_Client_RequestTest extends PHPUnit_Framework_TestCase ...@@ -121,7 +121,7 @@ class Solarium_Client_RequestTest extends PHPUnit_Framework_TestCase
$myParams = array('tag' => 'mytag', 'ex' => array('exclude1','exclude2')); $myParams = array('tag' => 'mytag', 'ex' => array('exclude1','exclude2'));
$this->assertEquals( $this->assertEquals(
'{!tag=mytag ex=myexclude1,exclude2}myValue', '{!tag=mytag ex=exclude1,exclude2}myValue',
$this->_getRequest($this->_options)->renderLocalParams('myValue', $myParams) $this->_getRequest($this->_options)->renderLocalParams('myValue', $myParams)
); );
} }
......
...@@ -35,7 +35,7 @@ class Solarium_Client_Response_SelectTest extends PHPUnit_Framework_TestCase ...@@ -35,7 +35,7 @@ class Solarium_Client_Response_SelectTest extends PHPUnit_Framework_TestCase
public function testGetResult() public function testGetResult()
{ {
$query = new Solarium_Query_Select; $query = new Solarium_Query_Select;
$response = new Solarium_Client_Response_Ping($query); $response = new Solarium_Client_Response_Select($query);
$this->assertThat($response->getResult(), $this->isInstanceOf($query->getResultClass())); $this->assertThat($response->getResult(), $this->isInstanceOf($query->getResultClass()));
} }
......
...@@ -35,7 +35,7 @@ class Solarium_Client_Response_UpdateTest extends PHPUnit_Framework_TestCase ...@@ -35,7 +35,7 @@ class Solarium_Client_Response_UpdateTest extends PHPUnit_Framework_TestCase
public function testGetResult() public function testGetResult()
{ {
$query = new Solarium_Query_Update; $query = new Solarium_Query_Update;
$data = array('responseheader' => array('status' => 0, 'QTime' => 145)); $data = array('responseHeader' => array('status' => 0, 'QTime' => 145));
$response = new Solarium_Client_Response_Update($query, $data); $response = new Solarium_Client_Response_Update($query, $data);
$result = $response->getResult(); $result = $response->getResult();
......
...@@ -249,7 +249,7 @@ class Solarium_Query_SelectTest extends PHPUnit_Framework_TestCase ...@@ -249,7 +249,7 @@ class Solarium_Query_SelectTest extends PHPUnit_Framework_TestCase
$fq2 = new Solarium_Query_Select_FilterQuery; $fq2 = new Solarium_Query_Select_FilterQuery;
$fq2->setKey('fq2')->setQuery('category:2'); $fq2->setKey('fq2')->setQuery('category:2');
$filterQueries = array($fq1, $fq2); $filterQueries = array('fq1' => $fq1, 'fq2' => $fq2);
$this->_query->addFilterQueries($filterQueries); $this->_query->addFilterQueries($filterQueries);
$this->assertEquals( $this->assertEquals(
...@@ -271,7 +271,7 @@ class Solarium_Query_SelectTest extends PHPUnit_Framework_TestCase ...@@ -271,7 +271,7 @@ class Solarium_Query_SelectTest extends PHPUnit_Framework_TestCase
$this->_query->addFilterQueries($filterQueries); $this->_query->addFilterQueries($filterQueries);
$this->_query->removeFilterQuery('fq1'); $this->_query->removeFilterQuery('fq1');
$this->assertEquals( $this->assertEquals(
array($fq1), array('f2' => $fq2),
$this->_query->getFilterQueries() $this->_query->getFilterQueries()
); );
} }
...@@ -284,7 +284,7 @@ class Solarium_Query_SelectTest extends PHPUnit_Framework_TestCase ...@@ -284,7 +284,7 @@ class Solarium_Query_SelectTest extends PHPUnit_Framework_TestCase
$fq2 = new Solarium_Query_Select_FilterQuery; $fq2 = new Solarium_Query_Select_FilterQuery;
$fq2->setKey('fq2')->setQuery('category:2'); $fq2->setKey('fq2')->setQuery('category:2');
$filterQueries = array($fq1, $fq2); $filterQueries = array('fq1' => $fq1, 'fq2' => $fq2);
$this->_query->addFilterQueries($filterQueries); $this->_query->addFilterQueries($filterQueries);
$this->_query->removeFilterQuery('fq3'); //continue silently $this->_query->removeFilterQuery('fq3'); //continue silently
...@@ -320,7 +320,7 @@ class Solarium_Query_SelectTest extends PHPUnit_Framework_TestCase ...@@ -320,7 +320,7 @@ class Solarium_Query_SelectTest extends PHPUnit_Framework_TestCase
$fq2 = new Solarium_Query_Select_FilterQuery; $fq2 = new Solarium_Query_Select_FilterQuery;
$fq2->setKey('fq2')->setQuery('category:2'); $fq2->setKey('fq2')->setQuery('category:2');
$filterQueries1 = array($fq1, $fq2); $filterQueries1 = array('fq1' => $fq1, 'fq2' => $fq2);
$this->_query->addFilterQueries($filterQueries1); $this->_query->addFilterQueries($filterQueries1);
...@@ -330,7 +330,7 @@ class Solarium_Query_SelectTest extends PHPUnit_Framework_TestCase ...@@ -330,7 +330,7 @@ class Solarium_Query_SelectTest extends PHPUnit_Framework_TestCase
$fq4 = new Solarium_Query_Select_FilterQuery; $fq4 = new Solarium_Query_Select_FilterQuery;
$fq4->setKey('fq4')->setQuery('category:4'); $fq4->setKey('fq4')->setQuery('category:4');
$filterQueries2 = array($fq3, $fq4); $filterQueries2 = array('fq3' => $fq3, 'fq4' => $fq4);
$this->_query->setFilterQueries($filterQueries2); $this->_query->setFilterQueries($filterQueries2);
......
...@@ -67,7 +67,7 @@ class Solarium_Result_SelectTest extends PHPUnit_Framework_TestCase ...@@ -67,7 +67,7 @@ class Solarium_Result_SelectTest extends PHPUnit_Framework_TestCase
public function testGetFacetByKey() public function testGetFacetByKey()
{ {
$this->assertEquals($this->_docs['f2'], $this->_result->getFacet('f2')); $this->assertEquals($this->_facets['f2'], $this->_result->getFacet('f2'));
} }
public function testCount() public function testCount()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment