tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix QueryAdapter and SlidingWithBorderTest, remove --strict 

QueryAdapter and SlidingWithBorder used the statusdat backend and
must therefore be modified.
The --strict parameter stores controller tests because of the 1s timeout
and offers now advantages for us at this time.

refs #4417
This commit is contained in:
Jannis Moßhammer 2013-07-19 11:32:36 +02:00
parent 5827cb37cb
commit 76a3ef86c1
3 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
View File

@ -2,29 +2,30 @@
namespace Tests\Icinga\Web\Paginator\Adapter; namespace Tests\Icinga\Web\Paginator\Adapter;
use Icinga\Backend\Statusdat; use Monitoring\Backend\Statusdat;
use Icinga\Protocol\Statusdat\Reader; use Icinga\Protocol\Statusdat\Reader;
use Icinga\Web\Paginator\Adapter\QueryAdapter; use Icinga\Web\Paginator\Adapter\QueryAdapter;
use Tests\Icinga\Protocol\Statusdat\StatusdatTestLoader;
require_once 'Zend/Paginator/Adapter/Interface.php'; require_once 'Zend/Paginator/Adapter/Interface.php';
require_once 'Zend/Config.php';
require_once 'Zend/Cache.php';
require_once '../../library/Icinga/Web/Paginator/Adapter/QueryAdapter.php'; require_once '../../library/Icinga/Web/Paginator/Adapter/QueryAdapter.php';
require_once '../../library/Icinga/Backend/Criteria/Order.php';
require_once '../../library/Icinga/Backend/AbstractBackend.php'; require_once 'library/Icinga/Protocol/Statusdat/StatusdatTestLoader.php';
require_once '../../library/Icinga/Backend/Query.php'; StatusdatTestLoader::requireLibrary();
require_once '../../library/Icinga/Backend/Statusdat/Query.php';
require_once '../../library/Icinga/Backend/Statusdat.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php';
require_once '../../library/Icinga/Backend/MonitoringObjectList.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/AbstractBackend.php';
require_once '../../library/Icinga/Backend/Statusdat/HostlistQuery.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php';
require_once '../../library/Icinga/Backend/DataView/AbstractAccessorStrategy.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat.php';
require_once '../../library/Icinga/Backend/DataView/ObjectRemappingView.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php';
require_once '../../library/Icinga/Backend/Statusdat/DataView/StatusdatHostView.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatHostView.php';
require_once '../../modules/monitoring/library/Monitoring/View/MonitoringView.php';
require_once '../../modules/monitoring/library/Monitoring/View/StatusView.php';
require_once '../../library/Icinga/Protocol/AbstractQuery.php'; require_once '../../library/Icinga/Protocol/AbstractQuery.php';
require_once '../../library/Icinga/Protocol/Statusdat/IReader.php';
require_once '../../library/Icinga/Protocol/Statusdat/Reader.php';
require_once '../../library/Icinga/Protocol/Statusdat/Query.php';
class QueryAdapterTest extends \PHPUnit_Framework_TestCase class QueryAdapterTest extends \PHPUnit_Framework_TestCase
{ {
@ -54,7 +55,7 @@ class QueryAdapterTest extends \PHPUnit_Framework_TestCase
public function testLimit1() public function testLimit1()
{ {
$backend = new Statusdat($this->config); $backend = new Statusdat($this->config);
$query = $backend->select()->from('hostlist'); $query = $backend->select()->from('status');
$adapter = new QueryAdapter($query); $adapter = new QueryAdapter($query);
@ -71,7 +72,7 @@ class QueryAdapterTest extends \PHPUnit_Framework_TestCase
public function testLimit2() public function testLimit2()
{ {
$backend = new Statusdat($this->config); $backend = new Statusdat($this->config);
$query = $backend->select()->from('hostlist'); $query = $backend->select()->from('status');
$adapter = new QueryAdapter($query); $adapter = new QueryAdapter($query);
$this->assertEquals(30, $adapter->count()); $this->assertEquals(30, $adapter->count());

33
test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
View File

@ -2,9 +2,11 @@
namespace Tests\Icinga\Web\Paginator\ScrollingStyle; namespace Tests\Icinga\Web\Paginator\ScrollingStyle;
use Icinga\Backend\Statusdat; use Monitoring\Backend\Statusdat;
use Icinga\Protocol\Statusdat\Reader; use Icinga\Protocol\Statusdat\Reader;
use Icinga\Web\Paginator\Adapter\QueryAdapter; use Icinga\Web\Paginator\Adapter\QueryAdapter;
use Tests\Icinga\Protocol\Statusdat\StatusdatTestLoader;
require_once 'Zend/Paginator/Adapter/Interface.php'; require_once 'Zend/Paginator/Adapter/Interface.php';
require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; require_once 'Zend/Paginator/ScrollingStyle/Interface.php';
@ -13,23 +15,18 @@ require_once 'Zend/Config.php';
require_once 'Zend/Cache.php'; require_once 'Zend/Cache.php';
require_once '../../library/Icinga/Web/Paginator/Adapter/QueryAdapter.php'; require_once '../../library/Icinga/Web/Paginator/Adapter/QueryAdapter.php';
require_once '../../library/Icinga/Backend/Criteria/Order.php'; require_once 'library/Icinga/Protocol/Statusdat/StatusdatTestLoader.php';
require_once '../../library/Icinga/Backend/AbstractBackend.php';
require_once '../../library/Icinga/Backend/Query.php';
require_once '../../library/Icinga/Backend/Statusdat/Query.php';
require_once '../../library/Icinga/Backend/Statusdat.php';
require_once '../../library/Icinga/Backend/MonitoringObjectList.php';
require_once '../../library/Icinga/Backend/Statusdat/HostlistQuery.php';
require_once '../../library/Icinga/Backend/DataView/AbstractAccessorStrategy.php';
require_once '../../library/Icinga/Backend/DataView/ObjectRemappingView.php';
require_once '../../library/Icinga/Backend/Statusdat/DataView/StatusdatHostView.php';
require_once '../../library/Icinga/Protocol/AbstractQuery.php';
require_once '../../library/Icinga/Protocol/Statusdat/IReader.php';
require_once '../../library/Icinga/Protocol/Statusdat/Reader.php';
require_once '../../library/Icinga/Protocol/Statusdat/Query.php';
require_once '../../library/Icinga/Protocol/Statusdat/Parser.php';
require_once '../../library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php';
StatusdatTestLoader::requireLibrary();
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php';
require_once '../../modules/monitoring/library/Monitoring/Backend/AbstractBackend.php';
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php';
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat.php';
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php';
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatHostView.php';
require_once '../../modules/monitoring/library/Monitoring/View/MonitoringView.php';
require_once '../../modules/monitoring/library/Monitoring/View/StatusView.php';
require_once '../../library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php'; require_once '../../library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php';
class TestPaginatorAdapter implements \Zend_Paginator_Adapter_Interface class TestPaginatorAdapter implements \Zend_Paginator_Adapter_Interface
@ -109,7 +106,7 @@ class SlidingwithborderTest extends \PHPUnit_Framework_TestCase
public function testGetPages1() public function testGetPages1()
{ {
$backend = new Statusdat($this->config); $backend = new Statusdat($this->config);
$query = $backend->select()->from('hostlist'); $query = $backend->select()->from('status');
$adapter = new QueryAdapter($query); $adapter = new QueryAdapter($query);

2
test/php/runtests
View File

@ -9,7 +9,7 @@ from optparse import OptionParser, BadOptionError, AmbiguousOptionError
APPLICATION = 'phpunit' APPLICATION = 'phpunit'
DEFAULT_ARGS = ['--strict', '--static-backup'] DEFAULT_ARGS = ['--static-backup']
VAGRANT_SCRIPT = '/vagrant/test/php/runtests' VAGRANT_SCRIPT = '/vagrant/test/php/runtests'
REPORT_DIRECTORY = '../../build/log' REPORT_DIRECTORY = '../../build/log'