Adding cursor test with enums

Author: phpfui

Tests/Fixtures/Definition/Integer.php

@@ -8,7 +8,7 @@ abstract class Integer extends \PHPFUI\ORM\Record
 
 	public static array $fields = [
 		'integer' => ['sqltype', 'int', 19, false, '', false, ],
-		'not_integer' => ['!sqltype', 'int', 19, false, '', false, ],
+		'not_integer' => ['!sqltype', 'null', 19, false, '', false, ],
 	];
 
 	public static string $primaryKey = '';

Tests/Fixtures/Enum/Name.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Tests\Fixtures\Enum;
+
+trait Name
+	{
+	public function name() : string
+		{
+		return \ucwords(\strtolower(\str_replace('_', ' ', $this->name)));
+		}
+	}

Tests/Fixtures/Enum/ProductStatus.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\Fixtures\Enum;
+
+enum ProductStatus : int
+	{
+	use \Tests\Fixtures\Enum\Name;
+
+	case ACTIVE = 0;
+	case BACKORDERED = 1;
+	case DISCONTINUED = 2;
+	}
+

Tests/Fixtures/Record/Product.php

@@ -5,7 +5,8 @@
 class Product extends \Tests\Fixtures\Record\Definition\Product
 	{
 	protected static array $virtualFields = [
-		'suppliers' => [\PHPFUI\ORM\ManyToMany::class, \Tests\App\Table\ProductSupplier::class, \Tests\App\Table\Supplier::class],
+		'suppliers' => [\PHPFUI\ORM\ManyToMany::class, \Tests\App\Table\ProductSupplier::class, \Tests\App\Table\Supplier::class, ],
 		'photos' => [\PHPFUI\ORM\MorphMany::class, \Tests\App\Table\Image::class, 'imageable', ],
+		'discontinued' => [\PHPFUI\ORM\Enum::class, \Tests\Fixtures\Enum\ProductStatus::class, ],
 	];
 	}

Tests/Fixtures/Record/Validation/Product.php

@@ -11,7 +11,6 @@ class Product extends \PHPFUI\ORM\Validator
 	public static array $validators = [
 		'category' => ['maxlength'],
 		'description' => ['maxlength'],
-		'discontinued' => ['required', 'integer'],
 		'list_price' => ['required', 'number'],
 		'minimum_reorder_quantity' => ['integer'],
 		'product_code' => ['maxlength', 'unique'],

Tests/Fixtures/Virtual/ProductStatus.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Tests\Fixtures\Virtual;
+
+class ProductStatus extends \PHPFUI\ORM\VirtualField
+	{
+	public function getValue(array $parameters) : mixed
+		{
+		return \number_format($this->currentRecord->unit_price * $this->currentRecord->quantity - $this->currentRecord->discount, 2);
+		}
+	}

Tests/Unit/CursorTest.php

@@ -37,4 +37,14 @@ public function testCursor() : void
 			$this->assertEquals($index, $record['customer_id'], 'DataObjectCursor array access is not correct');
 			}
 		}
+
+	public function testCursorOnEnum() : void
+		{
+		$table = new \Tests\Fixtures\Table\Product();
+
+		foreach ($table->getRecordCursor() as $key => $record)
+			{
+			$this->assertTrue($record->discontinued instanceof \Tests\Fixtures\Enum\ProductStatus, 'discontinued (type ' . get_debug_type($record->discontinued) . ') is not a ProductStatus enum');
+			}
+		}
 	}

Tests/Unit/InsertTest.php

@@ -12,7 +12,7 @@ public function testDateNullInsert() : void
 		$timeStamp = \date('Y-m-d H:i:s');
 		$id = $test->insert();
 		$insertedTest = new \Tests\App\Record\DateRecord($id);
-		$this->assertNull($insertedTest->dateDefaultNull);
+		$this->assertNull($insertedTest->dateDefaultNull, 'dateDefaultNull is not null');
 		$this->assertEquals($date, $insertedTest->dateRequired);
 		$this->assertEquals('2000-01-02', $insertedTest->dateDefaultNullable);
 		$this->assertEquals('2000-01-02', $insertedTest->dateDefaultNotNull);
@@ -27,11 +27,12 @@ public function testDateRequiredInsert() : void
 		$test = new \Tests\App\Record\DateRecord();
 		$id = $test->insert();
 		$this->assertNotEmpty(\PHPFUI\ORM::getLastError());
-		$this->assertEquals(0, $id);
+		$this->assertEquals(0, $id, '$id is not zero');
 		$insertedTest = new \Tests\App\Record\DateRecord($id);
-		$this->assertNull($insertedTest->dateDefaultNull);
-		$this->assertEquals('2000-01-02', $insertedTest->dateDefaultNullable);
-		$this->assertEquals('2000-01-02', $insertedTest->dateDefaultNotNull);
+		$this->assertNull($insertedTest->dateDefaultNull, 'dateDefaultNull is not after insert');
+		$this->assertEquals('2000-01-02', $insertedTest->dateDefaultNullable, 'dateDefaultNullable has bad default value');
+		$this->assertEquals('2000-01-02', $insertedTest->dateDefaultNotNull, 'dateDefaultNotNull has bad default value');
+
 		}
 
 	public function testMultipleInserts() : void

Tests/Unit/ValidationTest.php

@@ -500,20 +500,31 @@ public function testInteger() : void
 
 		// empty test
 		$validator->validate();
-		$this->assertEmpty($validator->getErrors());
+		$this->assertEmpty($validator->getErrors(), 'Errors found on empty integer validate');
+
+		// float test
+		$crud->not_integer = 1.23;
+		$validator->validate();
+		$this->assertEmpty($validator->getErrors(), 'Errors found on float not_integer validate');
+
+		// int test
+		$crud->not_integer = 1;
+		$validator->validate();
+		$this->assertCount(1, $validator->getErrors(), 'Errors found on int in not_integer validate');
 
 		// valid tests
+		$crud->not_integer = 1.23;
 		$crud->integer = 0;
 		$validator->validate();
-		$this->assertEmpty($validator->getErrors());
+		$this->assertEmpty($validator->getErrors(), 'Errors found on zero integer validate');
 
 		$crud->integer = -1;
 		$validator->validate();
-		$this->assertEmpty($validator->getErrors());
+		$this->assertEmpty($validator->getErrors(), 'Errors found on negative integer validate');
 
 		$crud->integer = 1;
 		$validator->validate();
-		$this->assertEmpty($validator->getErrors());
+		$this->assertEmpty($validator->getErrors(), 'Errors found on positive integer validate');
 		}
 
 	public function testMaxlength() : void