From 32865c7ddcb1afdba70dac27c25bf6094b56c56c Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 15 Oct 2013 01:48:05 +0400
Subject: [PATCH] Updated FileValidator tests

---
 .../framework/validators/FileValidatorTest.php     | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/tests/unit/framework/validators/FileValidatorTest.php b/tests/unit/framework/validators/FileValidatorTest.php
index 4d74383..b6674bb 100644
--- a/tests/unit/framework/validators/FileValidatorTest.php
+++ b/tests/unit/framework/validators/FileValidatorTest.php
@@ -141,9 +141,21 @@ class FileValidatorTest extends TestCase
 			$error = isset($param['error']) ? $param['error'] : UPLOAD_ERR_OK;
 			if (count($params) == 1) {
 				$error = empty($param) ? UPLOAD_ERR_NO_FILE : $error;
-				return new UploadedFile($name, $tempName, $type, $size, $error);
+				return new UploadedFile(array(
+					'name' => $name,
+					'tempName' => $tempName,
+					'type' => $type,
+					'size' => $size,
+					'error' => $error
+				));
 			}
-			$files[] = new UploadedFile($name, $tempName, $type, $size, $error);
+			$files[] = new UploadedFile(array(
+				'name' => $name,
+				'tempName' => $tempName,
+				'type' => $type,
+				'size' => $size,
+				'error' => $error
+			));
 		}
 		return $files;
 	}
@@ -166,7 +178,7 @@ class FileValidatorTest extends TestCase
 		$this->assertTrue(
 			stripos(
 				current($m->getErrors('attr_files')),
-				str_ireplace(array('{file}', '{limit}'), array($m->attr_files->getName(), 128), $val->tooBig)
+				str_ireplace(array('{file}', '{limit}'), array($m->attr_files->name, 128), $val->tooBig)
 			) !== false
 		);
 		// to Small
@@ -177,7 +189,7 @@ class FileValidatorTest extends TestCase
 		$this->assertTrue(
 			stripos(
 				current($m->getErrors('attr_files')),
-				str_ireplace(array('{file}', '{limit}'), array($m->attr_files->getName(), 2048), $val->tooSmall)
+				str_ireplace(array('{file}', '{limit}'), array($m->attr_files->name, 2048), $val->tooSmall)
 			) !== false
 		);
 		// UPLOAD_ERR_INI_SIZE/UPLOAD_ERR_FORM_SIZE
@@ -190,7 +202,7 @@ class FileValidatorTest extends TestCase
 				current($m->getErrors('attr_err_ini')),
 				str_ireplace(
 					array('{file}', '{limit}'),
-					array($m->attr_err_ini->getName(), $val->getSizeLimit()),
+					array($m->attr_err_ini->name, $val->getSizeLimit()),
 					$val->tooBig
 				)
 			) !== false