From 3bd176d4fc21990164aa64ecdd0dd86609c22089 Mon Sep 17 00:00:00 2001 From: Nathan Eikermann Date: Mon, 10 May 2021 22:37:38 +0200 Subject: [PATCH] added tests and fixed leftover array entries --- classes/CsvxmlAvailableFields.php | 26 ++++++++++++----------- tests/CsvxmlAvailableFieldsTest.php | 33 +++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 tests/CsvxmlAvailableFieldsTest.php diff --git a/classes/CsvxmlAvailableFields.php b/classes/CsvxmlAvailableFields.php index b9187de..c963b0c 100644 --- a/classes/CsvxmlAvailableFields.php +++ b/classes/CsvxmlAvailableFields.php @@ -36,17 +36,18 @@ final class CsvxmlAvailableFields { * @param boolean $required Determines whether the field is required. Defaults to false. * - * @return array + * @return FieldEntry */ - private function _getSimpleAvailableFieldEntry(string $nameTL = "", string $explica = "", array $dependsOn = [], array $allowedValues = [], string $remark = "", bool $required = false):array { - return [ - "required" => $required, - "allowedValues" => $allowedValues, - "dependsOn" => $dependsOn, - "remark" => $remark, - "name_human_readable" => $nameTL, - "explica" => $explica, - ]; + private function _getSimpleAvailableFieldEntry(string $nameTL = "", string $explica = "", array $dependsOn = [], array $allowedValues = [], string $remark = "", bool $required = false):FieldEntry + { + return new FieldEntry( + $required, + $allowedValues, + $dependsOn, + $remark, + $nameTL, + $explica + ); } @@ -59,9 +60,10 @@ final class CsvxmlAvailableFields { * @param string $type Event type name (e.g. production). * @param integer $number Number of event of this type. * - * @return array + * @return FieldEntry */ - private function _generateGenericFullEvent(array $event, MDTlLoader $tlLoader, string $typeName, string $type, int $number):array { + private function _generateGenericFullEvent(array $event, MDTlLoader $tlLoader, string $typeName, string $type, int $number):array + { return [ "{$type}_when{$number}" => $this->_getSimpleAvailableFieldEntry("{$typeName}: {$event['when']}", "", ["{$type}_when_sure{$number}"]), diff --git a/tests/CsvxmlAvailableFieldsTest.php b/tests/CsvxmlAvailableFieldsTest.php new file mode 100644 index 0000000..f52f723 --- /dev/null +++ b/tests/CsvxmlAvailableFieldsTest.php @@ -0,0 +1,33 @@ + + */ +declare(strict_types = 1); + +use PHPUnit\Framework\TestCase; +require_once __DIR__ . "/../functions/functions.php"; + +/** + * Test class for the start page. + */ +final class CsvxmlAvailableFieldsTest extends TestCase { + /** + * Test for HTML output. + * + * @return void + */ + public function testOutput():void { + + $fieldsGetter = new CsvxmlAvailableFields('en'); + $availableFields = $fieldsGetter->getFields(); + + foreach ($availableFields as $type) { + foreach ($type as $name => $entry) { + self::assertTrue($entry instanceof FieldEntry, $name . " is not a FieldEntry"); + } + } + + } +}