Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
solarium
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
solarium
Commits
3148507f
Commit
3148507f
authored
Jul 09, 2012
by
bendavies
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
expose and passthrough add parameter in FacetSet createFacet* helpers
parent
b33c09bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
20 deletions
+44
-20
library/Solarium/Query/Select/Component/FacetSet.php
library/Solarium/Query/Select/Component/FacetSet.php
+12
-8
tests/Solarium/Query/Select/Component/FacetSetTest.php
tests/Solarium/Query/Select/Component/FacetSetTest.php
+32
-12
No files found.
library/Solarium/Query/Select/Component/FacetSet.php
View file @
3148507f
...
@@ -411,44 +411,48 @@ class Solarium_Query_Select_Component_FacetSet extends Solarium_Query_Select_Com
...
@@ -411,44 +411,48 @@ class Solarium_Query_Select_Component_FacetSet extends Solarium_Query_Select_Com
* Get a facet field instance
* Get a facet field instance
*
*
* @param mixed $options
* @param mixed $options
* @param bool $add
* @return Solarium_Query_Select_Component_Facet_Field
* @return Solarium_Query_Select_Component_Facet_Field
*/
*/
public
function
createFacetField
(
$options
=
null
)
public
function
createFacetField
(
$options
=
null
,
$add
=
true
)
{
{
return
$this
->
createFacet
(
self
::
FACET_FIELD
,
$options
);
return
$this
->
createFacet
(
self
::
FACET_FIELD
,
$options
,
$add
);
}
}
/**
/**
* Get a facet query instance
* Get a facet query instance
*
*
* @param mixed $options
* @param mixed $options
* @param bool $add
* @return Solarium_Query_Select_Component_Facet_Query
* @return Solarium_Query_Select_Component_Facet_Query
*/
*/
public
function
createFacetQuery
(
$options
=
null
)
public
function
createFacetQuery
(
$options
=
null
,
$add
=
true
)
{
{
return
$this
->
createFacet
(
self
::
FACET_QUERY
,
$options
);
return
$this
->
createFacet
(
self
::
FACET_QUERY
,
$options
,
$add
);
}
}
/**
/**
* Get a facet multiquery instance
* Get a facet multiquery instance
*
*
* @param mixed $options
* @param mixed $options
* @param bool $add
* @return Solarium_Query_Select_Component_Facet_MultiQuery
* @return Solarium_Query_Select_Component_Facet_MultiQuery
*/
*/
public
function
createFacetMultiQuery
(
$options
=
null
)
public
function
createFacetMultiQuery
(
$options
=
null
,
$add
=
true
)
{
{
return
$this
->
createFacet
(
self
::
FACET_MULTIQUERY
,
$options
);
return
$this
->
createFacet
(
self
::
FACET_MULTIQUERY
,
$options
,
$add
);
}
}
/**
/**
* Get a facet range instance
* Get a facet range instance
*
*
* @param mixed $options
* @param mixed $options
* @param bool $add
* @return Solarium_Query_Select_Component_Facet_Range
* @return Solarium_Query_Select_Component_Facet_Range
*/
*/
public
function
createFacetRange
(
$options
=
null
)
public
function
createFacetRange
(
$options
=
null
,
$add
=
true
)
{
{
return
$this
->
createFacet
(
self
::
FACET_RANGE
,
$options
);
return
$this
->
createFacet
(
self
::
FACET_RANGE
,
$options
,
$add
);
}
}
}
}
\ No newline at end of file
tests/Solarium/Query/Select/Component/FacetSetTest.php
View file @
3148507f
...
@@ -318,52 +318,72 @@ class Solarium_Query_Select_Component_FacetSetTest extends PHPUnit_Framework_Tes
...
@@ -318,52 +318,72 @@ class Solarium_Query_Select_Component_FacetSetTest extends PHPUnit_Framework_Tes
$this
->
_facetSet
->
createFacet
(
'invalidtype'
);
$this
->
_facetSet
->
createFacet
(
'invalidtype'
);
}
}
public
function
testCreateFacetField
()
public
function
createFacetAddProvider
()
{
return
array
(
array
(
true
),
array
(
false
),
);
}
/**
* @dataProvider createFacetAddProvider
*/
public
function
testCreateFacetField
(
$add
)
{
{
$options
=
array
(
'optionA'
=>
1
,
'optionB'
=>
2
);
$options
=
array
(
'optionA'
=>
1
,
'optionB'
=>
2
);
$observer
=
$this
->
getMock
(
'Solarium_Query_Select_Component_FacetSet'
,
array
(
'createFacet'
));
$observer
=
$this
->
getMock
(
'Solarium_Query_Select_Component_FacetSet'
,
array
(
'createFacet'
));
$observer
->
expects
(
$this
->
once
())
$observer
->
expects
(
$this
->
once
())
->
method
(
'createFacet'
)
->
method
(
'createFacet'
)
->
with
(
$this
->
equalTo
(
Solarium_Query_Select_Component_FacetSet
::
FACET_FIELD
),
$this
->
equalTo
(
$options
));
->
with
(
$this
->
equalTo
(
Solarium_Query_Select_Component_FacetSet
::
FACET_FIELD
),
$this
->
equalTo
(
$options
)
,
$add
);
$observer
->
createFacetField
(
$options
);
$observer
->
createFacetField
(
$options
,
$add
);
}
}
public
function
testCreateFacetQuery
()
/**
* @dataProvider createFacetAddProvider
*/
public
function
testCreateFacetQuery
(
$add
)
{
{
$options
=
array
(
'optionA'
=>
1
,
'optionB'
=>
2
);
$options
=
array
(
'optionA'
=>
1
,
'optionB'
=>
2
);
$observer
=
$this
->
getMock
(
'Solarium_Query_Select_Component_FacetSet'
,
array
(
'createFacet'
));
$observer
=
$this
->
getMock
(
'Solarium_Query_Select_Component_FacetSet'
,
array
(
'createFacet'
));
$observer
->
expects
(
$this
->
once
())
$observer
->
expects
(
$this
->
once
())
->
method
(
'createFacet'
)
->
method
(
'createFacet'
)
->
with
(
$this
->
equalTo
(
Solarium_Query_Select_Component_FacetSet
::
FACET_QUERY
),
$this
->
equalTo
(
$options
));
->
with
(
$this
->
equalTo
(
Solarium_Query_Select_Component_FacetSet
::
FACET_QUERY
),
$this
->
equalTo
(
$options
)
,
$add
);
$observer
->
createFacetQuery
(
$options
);
$observer
->
createFacetQuery
(
$options
,
$add
);
}
}
public
function
testCreateFacetMultiQuery
()
/**
* @dataProvider createFacetAddProvider
*/
public
function
testCreateFacetMultiQuery
(
$add
)
{
{
$options
=
array
(
'optionA'
=>
1
,
'optionB'
=>
2
);
$options
=
array
(
'optionA'
=>
1
,
'optionB'
=>
2
);
$observer
=
$this
->
getMock
(
'Solarium_Query_Select_Component_FacetSet'
,
array
(
'createFacet'
));
$observer
=
$this
->
getMock
(
'Solarium_Query_Select_Component_FacetSet'
,
array
(
'createFacet'
));
$observer
->
expects
(
$this
->
once
())
$observer
->
expects
(
$this
->
once
())
->
method
(
'createFacet'
)
->
method
(
'createFacet'
)
->
with
(
$this
->
equalTo
(
Solarium_Query_Select_Component_FacetSet
::
FACET_MULTIQUERY
),
$this
->
equalTo
(
$options
));
->
with
(
$this
->
equalTo
(
Solarium_Query_Select_Component_FacetSet
::
FACET_MULTIQUERY
),
$this
->
equalTo
(
$options
)
,
$add
);
$observer
->
createFacetMultiQuery
(
$options
);
$observer
->
createFacetMultiQuery
(
$options
,
$add
);
}
}
public
function
testCreateFacetRange
()
/**
* @dataProvider createFacetAddProvider
*/
public
function
testCreateFacetRange
(
$add
)
{
{
$options
=
array
(
'optionA'
=>
1
,
'optionB'
=>
2
);
$options
=
array
(
'optionA'
=>
1
,
'optionB'
=>
2
);
$observer
=
$this
->
getMock
(
'Solarium_Query_Select_Component_FacetSet'
,
array
(
'createFacet'
));
$observer
=
$this
->
getMock
(
'Solarium_Query_Select_Component_FacetSet'
,
array
(
'createFacet'
));
$observer
->
expects
(
$this
->
once
())
$observer
->
expects
(
$this
->
once
())
->
method
(
'createFacet'
)
->
method
(
'createFacet'
)
->
with
(
$this
->
equalTo
(
Solarium_Query_Select_Component_FacetSet
::
FACET_RANGE
),
$this
->
equalTo
(
$options
));
->
with
(
$this
->
equalTo
(
Solarium_Query_Select_Component_FacetSet
::
FACET_RANGE
),
$this
->
equalTo
(
$options
)
,
$add
);
$observer
->
createFacetRange
(
$options
);
$observer
->
createFacetRange
(
$options
,
$add
);
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment