add more tests

This commit is contained in:
Robin Appelman 2017-02-22 18:14:08 +01:00
commit 5c2a3f1b02
11 changed files with 337 additions and 5 deletions

View file

@ -55,8 +55,10 @@ class DiscoverHandler {
}
public function handelDiscoverRequest($xml, RequestInterface $request, ResponseInterface $response) {
if (!$xml['{DAV:}basicsearch']) {
throw new BadRequest('Unexpected xml content for query-schema-discovery, expected basicsearch');
if (!isset($xml['{DAV:}basicsearch'])) {
$response->setStatus(400);
$response->setBody('Unexpected xml content for query-schema-discovery, expected basicsearch');
return false;
}
/** @var BasicSearch $query */
$query = $xml['{DAV:}basicsearch'];

View file

@ -51,8 +51,10 @@ class SearchHandler {
}
public function handleSearchRequest($xml, ResponseInterface $response) {
if (!$xml['{DAV:}basicsearch']) {
throw new BadRequest('Unexpected xml content for searchrequest, expected basicsearch');
if (!isset($xml['{DAV:}basicsearch'])) {
$response->setStatus(400);
$response->setBody('Unexpected xml content for searchrequest, expected basicsearch');
return false;
}
/** @var BasicSearch $query */
$query = $xml['{DAV:}basicsearch'];

View file

@ -135,7 +135,9 @@ class SearchPlugin extends ServerPlugin {
case '{DAV:}query-schema-discovery':
return $this->discover->handelDiscoverRequest($xml, $request, $response);
default:
throw new BadRequest('Unexpected document type: ' . $documentType . ' for this Content-Type');
$response->setStatus(400);
$response->setBody('Unexpected document type: ' . $documentType . ' for this Content-Type, expected {DAV:}searchrequest or {DAV:}query-schema-discovery');
return false;
}
}
}