From b339b9815b764770de21a7c5d149d4e69e8fd55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=93=D1=83=D1=81=D0=B5=D0=B2?= Date: Mon, 29 Jun 2015 22:30:51 +0300 Subject: [PATCH] Tests for User type + Refactoring --- .gitignore | 2 + src/Types/User.php | 20 ++++---- tests/UserTest.php | 112 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 10 deletions(-) create mode 100644 tests/UserTest.php diff --git a/.gitignore b/.gitignore index 78ed36d1..34de0587 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,5 @@ crashlytics-build.properties # Composer vendor/ + +/*.php \ No newline at end of file diff --git a/src/Types/User.php b/src/Types/User.php index 4edecc6b..c39f7ee8 100644 --- a/src/Types/User.php +++ b/src/Types/User.php @@ -33,14 +33,14 @@ class User extends BaseType implements TypeInterface * * @var string */ - protected $first_name; + protected $firstName; /** * Optional. User‘s or bot’s last name * * @var string */ - protected $last_name; + protected $lastName; /** * Optional. User‘s or bot’s username @@ -54,15 +54,15 @@ class User extends BaseType implements TypeInterface */ public function getFirstName() { - return $this->first_name; + return $this->firstName; } /** - * @param string $first_name + * @param string $firstName */ - public function setFirstName($first_name) + public function setFirstName($firstName) { - $this->first_name = $first_name; + $this->firstName = $firstName; } /** @@ -90,15 +90,15 @@ public function setId($id) */ public function getLastName() { - return $this->last_name; + return $this->lastName; } /** - * @param string $last_name + * @param string $lastName */ - public function setLastName($last_name) + public function setLastName($lastName) { - $this->last_name = $last_name; + $this->lastName = $lastName; } /** diff --git a/tests/UserTest.php b/tests/UserTest.php new file mode 100644 index 00000000..0df938f7 --- /dev/null +++ b/tests/UserTest.php @@ -0,0 +1,112 @@ +setId(1); + $this->assertAttributeEquals(1, 'id', $item); + } + + public function testGetDuration() + { + $item = new User(); + $item->setId(1); + $this->assertEquals(1, $item->getId()); + } + + public function testSetFirstName() + { + $item = new User(); + $item->setFirstName('Ilya'); + $this->assertAttributeEquals('Ilya', 'firstName', $item); + } + + public function testGetFirstName() + { + $item = new User(); + $item->setFirstName('Ilya'); + $this->assertEquals('Ilya', $item->getFirstName()); + } + + public function testSetLastName() + { + $item = new User(); + $item->setLastName('Gusev'); + $this->assertAttributeEquals('Gusev', 'lastName', $item); + } + + public function testGetLastName() + { + $item = new User(); + $item->setLastName('Gusev'); + $this->assertEquals('Gusev', $item->getLastName()); + } + + public function testSetUsername() + { + $item = new User(); + $item->setUsername('iGusev'); + $this->assertAttributeEquals('iGusev', 'username', $item); + } + + public function testGetUsername() + { + $item = new User(); + $item->setUsername('iGusev'); + $this->assertEquals('iGusev', $item->getUsername()); + } + + /** + * @expectedException \TelegramBot\Api\InvalidArgumentException + */ + public function testSetIdException() + { + $item = new User(); + $item->setId('s'); + } + + public function testFromResponse() + { + $user = User::fromResponse(array( + 'first_name' => 'Ilya', + 'last_name' => 'Gusev', + 'id' => 123456, + 'username' => 'iGusev' + )); + $this->assertInstanceOf('\TelegramBot\Api\Types\User', $user); + $this->assertEquals(123456, $user->getId()); + $this->assertEquals('Ilya', $user->getFirstName()); + $this->assertEquals('Gusev', $user->getLastName()); + $this->assertEquals('iGusev', $user->getUsername()); + } + + /** + * @expectedException \TelegramBot\Api\InvalidArgumentException + */ + public function testFromResponseException1() + { + $user = User::fromResponse(array( + 'last_name' => 'Gusev', + 'id' => 123456, + 'username' => 'iGusev' + )); + } + /** + * @expectedException \TelegramBot\Api\InvalidArgumentException + */ + public function testFromResponseException2() + { + $user = User::fromResponse(array( + 'first_name' => 'Ilya', + 'last_name' => 'Gusev', + 'username' => 'iGusev' + )); + } + +}