From 522a4441f18985bb358fc88ed61c011f9c170afa Mon Sep 17 00:00:00 2001 From: Ilya Sigunov Date: Fri, 21 Oct 2011 13:22:29 +0400 Subject: [PATCH] format --- tests/form/FormFieldTest.php | 7 ++----- tests/form/FormTest.php | 38 +------------------------------------- 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/tests/form/FormFieldTest.php b/tests/form/FormFieldTest.php index 1327804..925658e 100644 --- a/tests/form/FormFieldTest.php +++ b/tests/form/FormFieldTest.php @@ -15,7 +15,6 @@ require_once dirname(__FILE__) . '/../../validator/NotEmptyValidator.php'; require_once dirname(__FILE__) . '/../../validator/EmailValidator.php'; require_once dirname(__FILE__) . '/../../form/FormField.php'; - class FormFieldTest extends PHPUnit_Framework_TestCase { public function setUp() @@ -105,7 +104,6 @@ class FormFieldTest extends PHPUnit_Framework_TestCase $tmp_form_field->addValidator($validator); } - public function testAddFilters() { $array = array('loginFilter' => new loginFilter(),'passwordFilter' => new passwordFilter()); @@ -146,7 +144,6 @@ class FormFieldTest extends PHPUnit_Framework_TestCase $tmp_form_field->addFilter($filter); } - public function testGetValueArray() { $form = new FormField(); @@ -241,7 +238,7 @@ interface iFilter public function getMessage(); } -Class loginFilter implements iFilter +class loginFilter implements iFilter { public function filter($value) { @@ -259,7 +256,7 @@ Class loginFilter implements iFilter } } -Class passwordFilter implements iFilter +class passwordFilter implements iFilter { public function filter($value) { diff --git a/tests/form/FormTest.php b/tests/form/FormTest.php index 50b0a14..f18f987 100644 --- a/tests/form/FormTest.php +++ b/tests/form/FormTest.php @@ -92,8 +92,7 @@ class FormTest extends PHPUnit_Framework_TestCase $this->assertSame(1, $form->isValid($fields)); $this->assertEquals($fields, $form->getValues()); } - - + public function testGetValueCorrect() { $form = new NotEmptyForm(); @@ -106,7 +105,6 @@ class FormTest extends PHPUnit_Framework_TestCase $this->assertEquals($fields['password'], $form->getValue('password')); } - public function testGetValueMissing() { $form = new NotEmptyForm(); @@ -118,7 +116,6 @@ class FormTest extends PHPUnit_Framework_TestCase $this->assertEquals('', $form->getValue('password')); } - public function testGetValueMissingFieldLogin() { $form = new NotEmptyForm(); @@ -130,7 +127,6 @@ class FormTest extends PHPUnit_Framework_TestCase $this->assertEquals('', $form->getValue('passwordw')); } - public function testGetValueMissingFieldPassword() { $form = new NotEmptyForm(); @@ -166,7 +162,6 @@ class FormTest extends PHPUnit_Framework_TestCase $this->assertEquals($form->getMessageType(), Form::ERROR); } - public function testGetMessageCorrect() { $form = new NotEmptyForm(); @@ -179,7 +174,6 @@ class FormTest extends PHPUnit_Framework_TestCase $this->assertEquals('message', $form->getMessage()); } - public function testGetMessageMissing() { $form = new NotEmptyForm(); @@ -191,7 +185,6 @@ class FormTest extends PHPUnit_Framework_TestCase $this->assertEquals('message', $form->getMessage()); } - public function testSetSuccessMessage() { $form = new NotEmptyForm(); @@ -233,33 +226,4 @@ class NotEmptyForm extends Form $validator->setMessage('Enter your password.'); $this->addField('password')->addValidator($validator); } -} - -class NullForm extends Form -{ - public function init() - { - /**/ - } -} - - - -class FooTest extends PHPUnit_Framework_TestCase -{ - /** - * @covers Foo::doSomethingPrivate - */ - public function testPrivateMethod() - { - $method = new ReflectionMethod( - 'Foo', 'doSomethingPrivate' - ); - - $method->setAccessible(TRUE); - - $this->assertEquals( - 'blah', $method->invoke(new Foo) - ); - } } \ No newline at end of file