test(datetime): update tests

Author: btry

inc/fields/datetimefield.class.php

@@ -121,12 +121,12 @@ public static function getJSFields() {
 
    public function equals($value) {
       if ($this->value === '') {
-         $answer = '0000-00-00 00:00';
+         $answer = '0000-00-00 00:00:00';
       } else {
          $answer = $this->value;
       }
-      $answerDatetime = DateTime::createFromFormat("Y-m-d H:i", $answer);
-      $compareDatetime = DateTime::createFromFormat("Y-m-d H:i", $value);
+      $answerDatetime = DateTime::createFromFormat("Y-m-d H:i:s", $answer);
+      $compareDatetime = DateTime::createFromFormat("Y-m-d H:i:s", $value);
       return $answerDatetime == $compareDatetime;
    }
 
@@ -136,12 +136,12 @@ public function notEquals($value) {
 
    public function greaterThan($value) {
       if (empty($this->value)) {
-         $answer = '0000-00-00 00:00';
+         $answer = '0000-00-00 00:00:00';
       } else {
          $answer = $this->value;
       }
-      $answerDatetime = DateTime::createFromFormat("Y-m-d H:i", $answer);
-      $compareDatetime = DateTime::createFromFormat("Y-m-d H:i", $value);
+      $answerDatetime = DateTime::createFromFormat("Y-m-d H:i:s", $answer);
+      $compareDatetime = DateTime::createFromFormat("Y-m-d H:i:s", $value);
       return $answerDatetime > $compareDatetime;
    }
 

tests/suite-unit/PluginFormcreatorDatetimeField.php

@@ -162,7 +162,7 @@ public function providerparseAnswerValues() {
          [
             'id' => '1',
             'input' => [
-               'formcreator_field_1' => '2018-12-25 23:00',
+               'formcreator_field_1' => '2018-12-25 23:00:00',
             ],
             'expected' => true,
             'expectedValue' => '2018-12-25 23:00',
@@ -205,15 +205,15 @@ public function providerSerializeValue() {
    }
 
    public function testSerializeValue() {
-      $value = $expected = '2019-01-01 12:00';
+      $value = $expected = '2019-01-01 12:00:00';
       $instance = $this->newTestedInstance(['id' => 1]);
       $instance->parseAnswerValues(['formcreator_field_1' => $value]);
       $output = $instance->serializeValue();
       $this->string($output)->isEqualTo($expected);
    }
 
    public function testGetValueForDesign() {
-      $value = $expected = '2019-01-01 12:00';
+      $value = $expected = '2019-01-01 12:00:00';
       $instance = new \PluginFormcreatorDatetimeField([]);
       $instance->deserializeValue($value);
       $output = $instance->getValueForDesign();
@@ -223,18 +223,18 @@ public function testGetValueForDesign() {
    public function providerEquals() {
       return [
          [
-            'value'     => '2019-01-01 00:00',
+            'value'     => '2019-01-01 00:00:00',
             'answer'    => '',
             'expected'  => false,
          ],
          [
-            'value'     => '2019-01-01 02:00',
-            'answer'    => '2019-01-01 03:00',
+            'value'     => '2019-01-01 02:00:00',
+            'answer'    => '2019-01-01 03:00:00',
             'expected'  => false,
          ],
          [
-            'value'     => '2019-01-01 03:00',
-            'answer'    => '2019-01-01 03:00',
+            'value'     => '2019-01-01 03:00:00',
+            'answer'    => '2019-01-01 03:00:00',
             'expected'  => true,
          ],
       ];
@@ -252,18 +252,18 @@ public function testEquals($value, $answer, $expected) {
    public function providerNotEquals() {
       return [
          [
-            'value'     => '2019-01-01 00:00',
+            'value'     => '2019-01-01 00:00:00',
             'answer'    => '',
             'expected'  => true,
          ],
          [
-            'value'     => '2019-01-01 02:00',
-            'answer'    => '2019-01-01 03:00',
+            'value'     => '2019-01-01 02:00:00',
+            'answer'    => '2019-01-01 03:00:00',
             'expected'  => true,
          ],
          [
-            'value'     => '2019-01-01 03:00',
-            'answer'    => '2019-01-01 03:00',
+            'value'     => '2019-01-01 03:00:00',
+            'answer'    => '2019-01-01 03:00:00',
             'expected'  => false,
          ],
       ];