Improved ValidatorTest organization.

tests/unit/framework/validators/FakedValidationModel.php → tests/unit/data/validators/models/FakedValidationModel.php

 <?php
 
-namespace yiiunit\framework\validators;
+namespace yiiunit\data\validators\models;
 
 use yii\base\Model;
 
@@ -11,6 +11,25 @@ class FakedValidationModel extends Model
 {
 	private $attr = array();
 
+	public $val_attr_a;
+	public $val_attr_b;
+	public $val_attr_c;
+	public $val_attr_d;
+
+
+	public function rules()
+	{
+		return array(
+			array('val_attr_a, val_attr_b', 'required', 'on' => 'reqTest'),
+			array('val_attr_c', 'integer'),
+		);
+	}
+
+	public function inlineVal($attribute, $params = array())
+	{
+		return true;
+	}
+
 	public function __get($name)
 	{
 		if (stripos($name, 'attr') === 0) {

tests/unit/framework/validators/BooleanValidatorTest.php

 <?php
 namespace yiiunit\framework\validators;
 
-use yiiunit\framework\validators\FakedValidationModel;
+use yiiunit\data\validators\models\FakedValidationModel;
 use yii\validators\BooleanValidator;
 use yiiunit\TestCase;
 
-require_once __DIR__ . '/FakedValidationModel.php';
 /**
  * BooleanValidatorTest
  */

tests/unit/framework/validators/CompareValidatorTest.php

@@ -3,9 +3,9 @@ namespace yiiunit\framework\validators;
 
 use yii\base\InvalidConfigException;
 use yii\validators\CompareValidator;
+use yiiunit\data\validators\models\FakedValidationModel;
 use yiiunit\TestCase;
 
-require_once __DIR__ . '/FakedValidationModel.php';
 
 
 class CompareValidatorTest extends TestCase

tests/unit/framework/validators/DateValidatorTest.php

@@ -4,9 +4,9 @@ namespace yiiunit\framework\validators;
 
 use DateTime;
 use yii\validators\DateValidator;
+use yiiunit\data\validators\models\FakedValidationModel;
 use yiiunit\TestCase;
 
-require_once __DIR__ . '/FakedValidationModel.php';
 
 class DateValidatorTest extends TestCase
 {

tests/unit/framework/validators/EmailValidatorTest.php

@@ -2,6 +2,7 @@
 namespace yiiunit\framework\validators;
 
 use yii\validators\EmailValidator;
+use yiiunit\data\validators\models\FakedValidationModel;
 use yiiunit\TestCase;
 
 /**

tests/unit/framework/validators/NumberValidatorTest.php

@@ -4,6 +4,7 @@ namespace yiiunit\framework\validators;
 
 
 use yii\validators\NumberValidator;
+use yiiunit\data\validators\models\FakedValidationModel;
 use yiiunit\TestCase;
 
 class NumberValidatorTest extends TestCase

tests/unit/framework/validators/StringValidatorTest.php

@@ -4,6 +4,7 @@ namespace yiiunit\framework\validators;
 
 
 use yii\validators\StringValidator;
+use yiiunit\data\validators\models\FakedValidationModel;
 use yiiunit\TestCase;
 
 class StringValidatorTest extends TestCase

tests/unit/framework/validators/UrlValidatorTest.php

 <?php
 namespace yiiunit\framework\validators;
-use yiiunit\framework\validators\FakedValidationModel;
+use yiiunit\data\validators\models\FakedValidationModel;
 use yii\validators\UrlValidator;
 use yiiunit\TestCase;
 
-require_once __DIR__ . '/FakedValidationModel.php';
 /**
  * UrlValidatorTest
  */