From a81480d309cfea6a080982a5f4ffcdc3c97c0de2 Mon Sep 17 00:00:00 2001
From: Suralc <thesurwaveing@googlemail.com>
Date: Tue, 6 Aug 2013 19:56:05 +0200
Subject: [PATCH] Improved ValidatorTest organization.

---
 .../validators/models/FakedValidationModel.php     | 55 ++++++++++++++++++++++
 .../framework/validators/BooleanValidatorTest.php  |  3 +-
 .../framework/validators/CompareValidatorTest.php  |  2 +-
 .../framework/validators/DateValidatorTest.php     |  2 +-
 .../framework/validators/EmailValidatorTest.php    |  1 +
 .../framework/validators/FakedValidationModel.php  | 36 --------------
 .../framework/validators/NumberValidatorTest.php   |  1 +
 .../framework/validators/StringValidatorTest.php   |  1 +
 .../unit/framework/validators/UrlValidatorTest.php |  3 +-
 9 files changed, 62 insertions(+), 42 deletions(-)
 create mode 100644 tests/unit/data/validators/models/FakedValidationModel.php
 delete mode 100644 tests/unit/framework/validators/FakedValidationModel.php

diff --git a/tests/unit/data/validators/models/FakedValidationModel.php b/tests/unit/data/validators/models/FakedValidationModel.php
new file mode 100644
index 0000000..1e3366c
--- /dev/null
+++ b/tests/unit/data/validators/models/FakedValidationModel.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace yiiunit\data\validators\models;
+
+use yii\base\Model;
+
+/**
+ * @codeCoverageIgnore
+ */
+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) {
+			return isset($this->attr[$name]) ? $this->attr[$name] : null;
+		}
+
+		return parent::__get($name);
+	}
+
+	public function __set($name, $value)
+	{
+		if (stripos($name, 'attr') === 0) {
+			$this->attr[$name] = $value;
+		} else {
+			parent::__set($name, $value);
+		}
+	}
+
+	public function getAttributeLabel($attr)
+	{
+		return $attr;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/framework/validators/BooleanValidatorTest.php b/tests/unit/framework/validators/BooleanValidatorTest.php
index e3fa3e5..f37b39a 100644
--- a/tests/unit/framework/validators/BooleanValidatorTest.php
+++ b/tests/unit/framework/validators/BooleanValidatorTest.php
@@ -1,11 +1,10 @@
 <?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
  */
diff --git a/tests/unit/framework/validators/CompareValidatorTest.php b/tests/unit/framework/validators/CompareValidatorTest.php
index c91e7d6..7ae0263 100644
--- a/tests/unit/framework/validators/CompareValidatorTest.php
+++ b/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
diff --git a/tests/unit/framework/validators/DateValidatorTest.php b/tests/unit/framework/validators/DateValidatorTest.php
index 445d57d..30a515e 100644
--- a/tests/unit/framework/validators/DateValidatorTest.php
+++ b/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
 {
diff --git a/tests/unit/framework/validators/EmailValidatorTest.php b/tests/unit/framework/validators/EmailValidatorTest.php
index 2a0de82..5c5b47f 100644
--- a/tests/unit/framework/validators/EmailValidatorTest.php
+++ b/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;
 
 /**
diff --git a/tests/unit/framework/validators/FakedValidationModel.php b/tests/unit/framework/validators/FakedValidationModel.php
deleted file mode 100644
index f30735e..0000000
--- a/tests/unit/framework/validators/FakedValidationModel.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace yiiunit\framework\validators;
-
-use yii\base\Model;
-
-/**
- * @codeCoverageIgnore
- */
-class FakedValidationModel extends Model
-{
-	private $attr = array();
-
-	public function __get($name)
-	{
-		if (stripos($name, 'attr') === 0) {
-			return isset($this->attr[$name]) ? $this->attr[$name] : null;
-		}
-
-		return parent::__get($name);
-	}
-
-	public function __set($name, $value)
-	{
-		if (stripos($name, 'attr') === 0) {
-			$this->attr[$name] = $value;
-		} else {
-			parent::__set($name, $value);
-		}
-	}
-
-	public function getAttributeLabel($attr)
-	{
-		return $attr;
-	}
-}
\ No newline at end of file
diff --git a/tests/unit/framework/validators/NumberValidatorTest.php b/tests/unit/framework/validators/NumberValidatorTest.php
index 279b89e..4868503 100644
--- a/tests/unit/framework/validators/NumberValidatorTest.php
+++ b/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
diff --git a/tests/unit/framework/validators/StringValidatorTest.php b/tests/unit/framework/validators/StringValidatorTest.php
index e7c68bc..c7d2889 100644
--- a/tests/unit/framework/validators/StringValidatorTest.php
+++ b/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
diff --git a/tests/unit/framework/validators/UrlValidatorTest.php b/tests/unit/framework/validators/UrlValidatorTest.php
index f585590..7b618c1 100644
--- a/tests/unit/framework/validators/UrlValidatorTest.php
+++ b/tests/unit/framework/validators/UrlValidatorTest.php
@@ -1,10 +1,9 @@
 <?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
  */