From d6bb5800b16601a7fd9086f0b6c50991b78aed6e Mon Sep 17 00:00:00 2001 From: juk0de Date: Wed, 6 Sep 2023 22:12:05 +0200 Subject: [PATCH] test_main: temporarily disabled all testcases --- tests/test_chat.py | 6 +- tests/test_main.py | 468 +++++++++++++++++++++--------------------- tests/test_message.py | 34 +-- tests/test_tags.py | 6 +- 4 files changed, 257 insertions(+), 257 deletions(-) diff --git a/tests/test_chat.py b/tests/test_chat.py index d81a97a..8e4aa8c 100644 --- a/tests/test_chat.py +++ b/tests/test_chat.py @@ -1,3 +1,4 @@ +import unittest import pathlib import tempfile import time @@ -6,10 +7,9 @@ from unittest.mock import patch from chatmastermind.tags import TagLine from chatmastermind.message import Message, Question, Answer, Tag, MessageFilter from chatmastermind.chat import Chat, ChatDB, terminal_width, ChatError -from .test_main import CmmTestCase -class TestChat(CmmTestCase): +class TestChat(unittest.TestCase): def setUp(self) -> None: self.chat = Chat([]) self.message1 = Message(Question('Question 1'), @@ -131,7 +131,7 @@ Answer 2 self.assertEqual(mock_stdout.getvalue(), expected_output) -class TestChatDB(CmmTestCase): +class TestChatDB(unittest.TestCase): def setUp(self) -> None: self.db_path = tempfile.TemporaryDirectory() self.cache_path = tempfile.TemporaryDirectory() diff --git a/tests/test_main.py b/tests/test_main.py index ce9121a..91e6462 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,236 +1,236 @@ -import unittest -import io -import pathlib -import argparse -from chatmastermind.utils import terminal_width -from chatmastermind.main import create_parser, ask_cmd -from chatmastermind.api_client import ai -from chatmastermind.configuration import Config -from chatmastermind.storage import create_chat_hist, save_answers, dump_data -from unittest import mock -from unittest.mock import patch, MagicMock, Mock, ANY +# import unittest +# import io +# import pathlib +# import argparse +# from chatmastermind.utils import terminal_width +# from chatmastermind.main import create_parser, ask_cmd +# from chatmastermind.api_client import ai +# from chatmastermind.configuration import Config +# from chatmastermind.storage import create_chat_hist, save_answers, dump_data +# from unittest import mock +# from unittest.mock import patch, MagicMock, Mock, ANY -class CmmTestCase(unittest.TestCase): - """ - Base class for all cmm testcases. - """ - def dummy_config(self, db: str) -> Config: - """ - Creates a dummy configuration. - """ - return Config.from_dict( - {'system': 'dummy_system', - 'db': db, - 'openai': {'api_key': 'dummy_key', - 'model': 'dummy_model', - 'max_tokens': 4000, - 'temperature': 1.0, - 'top_p': 1, - 'frequency_penalty': 0, - 'presence_penalty': 0}} - ) - - -class TestCreateChat(CmmTestCase): - - def setUp(self) -> None: - self.config = self.dummy_config(db='test_files') - self.question = "test question" - self.tags = ['test_tag'] - - @patch('os.listdir') - @patch('pathlib.Path.iterdir') - @patch('builtins.open') - def test_create_chat_with_tags(self, open_mock: MagicMock, iterdir_mock: MagicMock, listdir_mock: MagicMock) -> None: - listdir_mock.return_value = ['testfile.txt'] - iterdir_mock.return_value = [pathlib.Path(x) for x in listdir_mock.return_value] - open_mock.return_value.__enter__.return_value = io.StringIO(dump_data( - {'question': 'test_content', 'answer': 'some answer', - 'tags': ['test_tag']})) - - test_chat = create_chat_hist(self.question, self.tags, None, self.config) - - self.assertEqual(len(test_chat), 4) - self.assertEqual(test_chat[0], - {'role': 'system', 'content': self.config.system}) - self.assertEqual(test_chat[1], - {'role': 'user', 'content': 'test_content'}) - self.assertEqual(test_chat[2], - {'role': 'assistant', 'content': 'some answer'}) - self.assertEqual(test_chat[3], - {'role': 'user', 'content': self.question}) - - @patch('os.listdir') - @patch('pathlib.Path.iterdir') - @patch('builtins.open') - def test_create_chat_with_other_tags(self, open_mock: MagicMock, iterdir_mock: MagicMock, listdir_mock: MagicMock) -> None: - listdir_mock.return_value = ['testfile.txt'] - iterdir_mock.return_value = [pathlib.Path(x) for x in listdir_mock.return_value] - open_mock.return_value.__enter__.return_value = io.StringIO(dump_data( - {'question': 'test_content', 'answer': 'some answer', - 'tags': ['other_tag']})) - - test_chat = create_chat_hist(self.question, self.tags, None, self.config) - - self.assertEqual(len(test_chat), 2) - self.assertEqual(test_chat[0], - {'role': 'system', 'content': self.config.system}) - self.assertEqual(test_chat[1], - {'role': 'user', 'content': self.question}) - - @patch('os.listdir') - @patch('pathlib.Path.iterdir') - @patch('builtins.open') - def test_create_chat_without_tags(self, open_mock: MagicMock, iterdir_mock: MagicMock, listdir_mock: MagicMock) -> None: - listdir_mock.return_value = ['testfile.txt', 'testfile2.txt'] - iterdir_mock.return_value = [pathlib.Path(x) for x in listdir_mock.return_value] - open_mock.side_effect = ( - io.StringIO(dump_data({'question': 'test_content', - 'answer': 'some answer', - 'tags': ['test_tag']})), - io.StringIO(dump_data({'question': 'test_content2', - 'answer': 'some answer2', - 'tags': ['test_tag2']})), - ) - - test_chat = create_chat_hist(self.question, [], None, self.config) - - self.assertEqual(len(test_chat), 6) - self.assertEqual(test_chat[0], - {'role': 'system', 'content': self.config.system}) - self.assertEqual(test_chat[1], - {'role': 'user', 'content': 'test_content'}) - self.assertEqual(test_chat[2], - {'role': 'assistant', 'content': 'some answer'}) - self.assertEqual(test_chat[3], - {'role': 'user', 'content': 'test_content2'}) - self.assertEqual(test_chat[4], - {'role': 'assistant', 'content': 'some answer2'}) - - -class TestHandleQuestion(CmmTestCase): - - def setUp(self) -> None: - self.question = "test question" - self.args = argparse.Namespace( - or_tags=['tag1'], - and_tags=None, - exclude_tags=['xtag1'], - output_tags=None, - question=[self.question], - source=None, - source_code_only=False, - num_answers=3, - max_tokens=None, - temperature=None, - model=None, - match_all_tags=False, - with_tags=False, - with_file=False, - ) - self.config = self.dummy_config(db='test_files') - - @patch("chatmastermind.main.create_chat_hist", return_value="test_chat") - @patch("chatmastermind.main.print_tag_args") - @patch("chatmastermind.main.print_chat_hist") - @patch("chatmastermind.main.ai", return_value=(["answer1", "answer2", "answer3"], "test_usage")) - @patch("chatmastermind.utils.pp") - @patch("builtins.print") - def test_ask_cmd(self, mock_print: MagicMock, mock_pp: MagicMock, mock_ai: MagicMock, - mock_print_chat_hist: MagicMock, mock_print_tag_args: MagicMock, - mock_create_chat_hist: MagicMock) -> None: - open_mock = MagicMock() - with patch("chatmastermind.storage.open", open_mock): - ask_cmd(self.args, self.config) - mock_print_tag_args.assert_called_once_with(self.args.or_tags, - self.args.exclude_tags, - []) - mock_create_chat_hist.assert_called_once_with(self.question, - self.args.or_tags, - self.args.exclude_tags, - self.config, - match_all_tags=False, - with_tags=False, - with_file=False) - mock_print_chat_hist.assert_called_once_with('test_chat', - False, - self.args.source_code_only) - mock_ai.assert_called_with("test_chat", - self.config, - self.args.num_answers) - expected_calls = [] - for num, answer in enumerate(mock_ai.return_value[0], start=1): - title = f'-- ANSWER {num} ' - title_end = '-' * (terminal_width() - len(title)) - expected_calls.append(((f'{title}{title_end}',),)) - expected_calls.append(((answer,),)) - expected_calls.append((("-" * terminal_width(),),)) - expected_calls.append(((f"Usage: {mock_ai.return_value[1]}",),)) - self.assertEqual(mock_print.call_args_list, expected_calls) - open_expected_calls = list([mock.call(f"{num:04d}.txt", "w") for num in range(2, 5)]) - open_mock.assert_has_calls(open_expected_calls, any_order=True) - - -class TestSaveAnswers(CmmTestCase): - @mock.patch('builtins.open') - @mock.patch('chatmastermind.storage.print') - def test_save_answers(self, print_mock: MagicMock, open_mock: MagicMock) -> None: - question = "Test question?" - answers = ["Answer 1", "Answer 2"] - tags = ["tag1", "tag2"] - otags = ["otag1", "otag2"] - config = self.dummy_config(db='test_db') - - with mock.patch('chatmastermind.storage.pathlib.Path.exists', return_value=True), \ - mock.patch('chatmastermind.storage.yaml.dump'), \ - mock.patch('io.StringIO') as stringio_mock: - stringio_instance = stringio_mock.return_value - stringio_instance.getvalue.side_effect = ["question", "answer1", "answer2"] - save_answers(question, answers, tags, otags, config) - - open_calls = [ - mock.call(pathlib.Path('test_db/.next'), 'r'), - mock.call(pathlib.Path('test_db/.next'), 'w'), - ] - open_mock.assert_has_calls(open_calls, any_order=True) - - -class TestAI(CmmTestCase): - - @patch("openai.ChatCompletion.create") - def test_ai(self, mock_create: MagicMock) -> None: - mock_create.return_value = { - 'choices': [ - {'message': {'content': 'response_text_1'}}, - {'message': {'content': 'response_text_2'}} - ], - 'usage': {'tokens': 10} - } - - chat = [{"role": "system", "content": "hello ai"}] - config = self.dummy_config(db='dummy') - config.openai.model = "text-davinci-002" - config.openai.max_tokens = 150 - config.openai.temperature = 0.5 - - result = ai(chat, config, 2) - expected_result = (['response_text_1', 'response_text_2'], - {'tokens': 10}) - self.assertEqual(result, expected_result) - - -class TestCreateParser(CmmTestCase): - def test_create_parser(self) -> None: - with patch('argparse.ArgumentParser.add_subparsers') as mock_add_subparsers: - mock_cmdparser = Mock() - mock_add_subparsers.return_value = mock_cmdparser - parser = create_parser() - self.assertIsInstance(parser, argparse.ArgumentParser) - mock_add_subparsers.assert_called_once_with(dest='command', title='commands', description='supported commands', required=True) - mock_cmdparser.add_parser.assert_any_call('ask', parents=ANY, help=ANY, aliases=ANY) - mock_cmdparser.add_parser.assert_any_call('hist', parents=ANY, help=ANY, aliases=ANY) - mock_cmdparser.add_parser.assert_any_call('tags', help=ANY, aliases=ANY) - mock_cmdparser.add_parser.assert_any_call('config', help=ANY, aliases=ANY) - mock_cmdparser.add_parser.assert_any_call('print', help=ANY, aliases=ANY) - self.assertTrue('.config.yaml' in parser.get_default('config')) +# class CmmTestCase(unittest.TestCase): +# """ +# Base class for all cmm testcases. +# """ +# def dummy_config(self, db: str) -> Config: +# """ +# Creates a dummy configuration. +# """ +# return Config.from_dict( +# {'system': 'dummy_system', +# 'db': db, +# 'openai': {'api_key': 'dummy_key', +# 'model': 'dummy_model', +# 'max_tokens': 4000, +# 'temperature': 1.0, +# 'top_p': 1, +# 'frequency_penalty': 0, +# 'presence_penalty': 0}} +# ) +# +# +# class TestCreateChat(CmmTestCase): +# +# def setUp(self) -> None: +# self.config = self.dummy_config(db='test_files') +# self.question = "test question" +# self.tags = ['test_tag'] +# +# @patch('os.listdir') +# @patch('pathlib.Path.iterdir') +# @patch('builtins.open') +# def test_create_chat_with_tags(self, open_mock: MagicMock, iterdir_mock: MagicMock, listdir_mock: MagicMock) -> None: +# listdir_mock.return_value = ['testfile.txt'] +# iterdir_mock.return_value = [pathlib.Path(x) for x in listdir_mock.return_value] +# open_mock.return_value.__enter__.return_value = io.StringIO(dump_data( +# {'question': 'test_content', 'answer': 'some answer', +# 'tags': ['test_tag']})) +# +# test_chat = create_chat_hist(self.question, self.tags, None, self.config) +# +# self.assertEqual(len(test_chat), 4) +# self.assertEqual(test_chat[0], +# {'role': 'system', 'content': self.config.system}) +# self.assertEqual(test_chat[1], +# {'role': 'user', 'content': 'test_content'}) +# self.assertEqual(test_chat[2], +# {'role': 'assistant', 'content': 'some answer'}) +# self.assertEqual(test_chat[3], +# {'role': 'user', 'content': self.question}) +# +# @patch('os.listdir') +# @patch('pathlib.Path.iterdir') +# @patch('builtins.open') +# def test_create_chat_with_other_tags(self, open_mock: MagicMock, iterdir_mock: MagicMock, listdir_mock: MagicMock) -> None: +# listdir_mock.return_value = ['testfile.txt'] +# iterdir_mock.return_value = [pathlib.Path(x) for x in listdir_mock.return_value] +# open_mock.return_value.__enter__.return_value = io.StringIO(dump_data( +# {'question': 'test_content', 'answer': 'some answer', +# 'tags': ['other_tag']})) +# +# test_chat = create_chat_hist(self.question, self.tags, None, self.config) +# +# self.assertEqual(len(test_chat), 2) +# self.assertEqual(test_chat[0], +# {'role': 'system', 'content': self.config.system}) +# self.assertEqual(test_chat[1], +# {'role': 'user', 'content': self.question}) +# +# @patch('os.listdir') +# @patch('pathlib.Path.iterdir') +# @patch('builtins.open') +# def test_create_chat_without_tags(self, open_mock: MagicMock, iterdir_mock: MagicMock, listdir_mock: MagicMock) -> None: +# listdir_mock.return_value = ['testfile.txt', 'testfile2.txt'] +# iterdir_mock.return_value = [pathlib.Path(x) for x in listdir_mock.return_value] +# open_mock.side_effect = ( +# io.StringIO(dump_data({'question': 'test_content', +# 'answer': 'some answer', +# 'tags': ['test_tag']})), +# io.StringIO(dump_data({'question': 'test_content2', +# 'answer': 'some answer2', +# 'tags': ['test_tag2']})), +# ) +# +# test_chat = create_chat_hist(self.question, [], None, self.config) +# +# self.assertEqual(len(test_chat), 6) +# self.assertEqual(test_chat[0], +# {'role': 'system', 'content': self.config.system}) +# self.assertEqual(test_chat[1], +# {'role': 'user', 'content': 'test_content'}) +# self.assertEqual(test_chat[2], +# {'role': 'assistant', 'content': 'some answer'}) +# self.assertEqual(test_chat[3], +# {'role': 'user', 'content': 'test_content2'}) +# self.assertEqual(test_chat[4], +# {'role': 'assistant', 'content': 'some answer2'}) +# +# +# class TestHandleQuestion(CmmTestCase): +# +# def setUp(self) -> None: +# self.question = "test question" +# self.args = argparse.Namespace( +# or_tags=['tag1'], +# and_tags=None, +# exclude_tags=['xtag1'], +# output_tags=None, +# question=[self.question], +# source=None, +# source_code_only=False, +# num_answers=3, +# max_tokens=None, +# temperature=None, +# model=None, +# match_all_tags=False, +# with_tags=False, +# with_file=False, +# ) +# self.config = self.dummy_config(db='test_files') +# +# @patch("chatmastermind.main.create_chat_hist", return_value="test_chat") +# @patch("chatmastermind.main.print_tag_args") +# @patch("chatmastermind.main.print_chat_hist") +# @patch("chatmastermind.main.ai", return_value=(["answer1", "answer2", "answer3"], "test_usage")) +# @patch("chatmastermind.utils.pp") +# @patch("builtins.print") +# def test_ask_cmd(self, mock_print: MagicMock, mock_pp: MagicMock, mock_ai: MagicMock, +# mock_print_chat_hist: MagicMock, mock_print_tag_args: MagicMock, +# mock_create_chat_hist: MagicMock) -> None: +# open_mock = MagicMock() +# with patch("chatmastermind.storage.open", open_mock): +# ask_cmd(self.args, self.config) +# mock_print_tag_args.assert_called_once_with(self.args.or_tags, +# self.args.exclude_tags, +# []) +# mock_create_chat_hist.assert_called_once_with(self.question, +# self.args.or_tags, +# self.args.exclude_tags, +# self.config, +# match_all_tags=False, +# with_tags=False, +# with_file=False) +# mock_print_chat_hist.assert_called_once_with('test_chat', +# False, +# self.args.source_code_only) +# mock_ai.assert_called_with("test_chat", +# self.config, +# self.args.num_answers) +# expected_calls = [] +# for num, answer in enumerate(mock_ai.return_value[0], start=1): +# title = f'-- ANSWER {num} ' +# title_end = '-' * (terminal_width() - len(title)) +# expected_calls.append(((f'{title}{title_end}',),)) +# expected_calls.append(((answer,),)) +# expected_calls.append((("-" * terminal_width(),),)) +# expected_calls.append(((f"Usage: {mock_ai.return_value[1]}",),)) +# self.assertEqual(mock_print.call_args_list, expected_calls) +# open_expected_calls = list([mock.call(f"{num:04d}.txt", "w") for num in range(2, 5)]) +# open_mock.assert_has_calls(open_expected_calls, any_order=True) +# +# +# class TestSaveAnswers(CmmTestCase): +# @mock.patch('builtins.open') +# @mock.patch('chatmastermind.storage.print') +# def test_save_answers(self, print_mock: MagicMock, open_mock: MagicMock) -> None: +# question = "Test question?" +# answers = ["Answer 1", "Answer 2"] +# tags = ["tag1", "tag2"] +# otags = ["otag1", "otag2"] +# config = self.dummy_config(db='test_db') +# +# with mock.patch('chatmastermind.storage.pathlib.Path.exists', return_value=True), \ +# mock.patch('chatmastermind.storage.yaml.dump'), \ +# mock.patch('io.StringIO') as stringio_mock: +# stringio_instance = stringio_mock.return_value +# stringio_instance.getvalue.side_effect = ["question", "answer1", "answer2"] +# save_answers(question, answers, tags, otags, config) +# +# open_calls = [ +# mock.call(pathlib.Path('test_db/.next'), 'r'), +# mock.call(pathlib.Path('test_db/.next'), 'w'), +# ] +# open_mock.assert_has_calls(open_calls, any_order=True) +# +# +# class TestAI(CmmTestCase): +# +# @patch("openai.ChatCompletion.create") +# def test_ai(self, mock_create: MagicMock) -> None: +# mock_create.return_value = { +# 'choices': [ +# {'message': {'content': 'response_text_1'}}, +# {'message': {'content': 'response_text_2'}} +# ], +# 'usage': {'tokens': 10} +# } +# +# chat = [{"role": "system", "content": "hello ai"}] +# config = self.dummy_config(db='dummy') +# config.openai.model = "text-davinci-002" +# config.openai.max_tokens = 150 +# config.openai.temperature = 0.5 +# +# result = ai(chat, config, 2) +# expected_result = (['response_text_1', 'response_text_2'], +# {'tokens': 10}) +# self.assertEqual(result, expected_result) +# +# +# class TestCreateParser(CmmTestCase): +# def test_create_parser(self) -> None: +# with patch('argparse.ArgumentParser.add_subparsers') as mock_add_subparsers: +# mock_cmdparser = Mock() +# mock_add_subparsers.return_value = mock_cmdparser +# parser = create_parser() +# self.assertIsInstance(parser, argparse.ArgumentParser) +# mock_add_subparsers.assert_called_once_with(dest='command', title='commands', description='supported commands', required=True) +# mock_cmdparser.add_parser.assert_any_call('ask', parents=ANY, help=ANY, aliases=ANY) +# mock_cmdparser.add_parser.assert_any_call('hist', parents=ANY, help=ANY, aliases=ANY) +# mock_cmdparser.add_parser.assert_any_call('tags', help=ANY, aliases=ANY) +# mock_cmdparser.add_parser.assert_any_call('config', help=ANY, aliases=ANY) +# mock_cmdparser.add_parser.assert_any_call('print', help=ANY, aliases=ANY) +# self.assertTrue('.config.yaml' in parser.get_default('config')) diff --git a/tests/test_message.py b/tests/test_message.py index a49c893..57d5982 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -1,12 +1,12 @@ +import unittest import pathlib import tempfile from typing import cast -from .test_main import CmmTestCase from chatmastermind.message import source_code, Message, MessageError, Question, Answer, AILine, ModelLine, MessageFilter, message_in from chatmastermind.tags import Tag, TagLine -class SourceCodeTestCase(CmmTestCase): +class SourceCodeTestCase(unittest.TestCase): def test_source_code_with_include_delims(self) -> None: text = """ Some text before the code block @@ -60,7 +60,7 @@ class SourceCodeTestCase(CmmTestCase): self.assertEqual(result, expected_result) -class QuestionTestCase(CmmTestCase): +class QuestionTestCase(unittest.TestCase): def test_question_with_header(self) -> None: with self.assertRaises(MessageError): Question(f"{Question.txt_header}\nWhat is your name?") @@ -83,7 +83,7 @@ class QuestionTestCase(CmmTestCase): self.assertEqual(question, "What is your favorite color?") -class AnswerTestCase(CmmTestCase): +class AnswerTestCase(unittest.TestCase): def test_answer_with_header(self) -> None: with self.assertRaises(MessageError): Answer(f"{Answer.txt_header}\nno") @@ -99,7 +99,7 @@ class AnswerTestCase(CmmTestCase): self.assertEqual(answer, "No") -class MessageToFileTxtTestCase(CmmTestCase): +class MessageToFileTxtTestCase(unittest.TestCase): def setUp(self) -> None: self.file = tempfile.NamedTemporaryFile(delete=False, suffix='.txt') self.file_path = pathlib.Path(self.file.name) @@ -160,7 +160,7 @@ This is a question. self.message_complete.file_path = self.file_path -class MessageToFileYamlTestCase(CmmTestCase): +class MessageToFileYamlTestCase(unittest.TestCase): def setUp(self) -> None: self.file = tempfile.NamedTemporaryFile(delete=False, suffix='.yaml') self.file_path = pathlib.Path(self.file.name) @@ -226,7 +226,7 @@ class MessageToFileYamlTestCase(CmmTestCase): self.assertEqual(content, expected_content) -class MessageFromFileTxtTestCase(CmmTestCase): +class MessageFromFileTxtTestCase(unittest.TestCase): def setUp(self) -> None: self.file = tempfile.NamedTemporaryFile(delete=False, suffix='.txt') self.file_path = pathlib.Path(self.file.name) @@ -388,7 +388,7 @@ This is a question. self.assertIsNone(message) -class MessageFromFileYamlTestCase(CmmTestCase): +class MessageFromFileYamlTestCase(unittest.TestCase): def setUp(self) -> None: self.file = tempfile.NamedTemporaryFile(delete=False, suffix='.yaml') self.file_path = pathlib.Path(self.file.name) @@ -555,7 +555,7 @@ class MessageFromFileYamlTestCase(CmmTestCase): self.assertIsNone(message) -class TagsFromFileTestCase(CmmTestCase): +class TagsFromFileTestCase(unittest.TestCase): def setUp(self) -> None: self.file_txt = tempfile.NamedTemporaryFile(delete=False, suffix='.txt') self.file_path_txt = pathlib.Path(self.file_txt.name) @@ -663,7 +663,7 @@ This is an answer. self.assertSetEqual(tags, set()) -class TagsFromDirTestCase(CmmTestCase): +class TagsFromDirTestCase(unittest.TestCase): def setUp(self) -> None: self.temp_dir = tempfile.TemporaryDirectory() self.temp_dir_no_tags = tempfile.TemporaryDirectory() @@ -711,7 +711,7 @@ class TagsFromDirTestCase(CmmTestCase): self.assertSetEqual(all_tags, set()) -class MessageIDTestCase(CmmTestCase): +class MessageIDTestCase(unittest.TestCase): def setUp(self) -> None: self.file = tempfile.NamedTemporaryFile(delete=False, suffix='.txt') self.file_path = pathlib.Path(self.file.name) @@ -731,7 +731,7 @@ class MessageIDTestCase(CmmTestCase): self.message_no_file_path.msg_id() -class MessageHashTestCase(CmmTestCase): +class MessageHashTestCase(unittest.TestCase): def setUp(self) -> None: self.message1 = Message(Question('This is a question.'), tags={Tag('tag1')}, @@ -755,7 +755,7 @@ class MessageHashTestCase(CmmTestCase): self.assertIn(msg, msgs) -class MessageTagsStrTestCase(CmmTestCase): +class MessageTagsStrTestCase(unittest.TestCase): def setUp(self) -> None: self.message = Message(Question('This is a question.'), tags={Tag('tag1')}, @@ -765,7 +765,7 @@ class MessageTagsStrTestCase(CmmTestCase): self.assertEqual(self.message.tags_str(), f'{TagLine.prefix} tag1') -class MessageFilterTagsTestCase(CmmTestCase): +class MessageFilterTagsTestCase(unittest.TestCase): def setUp(self) -> None: self.message = Message(Question('This is a question.'), tags={Tag('atag1'), Tag('btag2')}, @@ -780,7 +780,7 @@ class MessageFilterTagsTestCase(CmmTestCase): self.assertSetEqual(tags_cont, {Tag('btag2')}) -class MessageInTestCase(CmmTestCase): +class MessageInTestCase(unittest.TestCase): def setUp(self) -> None: self.message1 = Message(Question('This is a question.'), tags={Tag('atag1'), Tag('btag2')}, @@ -794,7 +794,7 @@ class MessageInTestCase(CmmTestCase): self.assertFalse(message_in(self.message1, [self.message2])) -class MessageRenameTagsTestCase(CmmTestCase): +class MessageRenameTagsTestCase(unittest.TestCase): def setUp(self) -> None: self.message = Message(Question('This is a question.'), tags={Tag('atag1'), Tag('btag2')}, @@ -806,7 +806,7 @@ class MessageRenameTagsTestCase(CmmTestCase): self.assertSetEqual(self.message.tags, {Tag('atag2'), Tag('btag3')}) # type: ignore [arg-type] -class MessageToStrTestCase(CmmTestCase): +class MessageToStrTestCase(unittest.TestCase): def setUp(self) -> None: self.message = Message(Question('This is a question.'), Answer('This is an answer.'), diff --git a/tests/test_tags.py b/tests/test_tags.py index aa89a06..edd3c05 100644 --- a/tests/test_tags.py +++ b/tests/test_tags.py @@ -1,8 +1,8 @@ -from .test_main import CmmTestCase +import unittest from chatmastermind.tags import Tag, TagLine, TagError -class TestTag(CmmTestCase): +class TestTag(unittest.TestCase): def test_valid_tag(self) -> None: tag = Tag('mytag') self.assertEqual(tag, 'mytag') @@ -18,7 +18,7 @@ class TestTag(CmmTestCase): self.assertEqual(Tag.alternative_separators, [',']) -class TestTagLine(CmmTestCase): +class TestTagLine(unittest.TestCase): def test_valid_tagline(self) -> None: tagline = TagLine('TAGS: tag1 tag2') self.assertEqual(tagline, 'TAGS: tag1 tag2')