From ae86ed191b225371020d055d69e481672efb8465 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Wed, 29 Nov 2017 14:57:07 +0200 Subject: [PATCH] Start using tox (Now without tests) --- dev_requirements.txt | 4 ++++ tests/test_message.py | 53 ++++++++++++++++++++----------------------- tests/utils.py | 2 -- tox.ini | 7 ++++++ 4 files changed, 36 insertions(+), 30 deletions(-) create mode 100644 dev_requirements.txt delete mode 100644 tests/utils.py create mode 100644 tox.ini diff --git a/dev_requirements.txt b/dev_requirements.txt new file mode 100644 index 00000000..58490257 --- /dev/null +++ b/dev_requirements.txt @@ -0,0 +1,4 @@ +-r requirements.txt +pytest +ujson +emoji diff --git a/tests/test_message.py b/tests/test_message.py index a3cec0ad..9f7df6e4 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -1,35 +1,32 @@ import datetime -import unittest from aiogram import types -from dataset import MESSAGE +from .dataset import MESSAGE + +message = types.Message(**MESSAGE) -class TestMessage(unittest.TestCase): - def setUp(self): - self.message = types.Message(**MESSAGE) - - def test_update_id(self): - self.assertEqual(self.message.message_id, MESSAGE['message_id'], 'test') - self.assertEqual(self.message['message_id'], MESSAGE['message_id']) - - def test_from(self): - self.assertIsInstance(self.message.from_user, types.User) - self.assertEqual(self.message.from_user, self.message['from']) - - def test_chat(self): - self.assertIsInstance(self.message.chat, types.Chat) - self.assertEqual(self.message.chat, self.message['chat']) - - def test_date(self): - self.assertIsInstance(self.message.date, datetime.datetime) - self.assertEqual(int(self.message.date.timestamp()), MESSAGE['date']) - self.assertEqual(self.message.date, self.message['date']) - - def test_text(self): - self.assertEqual(self.message.text, MESSAGE['text']) - self.assertEqual(self.message['text'], MESSAGE['text']) +def test_message_id(): + assert message.message_id == MESSAGE['message_id'] + assert message['message_id'] == MESSAGE['message_id'] -if __name__ == '__main__': - unittest.main() +def test_from(): + assert isinstance(message.from_user, types.User) + assert message.from_user == message['from'] + + +def test_chat(): + assert isinstance(message.chat, types.Chat) + assert message.chat == message['chat'] + + +def test_date(): + assert isinstance(message.date, datetime.datetime) + assert int(message.date.timestamp()) == MESSAGE['date'] + assert message.date == message['date'] + + +def test_text(): + assert message.text == MESSAGE['text'] + assert message['text'] == MESSAGE['text'] diff --git a/tests/utils.py b/tests/utils.py deleted file mode 100644 index f1141634..00000000 --- a/tests/utils.py +++ /dev/null @@ -1,2 +0,0 @@ -def out(*message, sep=' '): - print('Test', sep.join(message)) diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..1460b55c --- /dev/null +++ b/tox.ini @@ -0,0 +1,7 @@ +[tox] +envlist = py36 + +[testenv] +deps = -rdev_requirements.txt +commands = pytest +skip_install = true \ No newline at end of file