Fixed unit tests

Author: srtab

src/Fields/CharField.php

@@ -12,29 +12,22 @@ class CharField extends Field
 {
     protected $widget = TextInput::class;
 
-    /**
-    * @var int Max value length.
-    */
-    protected $max_length;
-
-    /**
-    * @var int Min value length.
-    */
-    protected $min_length;
-
     /**
      * Constructor with extra args min_length and max_length
      *
      * @param array
      */
     public function __construct(array $args = array())
     {
+        $this->min_length = array_key_exists('min_length', $args) ? $args['min_length'] : null;
+        $this->max_length = array_key_exists('max_length', $args) ? $args['max_length'] : null;
+
         parent::__construct($args);
 
-        if (isset($this->min_length)) {
+        if (!is_null($this->min_length)) {
             $this->validators[] = new MinLengthValidator($this->min_length);
         }
-        if (isset($this->max_length)) {
+        if (!is_null($this->max_length)) {
             $this->validators[] = new MaxLengthValidator($this->max_length);
         }
     }
@@ -49,10 +42,10 @@ public function widgetAttrs($widget)
     {
         $attrs = parent::widgetAttrs($widget);
 
-        if (isset($this->min_length) && !is_null($this->min_length)) {
+        if (!is_null($this->min_length)) {
             $attrs['minlength'] = $this->min_length;
         }
-        if (isset($this->max_length) && !is_null($this->max_length)) {
+        if (!is_null($this->max_length)) {
             $attrs['maxlength'] = $this->max_length;
         }
 

src/Fields/IntegerField.php

@@ -13,29 +13,22 @@ class IntegerField extends Field
 {
     protected $widget = NumberInput::class;
 
-    /**
-    * @var int Max value.
-    */
-    protected $max_value;
-
-    /**
-    * @var int Min value.
-    */
-    protected $min_value;
-
     protected $error_messages = array(
         'invalid' => 'Enter a whole number.'
     );
 
 
     public function __construct(array $args = array())
     {
+        $this->min_value = array_key_exists('min_value', $args) ? $args['min_value'] : null;
+        $this->max_value = array_key_exists('max_value', $args) ? $args['max_value'] : null;
+
         parent::__construct($args);
 
-        if (isset($this->min_value)) {
+        if (!is_null($this->min_value)) {
             $this->validators[] = new MinValueValidator($this->min_value);
         }
-        if (isset($this->max_value)) {
+        if (!is_null($this->max_value)) {
             $this->validators[] = new MaxValueValidator($this->max_value);
         }
     }
@@ -53,10 +46,10 @@ public function widgetAttrs($widget)
     {
         $attrs = parent::widgetAttrs($widget);
 
-        if (isset($this->min_value) && !is_null($this->min_value)) {
+        if (!is_null($this->min_value)) {
             $attrs['min'] = $this->min_value;
         }
-        if (isset($this->max_value) && !is_null($this->max_value)) {
+        if (!is_null($this->max_value)) {
             $attrs['max'] = $this->max_value;
         }
 

tests/unit/Fields/BoundFieldTest.php

@@ -28,7 +28,7 @@ public function testConstruct()
 
     public function testConstructWithPrefix()
     {
-        $form = $this->getMockForAbstractClass(Form::class, array(null, null, "form"));
+        $form = $this->getMockForAbstractClass(Form::class, array(["prefix" => "form"]));
         $bound = new BoundField($form, $this->simple_field, "name");
 
         $this->assertAttributeEquals("form-name", "html_name", $bound);
@@ -66,17 +66,22 @@ public function testSimpleGet()
 
     public function testToString()
     {
-        $form = $this->getMockForAbstractClass(Form::class, array(array("name" => "value")));
+        $form_args = ["data" => ["name" => "value"]];
+        $form = $this->getMockForAbstractClass(Form::class, array($form_args));
+
         $bound = new BoundField($form, $this->simple_field, "name");
+
         $expected = '<input type="text" id="id_name" name="name" value="value"/>';
         $this->assertXmlStringEqualsXmlString((string) $bound, $expected);
     }
 
     public function testToStringWithPrefix()
     {
-        $data = array("prefix-name" => "value");
-        $form = $this->getMockForAbstractClass(Form::class, array($data, null, "prefix"));
+        $form_args = ["data" => ["prefix-name" => "value"], "prefix" => "prefix"];
+        $form = $this->getMockForAbstractClass(Form::class, array($form_args));
+
         $bound = new BoundField($form, $this->simple_field, "name");
+
         $expected = '<input type="text" id="id_prefix-name" name="prefix-name" value="value"/>';
         $this->assertXmlStringEqualsXmlString((string) $bound, $expected);
     }
@@ -91,9 +96,13 @@ public function testLabelTag()
 
     public function testLabelTagWithPrefix()
     {
-        $form = $this->getMockForAbstractClass(Form::class, array(null, null, "prefix"));
+        $form_args = ["prefix" => "prefix"];
+        $form = $this->getMockForAbstractClass(Form::class, array($form_args));
+
         $field = new CharField(array("label" => "Label"));
+
         $bound = new BoundField($form, $field, "name");
+
         $expected = '<label for="id_prefix-name">Label</label>';
         $this->assertXmlStringEqualsXmlString($bound->labelTag(), $expected);
     }

tests/unit/Fields/CharFieldTest.php

@@ -0,0 +1,54 @@
+<?php
+namespace PHPForm\Unit\Fields;
+
+use PHPUnit\Framework\TestCase;
+
+use PHPForm\Exceptions\ValidationError;
+use PHPForm\Fields\CharField;
+use PHPForm\Widgets\TextInput;
+
+class CharFieldTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->field = new CharField(["min_length" => 10, "max_length" => 20]);
+    }
+
+    public function testConstruct()
+    {
+        $this->assertInstanceOf(TextInput::class, $this->field->getWidget());
+    }
+
+    public function testConstructWithValidators()
+    {
+        $this->assertAttributeEquals(10, "min_length", $this->field);
+        $this->assertAttributeEquals(20, "max_length", $this->field);
+    }
+
+    public function testValidatorNoException()
+    {
+        $this->assertEquals($this->field->clean("12345678910"), "12345678910");
+    }
+
+    /**
+     * @expectedException PHPForm\Exceptions\ValidationError
+     */
+    public function testMinValidator()
+    {
+        $this->field->clean("12345");
+    }
+
+    /**
+     * @expectedException PHPForm\Exceptions\ValidationError
+     */
+    public function testMaxValidator()
+    {
+        $this->field->clean("123456789123456789123456789");
+    }
+
+    public function testWidgetAttrs()
+    {
+        $expected = array("minlength" => 10, "maxlength" => 20);
+        $this->assertEquals($expected, $this->field->widgetAttrs(null));
+    }
+}

tests/unit/Fields/FieldTest.php

@@ -9,14 +9,6 @@
 
 class FieldTest extends TestCase
 {
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testConstructWithInvalidArgument()
-    {
-        $this->getMockForAbstractClass(Field::class, array(array("a" => true)));
-    }
-
     public function testConstruct()
     {
         $args = array("label" => "label", "required" => true);

tests/unit/Fields/IntegerFieldTest.php

@@ -9,45 +9,41 @@
 
 class IntegerFieldTest extends TestCase
 {
+    public function setUp()
+    {
+        $this->field = new IntegerField(["min_value" => 10, "max_value" => 40]);
+    }
+
     public function testConstruct()
     {
-        $field = new IntegerField();
-        $this->assertInstanceOf(NumberInput::class, $field->getWidget());
+        $this->assertInstanceOf(NumberInput::class, $this->field->getWidget());
     }
 
     public function testConstructWithValidators()
     {
-        $args = array("min_value" => 10, "max_value" => 40);
-        $field = new IntegerField($args);
-        $this->assertAttributeEquals(10, "min_value", $field);
-        $this->assertAttributeEquals(40, "max_value", $field);
+        $this->assertAttributeEquals(10, "min_value", $this->field);
+        $this->assertAttributeEquals(40, "max_value", $this->field);
     }
 
     public function testValidatorNoException()
     {
-        $args = array("min_value" => 10, "max_value" => 40);
-        $field = new IntegerField($args);
-        $this->assertEquals($field->clean("25"), 25);
+        $this->assertEquals($this->field->clean("25"), 25);
     }
 
     /**
      * @expectedException PHPForm\Exceptions\ValidationError
      */
     public function testMinValidatorError()
     {
-        $args = array("min_value" => 10, "max_value" => 40);
-        $field = new IntegerField($args);
-        $field->clean("1");
+        $this->field->clean("1");
     }
 
     /**
      * @expectedException PHPForm\Exceptions\ValidationError
      */
     public function testMaxValidatorError()
     {
-        $args = array("min_value" => 10, "max_value" => 20);
-        $field = new IntegerField($args);
-        $field->clean("100");
+        $this->field->clean("100");
     }
 
     /**
@@ -56,16 +52,12 @@ public function testMaxValidatorError()
      */
     public function testInvalidValue()
     {
-        $field = new IntegerField();
-        $field->clean("aa");
+        $this->field->clean("aa");
     }
 
     public function testWidgetAttrs()
     {
-        $args = array("min_value" => 10, "max_value" => 40);
-        $field = new IntegerField($args);
-
         $expected = array("min" => 10, "max" => 40);
-        $this->assertEquals($field->widgetAttrs(null), $expected);
+        $this->assertEquals($this->field->widgetAttrs(null), $expected);
     }
 }

tests/unit/Fields/TextFieldTest.php

@@ -20,7 +20,9 @@ public function testConstructor()
 
     public function testConstructorWithBoundedForm()
     {
-        $form = new ExampleForm(['data' => ["description" => "Description"]]);
+        $data = ["description" => "Description"];
+        $form = new ExampleForm(['data' => $data]);
+
         $this->assertAttributeEquals(true, "is_bound", $form);
         $this->assertAttributeEquals($data, "data", $form);
     }