Skip to content

Commit 38a8658

Browse files
noplanmannoplanman
committed
Clean up Entity tests.
1 parent b1cc1f0 commit 38a8658

File tree

5 files changed

+91
-104
lines changed

5 files changed

+91
-104
lines changed

‎tests/unit/Entities/InlineKeyboardTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function testInlineKeyboardMultipleButtonsSingleRow()
9090
{
9191
$keyboard = (new InlineKeyboard([
9292
$this->getRandomButton('Button Text 1'),
93-
$this->getRandomButton('Button Text 2')
93+
$this->getRandomButton('Button Text 2'),
9494
]))->getProperty('inline_keyboard');
9595
self::assertSame('Button Text 1', $keyboard[0][0]->getText());
9696
self::assertSame('Button Text 2', $keyboard[0][1]->getText());
@@ -101,11 +101,11 @@ public function testInlineKeyboardMultipleButtonsMultipleRows()
101101
$keyboard = (new InlineKeyboard(
102102
[
103103
$this->getRandomButton('Button Text 1'),
104-
$this->getRandomButton('Button Text 2')
104+
$this->getRandomButton('Button Text 2'),
105105
],
106106
[
107107
$this->getRandomButton('Button Text 3'),
108-
$this->getRandomButton('Button Text 4')
108+
$this->getRandomButton('Button Text 4'),
109109
]
110110
))->getProperty('inline_keyboard');
111111

‎tests/unit/Entities/KeyboardTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
use Longman\TelegramBot\Entities\Keyboard;
1414
use Longman\TelegramBot\Entities\KeyboardButton;
15-
use Longman\TelegramBot\Exception\TelegramException;
1615

1716
/**
1817
* @package TelegramTest

‎tests/unit/Entities/ReplyToMessageTest.php‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace Longman\TelegramBot\Tests\Unit;
1212

13-
use \Longman\TelegramBot\Entities\Update;
13+
use Longman\TelegramBot\Entities\Update;
1414

1515
/**
1616
* @package TelegramTest
@@ -21,29 +21,16 @@
2121
*/
2222
class ReplyToMessageTest extends TestCase
2323
{
24-
/**
25-
* @var \Longman\TelegramBot\Entities\Message
26-
*/
27-
private $reply_to_message;
28-
29-
/**
30-
* @var \Longman\TelegramBot\Entities\Message
31-
*/
32-
private $message;
33-
3424
public function testChatType()
3525
{
3626
$json = '
3727
{"update_id":137809335,
3828
"message":{"message_id":4479,"from":{"id":123,"first_name":"John","username":"MJohn"},"chat":{"id":-123,"title":"MyChat","type":"group"},"date":1449092987,"reply_to_message":{"message_id":11,"from":{"id":121,"first_name":"Myname","username":"mybot"},"chat":{"id":-123,"title":"MyChat","type":"group"},"date":1449092984,"text":"type some text"},"text":"some text"}}
3929
';
40-
$struct = json_decode($json, true);
41-
$update = new Update($struct, 'mybot');
42-
43-
$this->message = $update->getMessage();
44-
$this->reply_to_message = $this->message->getReplyToMessage();
4530

46-
$this->assertNull($this->reply_to_message->getReplyToMessage());
31+
$update = new Update(json_decode($json, true), 'mybot');
32+
$reply_to_message = $update->getMessage()->getReplyToMessage();
4733

34+
self::assertNull($reply_to_message->getReplyToMessage());
4835
}
4936
}

‎tests/unit/Entities/ServerResponseTest.php‎

Lines changed: 81 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
namespace Longman\TelegramBot\Tests\Unit;
1414

1515
use Longman\TelegramBot\Entities\Message;
16-
use \Longman\TelegramBot\Entities\ServerResponse;
17-
use \Longman\TelegramBot\Request;
16+
use Longman\TelegramBot\Entities\ServerResponse;
17+
use Longman\TelegramBot\Request;
1818

1919
/**
2020
* @package TelegramTest
@@ -25,11 +25,6 @@
2525
*/
2626
class ServerResponseTest extends TestCase
2727
{
28-
/**
29-
* @var \Longman\TelegramBot\Entities\ServerResponse
30-
*/
31-
private $server;
32-
3328
public function sendMessageOk()
3429
{
3530
return '{
@@ -44,26 +39,27 @@ public function sendMessageOk()
4439
}';
4540
}
4641

47-
public function testSendMessageOk() {
48-
$result = $this->sendMessageOk();
49-
$this->server = new ServerResponse(json_decode($result, true), 'testbot');
50-
$server_result = $this->server->getResult();
42+
public function testSendMessageOk()
43+
{
44+
$result = $this->sendMessageOk();
45+
$server = new ServerResponse(json_decode($result, true), 'testbot');
46+
$server_result = $server->getResult();
5147

52-
$this->assertTrue($this->server->isOk());
53-
$this->assertNull($this->server->getErrorCode());
54-
$this->assertNull($this->server->getDescription());
55-
$this->assertInstanceOf('\Longman\TelegramBot\Entities\Message', $server_result);
48+
self::assertTrue($server->isOk());
49+
self::assertNull($server->getErrorCode());
50+
self::assertNull($server->getDescription());
51+
self::assertInstanceOf('\Longman\TelegramBot\Entities\Message', $server_result);
5652

5753
//Message
58-
$this->assertEquals('1234', $server_result->getMessageId());
59-
$this->assertEquals('123456789', $server_result->getFrom()->getId());
60-
$this->assertEquals('botname', $server_result->getFrom()->getFirstName());
61-
$this->assertEquals('namebot', $server_result->getFrom()->getUsername());
62-
$this->assertEquals('123456789', $server_result->getChat()->getId());
63-
$this->assertEquals('john', $server_result->getChat()->getFirstName());
64-
$this->assertEquals('Mjohn', $server_result->getChat()->getUsername());
65-
$this->assertEquals('1441378360', $server_result->getDate());
66-
$this->assertEquals('hello', $server_result->getText());
54+
self::assertEquals('1234', $server_result->getMessageId());
55+
self::assertEquals('123456789', $server_result->getFrom()->getId());
56+
self::assertEquals('botname', $server_result->getFrom()->getFirstName());
57+
self::assertEquals('namebot', $server_result->getFrom()->getUsername());
58+
self::assertEquals('123456789', $server_result->getChat()->getId());
59+
self::assertEquals('john', $server_result->getChat()->getFirstName());
60+
self::assertEquals('Mjohn', $server_result->getChat()->getUsername());
61+
self::assertEquals('1441378360', $server_result->getDate());
62+
self::assertEquals('hello', $server_result->getText());
6763
//... they are not finished...
6864

6965
}
@@ -77,29 +73,31 @@ public function sendMessageFail()
7773
}';
7874
}
7975

80-
public function testSendMessageFail() {
76+
public function testSendMessageFail()
77+
{
8178
$result = $this->sendMessageFail();
82-
$this->server = new ServerResponse(json_decode($result, true), 'testbot');
79+
$server = new ServerResponse(json_decode($result, true), 'testbot');
8380

84-
$this->assertFalse($this->server->isOk());
85-
$this->assertNull($this->server->getResult());
86-
$this->assertEquals('400', $this->server->getErrorCode());
87-
$this->assertEquals('Error: Bad Request: wrong chat id', $this->server->getDescription());
81+
self::assertFalse($server->isOk());
82+
self::assertNull($server->getResult());
83+
self::assertEquals('400', $server->getErrorCode());
84+
self::assertEquals('Error: Bad Request: wrong chat id', $server->getDescription());
8885
}
8986

90-
public function setWebhookOk()
87+
public function setWebhookOk()
9188
{
9289
return '{"ok":true,"result":true,"description":"Webhook was set"}';
9390
}
9491

95-
public function testSetWebhookOk() {
92+
public function testSetWebhookOk()
93+
{
9694
$result = $this->setWebhookOk();
97-
$this->server = new ServerResponse(json_decode($result, true), 'testbot');
95+
$server = new ServerResponse(json_decode($result, true), 'testbot');
9896

99-
$this->assertTrue($this->server->isOk());
100-
$this->assertTrue($this->server->getResult());
101-
$this->assertNull($this->server->getErrorCode());
102-
$this->assertEquals('Webhook was set', $this->server->getDescription());
97+
self::assertTrue($server->isOk());
98+
self::assertTrue($server->getResult());
99+
self::assertNull($server->getErrorCode());
100+
self::assertEquals('Webhook was set', $server->getDescription());
103101
}
104102

105103
public function setWebhookFail()
@@ -111,14 +109,15 @@ public function setWebhookFail()
111109
}';
112110
}
113111

114-
public function testSetWebhookFail() {
112+
public function testSetWebhookFail()
113+
{
115114
$result = $this->setWebhookFail();
116-
$this->server = new ServerResponse(json_decode($result, true), 'testbot');
115+
$server = new ServerResponse(json_decode($result, true), 'testbot');
117116

118-
$this->assertFalse($this->server->isOk());
119-
$this->assertNull($this->server->getResult());
120-
$this->assertEquals(400, $this->server->getErrorCode());
121-
$this->assertEquals("Error: Bad request: htttps://domain.host.org/dir/hook.php", $this->server->getDescription());
117+
self::assertFalse($server->isOk());
118+
self::assertNull($server->getResult());
119+
self::assertEquals(400, $server->getErrorCode());
120+
self::assertEquals('Error: Bad request: htttps://domain.host.org/dir/hook.php', $server->getDescription());
122121
}
123122

124123
public function getUpdatesArray()
@@ -170,24 +169,26 @@ public function getUpdatesArray()
170169
}';
171170
}
172171

173-
public function testGetUpdatesArray() {
172+
public function testGetUpdatesArray()
173+
{
174174
$result = $this->getUpdatesArray();
175-
$this->server = new ServerResponse(json_decode($result, true), 'testbot');
175+
$server = new ServerResponse(json_decode($result, true), 'testbot');
176176

177-
$this->assertCount(4, $this->server->getResult());
178-
$this->assertInstanceOf('\Longman\TelegramBot\Entities\Update', $this->server->getResult()[0]);
177+
self::assertCount(4, $server->getResult());
178+
self::assertInstanceOf('\Longman\TelegramBot\Entities\Update', $server->getResult()[0]);
179179
}
180180

181181
public function getUpdatesEmpty()
182182
{
183183
return '{"ok":true,"result":[]}';
184184
}
185185

186-
public function testGetUpdatesEmpty() {
186+
public function testGetUpdatesEmpty()
187+
{
187188
$result = $this->getUpdatesEmpty();
188-
$this->server = new ServerResponse(json_decode($result, true), 'testbot');
189+
$server = new ServerResponse(json_decode($result, true), 'testbot');
189190

190-
$this->assertEmpty($this->server->getResult());
191+
self::assertEmpty($server->getResult());
191192
}
192193

193194
public function getUserProfilePhotos()
@@ -219,20 +220,20 @@ public function getUserProfilePhotos()
219220

220221
public function testGetUserProfilePhotos()
221222
{
222-
$result = $this->getUserProfilePhotos();
223-
$this->server = new ServerResponse(json_decode($result, true), 'testbot');
224-
$server_result = $this->server->getResult();
223+
$result = $this->getUserProfilePhotos();
224+
$server = new ServerResponse(json_decode($result, true), 'testbot');
225+
$server_result = $server->getResult();
225226

226227
$photos = $server_result->getPhotos();
227228

228229
//Photo count
229-
$this->assertEquals(3, $server_result->getTotalCount());
230-
$this->assertCount(3, $photos);
230+
self::assertEquals(3, $server_result->getTotalCount());
231+
self::assertCount(3, $photos);
231232
//Photo size count
232-
$this->assertCount(3, $photos[0]);
233+
self::assertCount(3, $photos[0]);
233234

234-
$this->assertInstanceOf('\Longman\TelegramBot\Entities\UserProfilePhotos', $server_result);
235-
$this->assertInstanceOf('\Longman\TelegramBot\Entities\PhotoSize', $photos[0][0]);
235+
self::assertInstanceOf('\Longman\TelegramBot\Entities\UserProfilePhotos', $server_result);
236+
self::assertInstanceOf('\Longman\TelegramBot\Entities\PhotoSize', $photos[0][0]);
236237
}
237238

238239
public function getFile()
@@ -250,50 +251,50 @@ public function getFile()
250251
public function testGetFile()
251252
{
252253
$result = $this->getFile();
253-
$this->server = new ServerResponse(json_decode($result, true), 'testbot');
254+
$server = new ServerResponse(json_decode($result, true), 'testbot');
254255

255-
$this->assertInstanceOf('\Longman\TelegramBot\Entities\File', $this->server->getResult());
256+
self::assertInstanceOf('\Longman\TelegramBot\Entities\File', $server->getResult());
256257
}
257258

258259
public function testSetGeneralTestFakeResponse()
259260
{
260261
//setWebhook ok
261262
$fake_response = Request::generateGeneralFakeServerResponse();
262263

263-
$this->server = new ServerResponse($fake_response, 'testbot');
264+
$server = new ServerResponse($fake_response, 'testbot');
264265

265-
$this->assertTrue($this->server->isOk());
266-
$this->assertTrue($this->server->getResult());
267-
$this->assertNull($this->server->getErrorCode());
268-
$this->assertEquals('', $this->server->getDescription());
266+
self::assertTrue($server->isOk());
267+
self::assertTrue($server->getResult());
268+
self::assertNull($server->getErrorCode());
269+
self::assertEquals('', $server->getDescription());
269270

270271
//sendMessage ok
271272
$fake_response = Request::generateGeneralFakeServerResponse(['chat_id' => 123456789, 'text' => 'hello']);
272273

273-
$this->server = new ServerResponse($fake_response, 'testbot');
274+
$server = new ServerResponse($fake_response, 'testbot');
274275

275276
/** @var Message $server_result */
276-
$server_result = $this->server->getResult();
277+
$server_result = $server->getResult();
277278

278-
$this->assertTrue($this->server->isOk());
279-
$this->assertNull($this->server->getErrorCode());
280-
$this->assertNull($this->server->getDescription());
281-
$this->assertInstanceOf('\Longman\TelegramBot\Entities\Message', $server_result);
279+
self::assertTrue($server->isOk());
280+
self::assertNull($server->getErrorCode());
281+
self::assertNull($server->getDescription());
282+
self::assertInstanceOf('\Longman\TelegramBot\Entities\Message', $server_result);
282283

283284
//Message
284-
$this->assertEquals('1234', $server_result->getMessageId());
285-
$this->assertEquals('1441378360', $server_result->getDate());
286-
$this->assertEquals('hello', $server_result->getText());
285+
self::assertEquals('1234', $server_result->getMessageId());
286+
self::assertEquals('1441378360', $server_result->getDate());
287+
self::assertEquals('hello', $server_result->getText());
287288

288289
//Message //User
289-
$this->assertEquals('123456789', $server_result->getFrom()->getId());
290-
$this->assertEquals('botname', $server_result->getFrom()->getFirstName());
291-
$this->assertEquals('namebot', $server_result->getFrom()->getUsername());
290+
self::assertEquals('123456789', $server_result->getFrom()->getId());
291+
self::assertEquals('botname', $server_result->getFrom()->getFirstName());
292+
self::assertEquals('namebot', $server_result->getFrom()->getUsername());
292293

293294
//Message //Chat
294-
$this->assertEquals('123456789', $server_result->getChat()->getId());
295-
$this->assertEquals('', $server_result->getChat()->getFirstName());
296-
$this->assertEquals('', $server_result->getChat()->getUsername());
295+
self::assertEquals('123456789', $server_result->getChat()->getId());
296+
self::assertEquals('', $server_result->getChat()->getFirstName());
297+
self::assertEquals('', $server_result->getChat()->getUsername());
297298

298299
//... they are not finished...
299300
}

‎tests/unit/Entities/UpdateTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace Longman\TelegramBot\Tests\Unit;
1212

13-
use \Longman\TelegramBot\Entities\Update;
13+
use Longman\TelegramBot\Entities\Update;
1414

1515
/**
1616
* @package TelegramTest
@@ -23,14 +23,14 @@ class UpdateTest extends TestCase
2323
{
2424
public function testUpdateCast()
2525
{
26-
$json = '
26+
$json = '
2727
{"update_id":137809336,
2828
"message":{"message_id":4479,"from":{"id":123,"first_name":"John","username":"MJohn"},"chat":{"id":-123,"title":"MyChat","type":"group"},"date":1449092987,"reply_to_message":{"message_id":11,"from":{"id":121,"first_name":"Myname","username":"mybot"},"chat":{"id":-123,"title":"MyChat","type":"group"},"date":1449092984,"text":"type some text"},"text":"some text"}}
2929
';
3030
$struct = json_decode($json, true);
3131
$update = new Update($struct, 'mybot');
3232

3333
$array_string_after = json_decode($update->toJson(), true);
34-
$this->assertEquals($struct, $array_string_after);
34+
self::assertEquals($struct, $array_string_after);
3535
}
3636
}

0 commit comments

Comments
 (0)