WIP

romm · May 11, 2017 · f89bd21 · f89bd21
1 parent 9927bfe
commit f89bd21
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 51 deletions.
diff --git a/Tests/Unit/Form/FormObject/FormObjectTest.php b/Tests/Unit/Form/FormObject/FormObjectTest.php
@@ -79,7 +79,7 @@ public function setFormSetsForm()
     {
         /** @var FormObject|\PHPUnit_Framework_MockObject_MockObject $formObject */
         $formObject = $this->getMockBuilder(FormObject::class)
-            ->disableOriginalConstructor()
+            ->setConstructorArgs(['foo', $this->prophesize(FormObjectStatic::class)->reveal()])
             ->setMethods(['createProxy'])
             ->getMock();
 
@@ -160,7 +160,7 @@ public function proxyDataCanBeRetrieved()
 
         /** @var FormObject|\PHPUnit_Framework_MockObject_MockObject $formObject */
         $formObject = $this->getMockBuilder(FormObject::class)
-            ->disableOriginalConstructor()
+            ->setConstructorArgs(['foo', $this->prophesize(FormObjectStatic::class)->reveal()])
             ->setMethods(['createProxy'])
             ->getMock();
 

diff --git a/Tests/Unit/FormzUnitTestUtility.php b/Tests/Unit/FormzUnitTestUtility.php
@@ -7,6 +7,8 @@
 use Romm\Formz\Configuration\Configuration;
 use Romm\Formz\Configuration\ConfigurationFactory;
 use Romm\Formz\Configuration\View\Classes\ViewClass;
+use Romm\Formz\Configuration\View\Layouts\Layout;
+use Romm\Formz\Configuration\View\Layouts\LayoutGroup;
 use Romm\Formz\Core\Core;
 use Romm\Formz\Form\Definition\Field\Field;
 use Romm\Formz\Form\Definition\FormDefinition;
@@ -199,22 +201,28 @@ protected function createFormObject(array $fields = [], callable $proxyCallback
         $formDefinitionObject = new FormDefinitionObject($formDefinition, new Result);
         $formDefinitionObject->setValidationResult(new Result);
 
-        $formzConfiguration = new Configuration();
+        $rootConfiguration = new Configuration();
 
-        $formzConfiguration->getSettings()->getDefaultFieldSettings()->setMessageContainerSelector('[fz-field-message-container="#FIELD#"]');
-        $formzConfiguration->getSettings()->getDefaultFieldSettings()->setFieldContainerSelector('[fz-field-container="#FIELD#"]');
+        $rootConfiguration->getSettings()->getDefaultFieldSettings()->setMessageContainerSelector('[fz-field-message-container="#FIELD#"]');
+        $rootConfiguration->getSettings()->getDefaultFieldSettings()->setFieldContainerSelector('[fz-field-container="#FIELD#"]');
 
         $errors = new ViewClass;
         $errors->addItem('foo', 'foo');
         /** @noinspection PhpUndefinedMethodInspection */
-        $formzConfiguration->getView()->getClasses()->setErrors($errors);
+        $rootConfiguration->getView()->getClasses()->setErrors($errors);
 
         $valid = new ViewClass;
         $valid->addItem('bar', 'bar');
         /** @noinspection PhpUndefinedMethodInspection */
-        $formzConfiguration->getView()->getClasses()->setValid($valid);
+        $rootConfiguration->getView()->getClasses()->setValid($valid);
 
-        $formDefinition->setParents([$formzConfiguration]);
+        $layout = new Layout;
+        $layout->setTemplateFile('EXT:formz/Tests/Fixture/ViewHelpers/StandaloneViewFixture.html');
+        $layoutGroup = new LayoutGroup;
+        $layoutGroup->addItem('default', $layout);
+        $rootConfiguration->getView()->setLayout('foo', $layoutGroup);
+
+        $formDefinition->setParents([$rootConfiguration]);
 
         $formObject->method('getDefinition')
             ->willReturn($formDefinitionObject->getObject(true));

diff --git a/Tests/Unit/Validation/Validator/Form/FormValidatorExecutorTest.php b/Tests/Unit/Validation/Validator/Form/FormValidatorExecutorTest.php
@@ -29,8 +29,8 @@ public function fieldActivationIsCalledOncePerField()
 
         /** @var FormValidatorExecutor|\PHPUnit_Framework_MockObject_MockObject $formzValidatorExecutor */
         $formzValidatorExecutor = $this->getMockBuilder(FormValidatorExecutor::class)
-            ->setMethods(['getFormObject', 'checkFieldActivation'])
-            ->setConstructorArgs([new ExtendedForm, 'foo'])
+            ->setMethods(['checkFieldActivation'])
+            ->setConstructorArgs([$formObject])
             ->getMock();
 
         $formzValidatorExecutor->expects($this->exactly(2))
@@ -43,9 +43,6 @@ public function fieldActivationIsCalledOncePerField()
                 $result->deactivateField($field);
             });
 
-        $formzValidatorExecutor->method('getFormObject')
-            ->willReturn($formObject);
-
         $formzValidatorExecutor->checkFieldsActivation();
         $formzValidatorExecutor->checkFieldsActivation();
         $formzValidatorExecutor->checkFieldsActivation();
@@ -67,13 +64,10 @@ public function fieldActivationCheckRunsCorrectly()
 
         /** @var FormValidatorExecutor|\PHPUnit_Framework_MockObject_MockObject $formzValidatorExecutor */
         $formzValidatorExecutor = $this->getMockBuilder(FormValidatorExecutor::class)
-            ->setMethods(['getFormObject', 'getFieldActivationProcessResult'])
-            ->setConstructorArgs([new DefaultForm, 'foo'])
+            ->setMethods(['getFieldActivationProcessResult'])
+            ->setConstructorArgs([$formObject])
             ->getMock();
 
-        $formzValidatorExecutor->method('getFormObject')
-            ->willReturn($formObject);
-
         $formzValidatorExecutor->expects($this->once())
             ->method('getFieldActivationProcessResult')
             ->with($field)
@@ -107,13 +101,10 @@ public function fieldValidationActivationCheckRunsCorrectly()
 
         /** @var FormValidatorExecutor|\PHPUnit_Framework_MockObject_MockObject $formzValidatorExecutor */
         $formzValidatorExecutor = $this->getMockBuilder(FormValidatorExecutor::class)
-            ->setMethods(['getFormObject', 'getValidationActivationProcessResult'])
-            ->setConstructorArgs([new DefaultForm, 'foo'])
+            ->setMethods(['getValidationActivationProcessResult'])
+            ->setConstructorArgs([$formObject])
             ->getMock();
 
-        $formzValidatorExecutor->method('getFormObject')
-            ->willReturn($formObject);
-
         $formzValidatorExecutor->expects($this->once())
             ->method('getValidationActivationProcessResult')
             ->with($validation)
@@ -132,8 +123,11 @@ public function fieldValidationActivationCheckRunsCorrectly()
      */
     public function errorIsAddedToFieldValidation()
     {
+        $form = new DefaultForm;
+        $form->setFoo('');
+
         $formObject = $this->getDefaultFormObject();
-        $formObject->setForm(new DefaultForm);
+        $formObject->setForm($form );
         $result = $formObject->getFormResult();
 
         $field = $formObject->getDefinition()->getField('foo');
@@ -144,17 +138,7 @@ public function errorIsAddedToFieldValidation()
         $validation->setClassName(RequiredValidator::class);
         $validation->setParents([$field]);
 
-        $form = new DefaultForm;
-        $form->setFoo('');
-
-        /** @var FormValidatorExecutor|\PHPUnit_Framework_MockObject_MockObject $formzValidatorExecutor */
-        $formzValidatorExecutor = $this->getMockBuilder(FormValidatorExecutor::class)
-            ->setMethods(['getFormObject'])
-            ->setConstructorArgs([$form, 'foo'])
-            ->getMock();
-
-        $formzValidatorExecutor->method('getFormObject')
-            ->willReturn($formObject);
+        $formzValidatorExecutor = new FormValidatorExecutor($formObject);
 
         $this->assertFalse($result->forProperty('foo')->hasErrors());
         $formzValidatorExecutor->validateFields();
@@ -183,13 +167,10 @@ public function validationIsCorrectlyDeactivatedWhenItHasCondition()
 
         /** @var FormValidatorExecutor|\PHPUnit_Framework_MockObject_MockObject $formzValidatorExecutor */
         $formzValidatorExecutor = $this->getMockBuilder(FormValidatorExecutor::class)
-            ->setMethods(['getFormObject', 'getValidationActivationProcessResult'])
-            ->setConstructorArgs([new DefaultForm, 'foo'])
+            ->setMethods(['getValidationActivationProcessResult'])
+            ->setConstructorArgs([$formObject])
             ->getMock();
 
-        $formzValidatorExecutor->method('getFormObject')
-            ->willReturn($formObject);
-
         $formzValidatorExecutor->expects($this->once())
             ->method('getValidationActivationProcessResult')
             ->with($validation)

diff --git a/Tests/Unit/ViewHelpers/FieldViewHelperTest.php b/Tests/Unit/ViewHelpers/FieldViewHelperTest.php
@@ -81,15 +81,11 @@ public function renderViewHelperDataProvider()
         $this->registerFluidTemplateCache();
         $this->addFooLayoutToTypoScriptConfiguration();
 
-        /** @var FormObjectFactory $formObjectFactory */
-        $formObjectFactory = Core::instantiate(FormObjectFactory::class);
-        $formObject = $formObjectFactory->getInstanceWithClassName(DefaultForm::class, 'foo');
-
         return [
             [
                 'fieldName'  => 'foo',
                 'layoutName' => 'foo',
-                'formObject' => $formObject
+                'formObject' => $this->getDefaultFormObject()
             ]
         ];
     }
@@ -269,9 +265,7 @@ public function renderFieldWithNotExistingLayoutItemNameThrowsException()
         $this->setExpectedException(EntryNotFoundException::class, '', 1485867803);
         $this->addFooLayoutToTypoScriptConfiguration();
 
-        /** @var FormObjectFactory $formObjectFactory */
-        $formObjectFactory = Core::instantiate(FormObjectFactory::class);
-        $formObject = $formObjectFactory->getInstanceWithClassName(DefaultForm::class, 'foo');
+        $formObject = $this->getDefaultFormObject();
 
         /** @var FieldViewHelper|\PHPUnit_Framework_MockObject_MockObject $viewHelper */
         $viewHelper = $this->getMockBuilder(FieldViewHelper::class)
@@ -305,9 +299,7 @@ public function renderFieldWithNotExistingLayoutItemNameThrowsException()
      */
     public function originalArgumentsAreRestoredAfterViewHelperIsRendered()
     {
-        /** @var FormObjectFactory $formObjectFactory */
-        $formObjectFactory = Core::instantiate(FormObjectFactory::class);
-        $formObject = $formObjectFactory->getInstanceWithClassName(DefaultForm::class, 'foo');
+        $formObject = $this->getDefaultFormObject();
 
         /** @var FieldViewHelper|\PHPUnit_Framework_MockObject_MockObject $viewHelper */
         $viewHelper = $this->getMockBuilder(FieldViewHelper::class)