Skip to content

S
solarium
Commit 75113025 authored by Bas de Nooijer's avatar Bas de Nooijer Committed by GitHub
Browse files
Options

Merge pull request #431 from vlastv/patch-1 

Allows key and exclude for interval facet
parents 6009b94d 2c1b0c14
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 23 deletions
library/Solarium/QueryType/Select/RequestBuilder/Component/FacetSet.php
View file @ 75113025
......@@ -246,9 +246,8 @@ class FacetSet extends RequestBuilder implements ComponentRequestBuilderInterfac
$request->addParam(
'facet.interval',
$this->renderLocalParams(
$field
// key & ex not supported for interval
//,array('key' => $facet->getKey(), 'ex' => $facet->getExcludes())
$field,
array('key' => $facet->getKey(), 'ex' => $facet->getExcludes())
)
);
......
tests/Solarium/Tests/QueryType/Select/RequestBuilder/Component/FacetSetTest.php
View file @ 75113025
......@@ -9,7 +9,7 @@
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this listof conditions and the following disclaimer in the documentation
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
......@@ -69,7 +69,7 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
{
$request = $this->builder->buildComponent($this->component, $this->request);
$this->assertEquals(
static::assertEquals(
array(),
$request->getParams()
);
......@@ -86,12 +86,12 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
$request = $this->builder->buildComponent($this->component, $this->request);
$this->assertEquals(
static::assertEquals(
null,
$request->getRawData()
);
$this->assertEquals(
static::assertEquals(
'?facet=true&facet.field={!key=f1}owner&facet.query={!key=f2}category:23&facet.query={!key=f4}category:40',
urldecode($request->getUri())
);
......@@ -114,12 +114,12 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
$request = $this->builder->buildComponent($this->component, $this->request);
$this->assertEquals(
static::assertEquals(
null,
$request->getRawData()
);
$this->assertEquals(
static::assertEquals(
'?facet=true&facet.range={!key=f1}price&f.price.facet.range.start=1&f.price.facet.range.end=100&f.price.facet.range.gap=10&f.price.facet.mincount=123&f.price.facet.range.other=all&f.price.facet.range.include=outer',
urldecode($request->getUri())
);
......@@ -141,12 +141,12 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
$request = $this->builder->buildComponent($this->component, $this->request);
$this->assertEquals(
static::assertEquals(
null,
$request->getRawData()
);
$this->assertEquals(
static::assertEquals(
'?facet=true&facet.range={!key=f1}price&f.price.facet.range.start=1&f.price.facet.range.end=100'.
'&f.price.facet.range.gap=10',
urldecode($request->getUri())
......@@ -165,12 +165,12 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
$request = $this->builder->buildComponent($this->component, $this->request);
$this->assertEquals(
static::assertEquals(
null,
$request->getRawData()
);
$this->assertEquals(
static::assertEquals(
'?facet=true&facet.missing=true&facet.limit=10&facet.field={!key=f1}owner&facet.query={!key=f2}category:23'.
'&facet.query={!key=f4}category:40',
urldecode($request->getUri())
......@@ -199,12 +199,12 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
$request = $this->builder->buildComponent($this->component, $this->request);
$this->assertEquals(
static::assertEquals(
null,
$request->getRawData()
);
$this->assertEquals(
static::assertEquals(
'?facet=true&facet.pivot={!key=f1 ex=owner}cat,inStock&facet.pivot.mincount=123',
urldecode($request->getUri())
);
......@@ -223,12 +223,12 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
$request = $this->builder->buildComponent($this->component, $this->request);
$this->assertEquals(
static::assertEquals(
null,
$request->getRawData()
);
$this->assertEquals(
static::assertEquals(
'?facet=true&facet.pivot={!stats=piv1}cat,inStock',
urldecode($request->getUri())
);
......@@ -250,18 +250,18 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
$request = $this->builder->buildComponent($this->component, $this->request);
$this->assertEquals(
static::assertEquals(
null,
$request->getRawData()
);
$this->assertEquals(
static::assertEquals(
'?facet=true&facet.contains=bar&facet.contains.ignoreCase=false&facet.field={!key=f1}owner&f.owner.facet.contains=foo&f.owner.facet.contains.ignoreCase=true',
urldecode($request->getUri())
);
}
public function testBuildeWithIntervalFacet()
public function testBuildWithIntervalFacet()
{
$facet = new FacetInterval(
array(
......@@ -275,13 +275,13 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
$request = $this->builder->buildComponent($this->component, $this->request);
$this->assertEquals(
static::assertEquals(
null,
$request->getRawData()
);
$this->assertEquals(
'?facet=true&f..facet.interval.set=int1&f..facet.interval.set={!key="one"}int2',
static::assertEquals(
'?facet=true&facet.interval={!key=f1}&f..facet.interval.set=int1&f..facet.interval.set={!key="one"}int2',
urldecode($request->getUri())
);
}
......
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