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
ffbc3602
Commit
ffbc3602
authored
Jul 26, 2013
by
Bas de Nooijer
Committed by
Dorian Villet
Sep 12, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for issue #170
parent
c2cd5a03
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
0 deletions
+49
-0
library/Solarium/Core/Query/Query.php
library/Solarium/Core/Query/Query.php
+21
-0
library/Solarium/Core/Query/RequestBuilder.php
library/Solarium/Core/Query/RequestBuilder.php
+1
-0
tests/Solarium/Tests/Core/Query/QueryTest.php
tests/Solarium/Tests/Core/Query/QueryTest.php
+13
-0
tests/Solarium/Tests/Core/Query/RequestBuilderTest.php
tests/Solarium/Tests/Core/Query/RequestBuilderTest.php
+14
-0
No files found.
library/Solarium/Core/Query/Query.php
View file @
ffbc3602
...
@@ -112,6 +112,27 @@ abstract class Query extends Configurable implements QueryInterface
...
@@ -112,6 +112,27 @@ abstract class Query extends Configurable implements QueryInterface
return
$this
->
getOption
(
'resultclass'
);
return
$this
->
getOption
(
'resultclass'
);
}
}
/**
* Set timeAllowed option
*
* @param int $value
* @return self Provides fluent interface
*/
public
function
setTimeAllowed
(
$value
)
{
return
$this
->
setOption
(
'timeallowed'
,
$value
);
}
/**
* Get timeAllowed option
*
* @return int|null
*/
public
function
getTimeAllowed
()
{
return
$this
->
getOption
(
'timeallowed'
);
}
/**
/**
* Set omitHeader option
* Set omitHeader option
*
*
...
...
library/Solarium/Core/Query/RequestBuilder.php
View file @
ffbc3602
...
@@ -58,6 +58,7 @@ abstract class RequestBuilder implements RequestBuilderInterface
...
@@ -58,6 +58,7 @@ abstract class RequestBuilder implements RequestBuilderInterface
$request
=
new
Request
;
$request
=
new
Request
;
$request
->
setHandler
(
$query
->
getHandler
());
$request
->
setHandler
(
$query
->
getHandler
());
$request
->
addParam
(
'omitHeader'
,
$query
->
getOmitHeader
());
$request
->
addParam
(
'omitHeader'
,
$query
->
getOmitHeader
());
$request
->
addParam
(
'timeAllowed'
,
$query
->
getTimeAllowed
());
$request
->
addParams
(
$query
->
getParams
());
$request
->
addParams
(
$query
->
getParams
());
$request
->
addParam
(
'wt'
,
$query
->
getResponseWriter
());
$request
->
addParam
(
'wt'
,
$query
->
getResponseWriter
());
...
...
tests/Solarium/Tests/Core/Query/QueryTest.php
View file @
ffbc3602
...
@@ -86,6 +86,19 @@ class QueryTest extends \PHPUnit_Framework_TestCase
...
@@ -86,6 +86,19 @@ class QueryTest extends \PHPUnit_Framework_TestCase
$this
->
assertEquals
(
'phps'
,
$query
->
getResponseWriter
());
$this
->
assertEquals
(
'phps'
,
$query
->
getResponseWriter
());
}
}
public
function
testGetDefaultTimeAllowed
()
{
$query
=
new
TestQuery
;
$this
->
assertEquals
(
null
,
$query
->
getTimeAllowed
());
}
public
function
testSetAndGetTimeAllowed
()
{
$query
=
new
TestQuery
;
$query
->
setTimeAllowed
(
1200
);
$this
->
assertEquals
(
1200
,
$query
->
getTimeAllowed
());
}
}
}
class
TestQuery
extends
Query
class
TestQuery
extends
Query
...
...
tests/Solarium/Tests/Core/Query/RequestBuilderTest.php
View file @
ffbc3602
...
@@ -73,6 +73,20 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
...
@@ -73,6 +73,20 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
);
);
}
}
public
function
testBuildWithTimeAllowed
()
{
$query
=
new
SelectQuery
;
$query
->
addParam
(
'p1'
,
'v1'
);
$query
->
addParam
(
'p2'
,
'v2'
);
$query
->
setTimeAllowed
(
1400
);
$request
=
$this
->
builder
->
build
(
$query
);
$this
->
assertEquals
(
'select?omitHeader=true&timeAllowed=1400&p1=v1&p2=v2&wt=json&json.nl=flat'
,
urldecode
(
$request
->
getUri
())
);
}
public
function
testRenderLocalParams
()
public
function
testRenderLocalParams
()
{
{
$myParams
=
array
(
'tag'
=>
'mytag'
,
'ex'
=>
array
(
'exclude1'
,
'exclude2'
));
$myParams
=
array
(
'tag'
=>
'mytag'
,
'ex'
=>
array
(
'exclude1'
,
'exclude2'
));
...
...
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