Merge pull request #1943 from atishamte/model_test

Model, Entity, Exception & Migration test cases
codeigniter4 · Apr 19, 2019 · ebd203a · ebd203a
2 parents e66c5ef + 70b0862
commit ebd203a
Show file tree

Hide file tree

Showing 15 changed files with 571 additions and 37 deletions.
diff --git a/system/Entity.php b/system/Entity.php
@@ -38,6 +38,7 @@
 
 namespace CodeIgniter;
 
+use CodeIgniter\Exceptions\EntityException;
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Exceptions\CastException;
 

diff --git a/system/Model.php b/system/Model.php
@@ -619,6 +619,11 @@ public function insert($data = null, bool $returnID = true)
 			$this->tempData = [];
 		}
 
+		if (empty($data))
+		{
+			throw DataException::forEmptyDataset('insert');
+		}
+
 		// If $data is using a custom class with public or protected
 		// properties representing the table elements, we need to grab
 		// them as an array.
@@ -668,11 +673,6 @@ public function insert($data = null, bool $returnID = true)
 
 		$data = $this->trigger('beforeInsert', ['data' => $data]);
 
-		if (empty($data))
-		{
-			throw DataException::forEmptyDataset('insert');
-		}
-
 		// Must use the set() method to ensure objects get converted to arrays
 		$result = $this->builder()
 				->set($data['data'], '', $escape)
@@ -749,6 +749,11 @@ public function update($id = null, $data = null): bool
 			$this->tempData = [];
 		}
 
+		if (empty($data))
+		{
+			throw DataException::forEmptyDataset('update');
+		}
+
 		// If $data is using a custom class with public or protected
 		// properties representing the table elements, we need to grab
 		// them as an array.
@@ -790,11 +795,6 @@ public function update($id = null, $data = null): bool
 
 		$data = $this->trigger('beforeUpdate', ['id' => $id, 'data' => $data]);
 
-		if (empty($data))
-		{
-			throw DataException::forEmptyDataset('update');
-		}
-
 		$builder = $this->builder();
 
 		if ($id)
@@ -956,9 +956,9 @@ public function onlyDeleted()
 	 * @param null    $data
 	 * @param boolean $returnSQL
 	 *
-	 * @return boolean TRUE on success, FALSE on failure
+	 * @return mixed
 	 */
-	public function replace($data = null, bool $returnSQL = false): bool
+	public function replace($data = null, bool $returnSQL = false)
 	{
 		// Validate data before saving.
 		if (! empty($data) && $this->skipValidation === false)
@@ -1317,7 +1317,7 @@ public function setValidationMessage(string $field, array $fieldMessages)
 	 * Validate the data against the validation rules (or the validation group)
 	 * specified in the class property, $validationRules.
 	 *
-	 * @param array $data
+	 * @param array|object $data
 	 *
 	 * @return boolean
 	 */

diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -31,6 +31,14 @@ public function up()
 				'constraint' => 1,
 				'default'    => '0',
 			],
+			'created_at' => [
+				'type'       => 'DATETIME',
+				'null'       => true,
+			],
+			'updated_at' => [
+				'type'       => 'DATETIME',
+				'null'       => true,
+			],
 		]);
 		$this->forge->addKey('id', true);
 		$this->forge->createTable('user', true);
@@ -50,9 +58,20 @@ public function up()
 				'type' => 'TEXT',
 				'null' => true,
 			],
-			'created_at'  => [
-				'type' => 'DATETIME',
-				'null' => true,
+			'deleted' => [
+				'type'       => 'TINYINT',
+				'constraint' => 1,
+				'default'    => '0',
+			],
+			'created_at' => [
+				'type'       => 'INTEGER',
+				'constraint' => 11,
+				'null'       => true,
+			],
+			'updated_at' => [
+				'type'       => 'INTEGER',
+				'constraint' => 11,
+				'null'       => true,
 			],
 		]);
 		$this->forge->addKey('id', true);
@@ -85,6 +104,14 @@ public function up()
 				'type'       => 'VARCHAR',
 				'constraint' => 40,
 			],
+			'created_at' => [
+				'type'       => 'DATE',
+				'null'       => true,
+			],
+			'updated_at' => [
+				'type'       => 'DATE',
+				'null'       => true,
+			],
 		]);
 		$this->forge->addKey('id', true);
 		$this->forge->createTable('empty', true);

diff --git a/tests/_support/Models/EntityModel.php b/tests/_support/Models/EntityModel.php
@@ -10,7 +10,9 @@ class EntityModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'datetime';
+	protected $dateFormat = 'int';
+
+	protected $deletedField = 'deleted';
 
 	protected $allowedFields = [
 		'name',

diff --git a/tests/_support/Models/EventModel.php b/tests/_support/Models/EventModel.php
@@ -10,7 +10,7 @@ class EventModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'datetime';
 
 	protected $allowedFields = [
 		'name',

diff --git a/tests/_support/Models/JobModel.php b/tests/_support/Models/JobModel.php
@@ -10,10 +10,14 @@ class JobModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'int';
 
 	protected $allowedFields = [
 		'name',
 		'description',
 	];
+
+	public $name = '';
+
+	public $description = '';
 }
diff --git a/tests/_support/Models/SecondaryModel.php b/tests/_support/Models/SecondaryModel.php
@@ -12,7 +12,7 @@ class SecondaryModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'int';
 
 	protected $allowedFields = [
 		'key',

diff --git a/tests/_support/Models/SimpleEntity.php b/tests/_support/Models/SimpleEntity.php
@@ -15,7 +15,9 @@ class SimpleEntity extends Entity
 	protected $id;
 	protected $name;
 	protected $description;
+	protected $deleted;
 	protected $created_at;
+	protected $updated_at;
 
 	protected $_options = [
 		'datamap' => [],

diff --git a/tests/_support/Models/UserModel.php b/tests/_support/Models/UserModel.php
@@ -17,5 +17,11 @@ class UserModel extends Model
 
 	protected $useSoftDeletes = true;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'datetime';
+
+	public $name = '';
+
+	public $email = '';
+
+	public $country = '';
 }
diff --git a/tests/_support/Models/ValidErrorsModel.php b/tests/_support/Models/ValidErrorsModel.php
@@ -10,7 +10,7 @@ class ValidErrorsModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'int';
 
 	protected $allowedFields = [
 		'name',

diff --git a/tests/_support/Models/ValidModel.php b/tests/_support/Models/ValidModel.php
@@ -10,7 +10,7 @@ class ValidModel extends Model
 
 	protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'integer';
+	protected $dateFormat = 'int';
 
 	protected $allowedFields = [
 		'name',

diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
@@ -188,7 +188,7 @@ public function testUtilsCSVFromResult()
 
 		$data = array_filter(preg_split('/(\r\n|\n|\r)/', $data));
 
-		$this->assertEquals('"1","Developer","Awesome job, but sometimes makes you bored",""', $data[1]);
+		$this->assertEquals('"1","Developer","Awesome job, but sometimes makes you bored","0","",""', $data[1]);
 	}
 
 	//--------------------------------------------------------------------
@@ -203,7 +203,7 @@ public function testUtilsXMLFromResult()
 
 		$data = $util->getXMLFromResult($data);
 
-		$expected = '<root><element><id>4</id><name>Musician</name><description>Only Coldplay can actually called Musician</description><created_at></created_at></element></root>';
+		$expected = '<root><element><id>4</id><name>Musician</name><description>Only Coldplay can actually called Musician</description><deleted></deleted><created_at></created_at><updated_at></updated_at></element></root>';
 
 		$actual = preg_replace('#\R+#', '', $data);
 		$actual = preg_replace('/[ ]{2,}|[\t]/', '', $actual);

diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
@@ -70,7 +70,7 @@ public function testGetFieldCount()
 		                 ->get()
 		                 ->getFieldCount();
 
-		$this->assertEquals(4, $jobs);
+		$this->assertEquals(6, $jobs);
 	}
 
 	//--------------------------------------------------------------------