Fix broken unit tests

Fix unit tests that were broken by API changes to the resource form classes and contemplate life choices.

refs #9630

test/php/application/forms/Config/Resource/LdapResourceFormTest.php

@@ -26,14 +26,16 @@ class LdapResourceFormTest extends BaseTestCase
     public function testValidLdapResourceIsValid()
     {
         $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('bind')->once()->getMock()
+            Mockery::mock()->shouldReceive('inspect')->andReturn(self::createInspector(false))->getMock()
         );
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) { return $s; });
+            ->andReturnUsing(function ($s) {
+                return $s;
+            });
         $form->setTokenDisabled();
 
         $this->assertTrue(
@@ -49,14 +51,16 @@ class LdapResourceFormTest extends BaseTestCase
     public function testInvalidLdapResourceIsNotValid()
     {
         $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('bind')->andThrow('\Exception')->getMock()
+            Mockery::mock()->shouldReceive('inspect')->andReturn(self::createInspector(true))->getMock()
         );
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) { return $s; });
+            ->andReturnUsing(function ($s) {
+                return $s;
+            });
         $form->setTokenDisabled();
 
         $this->assertFalse(
@@ -72,4 +76,21 @@ class LdapResourceFormTest extends BaseTestCase
             ->with(Mockery::type('Icinga\Data\ConfigObject'))
             ->andReturn($resourceMock);
     }
+
+    public static function createInspector($error = false, $log = array('log'))
+    {
+        if (! $error) {
+            $calls = array(
+                'hasError' => false,
+                'toArray' => $log
+            );
+        } else {
+            $calls = array(
+                'hasError' => true,
+                'getError' => 'Error',
+                'toArray' => $log
+            );
+        }
+        return Mockery::mock('Icinga\Data\Inspection', $calls);
+    }
 }

test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php

@@ -12,6 +12,7 @@ use Icinga\Data\ConfigObject;
 use Icinga\Test\BaseTestCase;
 use Icinga\Forms\Config\UserBackend\LdapBackendForm;
 use Icinga\Exception\AuthenticationException;
+use Tests\Icinga\Forms\Config\Resource\LdapResourceFormTest;
 
 class LdapBackendFormTest extends BaseTestCase
 {
@@ -27,15 +28,18 @@ class LdapBackendFormTest extends BaseTestCase
      */
     public function testValidBackendIsValid()
     {
-        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend');
+        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
-        $ldapUserBackendMock->shouldReceive('assertAuthenticationPossible')->andReturnNull();
+            ->shouldReceive('inspect')
+            ->andReturn(self::createInspector(false))->getMock();
         $this->setUpUserBackendMock($ldapUserBackendMock);
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\UserBackend\LdapBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) { return $s; });
+            ->andReturnUsing(function ($s) {
+                return $s;
+            });
         $form->setTokenDisabled();
         $form->setResources(array('test_ldap_backend'));
         $form->populate(array('resource' => 'test_ldap_backend'));
@@ -52,7 +56,9 @@ class LdapBackendFormTest extends BaseTestCase
      */
     public function testInvalidBackendIsNotValid()
     {
-        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend');
+        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
+            ->shouldReceive('inspect')
+            ->andReturn(self::createInspector(true))->getMock();
         $ldapUserBackendMock->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
         $this->setUpUserBackendMock($ldapUserBackendMock);
 
@@ -60,7 +66,9 @@ class LdapBackendFormTest extends BaseTestCase
         $form = Mockery::mock('Icinga\Forms\Config\UserBackend\LdapBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) { return $s; });
+            ->andReturnUsing(function ($s) {
+                return $s;
+            });
         $form->setTokenDisabled();
         $form->setResources(array('test_ldap_backend'));
         $form->populate(array('resource' => 'test_ldap_backend'));
@@ -77,4 +85,21 @@ class LdapBackendFormTest extends BaseTestCase
             ->shouldReceive('create')
             ->andReturn($ldapUserBackendMock);
     }
+
+    public static function createInspector($error = false, $log = array('log'))
+    {
+        if (! $error) {
+            $calls = array(
+                'hasError' => false,
+                'toArray' => $log
+            );
+        } else {
+            $calls = array(
+                'hasError' => true,
+                'getError' => 'Error',
+                'toArray' => $log
+            );
+        }
+        return Mockery::mock('Icinga\Data\Inspection', $calls);
+    }
 }