Fix form tests

This commit is contained in:
Johannes Meyer 2014-09-29 12:56:36 +02:00
parent 243dd19281
commit 07d25e8bed
3 changed files with 19 additions and 9 deletions

View File

@ -9,6 +9,7 @@ namespace Tests\Icinga\Form\Config\Authentication;
require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
use Mockery;
use Zend_Config;
use Icinga\Test\BaseTestCase;
use Icinga\Form\Config\Authentication\DbBackendForm;
@ -67,7 +68,9 @@ class DbBackendFormTest extends BaseTestCase
protected function setUpResourceFactoryMock()
{
Mockery::mock('alias:Icinga\Data\ResourceFactory')
->shouldReceive('create')
->andReturn(Mockery::mock('Icinga\Data\Db\DbConnection'));
->shouldReceive('createResource')
->andReturn(Mockery::mock('Icinga\Data\Db\DbConnection'))
->shouldReceive('getResourceConfig')
->andReturn(new Zend_Config(array()));
}
}

View File

@ -9,6 +9,7 @@ namespace Tests\Icinga\Form\Config\Authentication;
require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
use Mockery;
use Zend_Config;
use Icinga\Test\BaseTestCase;
use Icinga\Form\Config\Authentication\LdapBackendForm;
use Icinga\Exception\AuthenticationException;
@ -66,9 +67,9 @@ class LdapBackendFormTest extends BaseTestCase
protected function setUpResourceFactoryMock()
{
Mockery::mock('alias:Icinga\Data\ResourceFactory')
->shouldReceive('createResource')
->andReturn(Mockery::mock('Icinga\Protocol\Ldap\Connection'))
->shouldReceive('getResourceConfig')
->andReturn(new \Zend_Config(array()))
->shouldReceive('create')
->andReturn(Mockery::mock('Icinga\Protocol\Ldap\Connection'));
->andReturn(new Zend_Config(array()));
}
}

View File

@ -27,11 +27,14 @@ class LdapResourceFormTest extends BaseTestCase
public function testValidLdapResourceIsValid()
{
$this->setUpResourceFactoryMock(
Mockery::mock()->shouldReceive('connect')->getMock()
Mockery::mock()->shouldReceive('testCredentials')->once()->andReturn(true)->getMock()
);
$form = new LdapResourceForm();
$form->setTokenDisabled();
$this->assertTrue(
LdapResourceForm::isValidResource(new LdapResourceForm()),
LdapResourceForm::isValidResource($form->create()),
'ResourceForm claims that a valid ldap resource is not valid'
);
}
@ -43,11 +46,14 @@ class LdapResourceFormTest extends BaseTestCase
public function testInvalidLdapResourceIsNotValid()
{
$this->setUpResourceFactoryMock(
Mockery::mock()->shouldReceive('connect')->once()->andThrow('\Exception')->getMock()
Mockery::mock()->shouldReceive('testCredentials')->once()->andThrow('\Exception')->getMock()
);
$form = new LdapResourceForm();
$form->setTokenDisabled();
$this->assertFalse(
LdapResourceForm::isValidResource(new LdapResourceForm()),
LdapResourceForm::isValidResource($form->create()),
'ResourceForm claims that an invalid ldap resource is valid'
);
}