Commit 906c76b6 authored by Bas de Nooijer's avatar Bas de Nooijer

Refactored setting name and added testcases

parent c5377c36
...@@ -192,7 +192,7 @@ class Field extends AbstractFacet ...@@ -192,7 +192,7 @@ class Field extends AbstractFacet
*/ */
public function setContainsIgnoreCase($containsIgnoreCase) public function setContainsIgnoreCase($containsIgnoreCase)
{ {
return $this->setOption('contains.ignoreCase', $containsIgnoreCase); return $this->setOption('containsignorecase', $containsIgnoreCase);
} }
/** /**
...@@ -204,7 +204,7 @@ class Field extends AbstractFacet ...@@ -204,7 +204,7 @@ class Field extends AbstractFacet
*/ */
public function getContainsIgnoreCase() public function getContainsIgnoreCase()
{ {
return $this->getOption('contains.ignoreCase'); return $this->getOption('containsignorecase');
} }
/** /**
......
...@@ -227,7 +227,7 @@ class FacetSet extends AbstractComponent ...@@ -227,7 +227,7 @@ class FacetSet extends AbstractComponent
*/ */
public function setContainsIgnoreCase($containsIgnoreCase) public function setContainsIgnoreCase($containsIgnoreCase)
{ {
return $this->setOption('contains.ignoreCase', $containsIgnoreCase); return $this->setOption('containsignorecase', $containsIgnoreCase);
} }
/** /**
...@@ -239,7 +239,7 @@ class FacetSet extends AbstractComponent ...@@ -239,7 +239,7 @@ class FacetSet extends AbstractComponent
*/ */
public function getContainsIgnoreCase() public function getContainsIgnoreCase()
{ {
return $this->getOption('contains.ignoreCase'); return $this->getOption('containsignorecase');
} }
/** /**
......
...@@ -58,6 +58,8 @@ class FieldTest extends \PHPUnit_Framework_TestCase ...@@ -58,6 +58,8 @@ class FieldTest extends \PHPUnit_Framework_TestCase
'mincount' => 5, 'mincount' => 5,
'missing' => true, 'missing' => true,
'method' => 'enum', 'method' => 'enum',
'contains' => 'foobar',
'containsignorecase' => true,
); );
$this->facet->setOptions($options); $this->facet->setOptions($options);
...@@ -71,6 +73,8 @@ class FieldTest extends \PHPUnit_Framework_TestCase ...@@ -71,6 +73,8 @@ class FieldTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($options['mincount'], $this->facet->getMinCount()); $this->assertEquals($options['mincount'], $this->facet->getMinCount());
$this->assertEquals($options['missing'], $this->facet->getMissing()); $this->assertEquals($options['missing'], $this->facet->getMissing());
$this->assertEquals($options['method'], $this->facet->getMethod()); $this->assertEquals($options['method'], $this->facet->getMethod());
$this->assertEquals($options['contains'], $this->facet->getContains());
$this->assertEquals($options['containsignorecase'], $this->facet->getContainsIgnoreCase());
} }
public function testGetType() public function testGetType()
...@@ -128,4 +132,16 @@ class FieldTest extends \PHPUnit_Framework_TestCase ...@@ -128,4 +132,16 @@ class FieldTest extends \PHPUnit_Framework_TestCase
$this->facet->setMethod('enum'); $this->facet->setMethod('enum');
$this->assertEquals('enum', $this->facet->getMethod()); $this->assertEquals('enum', $this->facet->getMethod());
} }
public function testSetAndGetContains()
{
$this->facet->setContains('foobar');
$this->assertEquals('foobar', $this->facet->getContains());
}
public function testSetAndGetContainsIgnoreCase()
{
$this->facet->setContainsIgnoreCase(true);
$this->assertEquals(true, $this->facet->getContainsIgnoreCase());
}
} }
...@@ -59,6 +59,8 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase ...@@ -59,6 +59,8 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
'mincount' => 10, 'mincount' => 10,
'missing' => 5, 'missing' => 5,
'extractfromresponse' => true, 'extractfromresponse' => true,
'contains' => 'foobar',
'containsignorecase' => true,
); );
$this->facetSet->setOptions($options); $this->facetSet->setOptions($options);
...@@ -70,6 +72,8 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase ...@@ -70,6 +72,8 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($options['mincount'], $this->facetSet->getMincount()); $this->assertEquals($options['mincount'], $this->facetSet->getMincount());
$this->assertEquals($options['missing'], $this->facetSet->getMissing()); $this->assertEquals($options['missing'], $this->facetSet->getMissing());
$this->assertEquals($options['extractfromresponse'], $this->facetSet->getExtractFromResponse()); $this->assertEquals($options['extractfromresponse'], $this->facetSet->getExtractFromResponse());
$this->assertEquals($options['contains'], $this->facetSet->getContains());
$this->assertEquals($options['containsignorecase'], $this->facetSet->getContainsIgnoreCase());
} }
public function testGetType() public function testGetType()
......
...@@ -232,6 +232,33 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase ...@@ -232,6 +232,33 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
urldecode($request->getUri()) urldecode($request->getUri())
); );
} }
public function testBuildWithContainsSettings()
{
$facet = new FacetField(
array(
'key' => 'f1',
'field' => 'owner',
'contains' => 'foo',
'containsignorecase' => true,
)
);
$this->component->addFacet($facet);
$this->component->setContains('bar');
$this->component->setContainsIgnoreCase(false);
$request = $this->builder->buildComponent($this->component, $this->request);
$this->assertEquals(
null,
$request->getRawData()
);
$this->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())
);
}
} }
class UnknownFacet extends FacetField class UnknownFacet extends FacetField
......
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