From 962faab99258b314aa9cb1d1986f299b1ee93d59 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 29 Nov 2016 11:23:11 +0100 Subject: [PATCH] AndOperatorTest: test pending fixes #8727 --- .../library/Businessprocess/HostNodeTest.php | 2 +- .../Operators/AndOperatorTest.php | 54 +++++++++++++++++++ .../Businessprocess/ServiceNodeTest.php | 1 - 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/test/php/library/Businessprocess/HostNodeTest.php b/test/php/library/Businessprocess/HostNodeTest.php index 72678c5..bc5716c 100644 --- a/test/php/library/Businessprocess/HostNodeTest.php +++ b/test/php/library/Businessprocess/HostNodeTest.php @@ -42,7 +42,7 @@ class HostNodeTest extends BaseTestCase } /** - * @expectedException \Icinga\Exception\ConfigurationError + * @expectedException \Icinga\Exception\ProgrammingError */ public function testWhetherSettingAnInvalidStateFails() { diff --git a/test/php/library/Businessprocess/Operators/AndOperatorTest.php b/test/php/library/Businessprocess/Operators/AndOperatorTest.php index 2969ac2..9436184 100644 --- a/test/php/library/Businessprocess/Operators/AndOperatorTest.php +++ b/test/php/library/Businessprocess/Operators/AndOperatorTest.php @@ -143,6 +143,60 @@ class AndOperatorTest extends BaseTestCase $this->assertEquals('WARNING', $p->getStateName()); } + public function testWhetherPendingIsAccepted() + { + $bp = new BusinessProcess(); + $host = $bp->createHost('localhost')->setState(99); + $service = $bp->createService('localhost', 'ping')->setState(99); + $p = $bp->createBp('p') + ->addChild($host) + ->addChild($service); + + $this->assertEquals( + 'PENDING', + $p->getStateName() + ); + } + + public function testWhetherWarningIsWorseThanPending() + { + $bp = new BusinessProcess(); + $host = $bp->createHost('localhost')->setState(99); + $service = $bp->createService('localhost', 'ping')->setState(1); + $p = $bp->createBp('p') + ->addChild($host) + ->addChild($service); + + $this->assertEquals( + 'WARNING', + $p->getStateName() + ); + } + + public function testWhetherPendingIsWorseThanUpOrOk() + { + $bp = new BusinessProcess(); + $host = $bp->createHost('localhost')->setState(99); + $service = $bp->createService('localhost', 'ping')->setState(0); + $p = $bp->createBp('p') + ->addChild($host) + ->addChild($service); + + $this->assertEquals( + 'PENDING', + $p->getStateName() + ); + + $p->clearState(); + $host->setState(0); + $service->setState(99); + + $this->assertEquals( + 'PENDING', + $p->getStateName() + ); + } + /** * @return BusinessProcess */ diff --git a/test/php/library/Businessprocess/ServiceNodeTest.php b/test/php/library/Businessprocess/ServiceNodeTest.php index 30e730c..39fe0f3 100644 --- a/test/php/library/Businessprocess/ServiceNodeTest.php +++ b/test/php/library/Businessprocess/ServiceNodeTest.php @@ -5,7 +5,6 @@ namespace Tests\Icinga\Module\Businessprocess\Operator; use Icinga\Module\Businessprocess\BusinessProcess; use Icinga\Module\Businessprocess\ServiceNode; use Icinga\Module\Businessprocess\Test\BaseTestCase; -use Icinga\Web\View; class ServiceNodeTest extends BaseTestCase {