Simplify test directory structure

gunthercox · Nov 10, 2018 · 29150fe · 29150fe
1 parent 62c9ea5
commit 29150fe
Show file tree

Hide file tree

Showing 53 changed files with 21 additions and 45 deletions.
diff --git a/tests/api_tests/__init__.py → tests/api/__init__.py b/tests/api_tests/__init__.py → tests/api/__init__.py
diff --git a/tests/api_tests/test_gitter.py → tests/api/test_gitter.py b/tests/api_tests/test_gitter.py → tests/api/test_gitter.py
diff --git a/tests/api_tests/test_microsoft.py → tests/api/test_microsoft.py b/tests/api_tests/test_microsoft.py → tests/api/test_microsoft.py
diff --git a/tests/filter_integration_tests/__init__.py → tests/input/__init__.py b/tests/filter_integration_tests/__init__.py → tests/input/__init__.py
diff --git a/...dapter_tests/test_gitter_input_adapter.py → tests/input/test_gitter_input_adapter.py b/...dapter_tests/test_gitter_input_adapter.py → tests/input/test_gitter_input_adapter.py
@@ -1,6 +1,6 @@
 from chatterbot.conversation import Statement
 from chatterbot.input import Gitter
-from tests.api_tests.test_gitter import GitterTestCase
+from tests.api.test_gitter import GitterTestCase
 
 
 class GitterAdapterTests(GitterTestCase):

diff --git a/...input_adapter_tests/test_input_adapter.py → tests/input/test_input_adapter.py b/...input_adapter_tests/test_input_adapter.py → tests/input/test_input_adapter.py
diff --git a/tests/input_adapter_tests/test_mailgun.py → tests/input/test_mailgun.py b/tests/input_adapter_tests/test_mailgun.py → tests/input/test_mailgun.py
diff --git a/...ter_tests/test_microsoft_input_adapter.py → tests/input/test_microsoft_input_adapter.py b/...ter_tests/test_microsoft_input_adapter.py → tests/input/test_microsoft_input_adapter.py
@@ -1,6 +1,6 @@
 from chatterbot.conversation import Statement
 from chatterbot.input import Microsoft
-from tests.api_tests.test_microsoft import MicrosoftTestCase
+from tests.api.test_microsoft import MicrosoftTestCase
 
 
 class MicrosoftInputAdapterTests(MicrosoftTestCase):

diff --git a/...ut_adapter_tests/test_terminal_adapter.py → tests/input/test_terminal_adapter.py b/...ut_adapter_tests/test_terminal_adapter.py → tests/input/test_terminal_adapter.py
diff --git a/tests/input_adapter_tests/__init__.py → tests/logic/__init__.py b/tests/input_adapter_tests/__init__.py → tests/logic/__init__.py
diff --git a/tests/logic_adapter_tests/__init__.py → .../best_match_integration_tests/__init__.py b/tests/logic_adapter_tests/__init__.py → .../best_match_integration_tests/__init__.py
diff --git a/...ration_tests/test_levenshtein_distance.py → ...ration_tests/test_levenshtein_distance.py b/...ration_tests/test_levenshtein_distance.py → ...ration_tests/test_levenshtein_distance.py
diff --git a/...ration_tests/test_sentiment_comparison.py → ...ration_tests/test_sentiment_comparison.py b/...ration_tests/test_sentiment_comparison.py → ...ration_tests/test_sentiment_comparison.py
diff --git a/...integration_tests/test_synset_distance.py → ...integration_tests/test_synset_distance.py b/...integration_tests/test_synset_distance.py → ...integration_tests/test_synset_distance.py
diff --git a/tests/logic_adapter_tests/test_best_match.py → tests/logic/test_best_match.py b/tests/logic_adapter_tests/test_best_match.py → tests/logic/test_best_match.py
diff --git a/tests/logic_adapter_tests/test_data_cache.py → tests/logic/test_data_cache.py b/tests/logic_adapter_tests/test_data_cache.py → tests/logic/test_data_cache.py
diff --git a/...logic_adapter_tests/test_logic_adapter.py → tests/logic/test_logic_adapter.py b/...logic_adapter_tests/test_logic_adapter.py → tests/logic/test_logic_adapter.py
diff --git a/...pter_tests/test_low_confidence_adapter.py → tests/logic/test_low_confidence_adapter.py b/...pter_tests/test_low_confidence_adapter.py → tests/logic/test_low_confidence_adapter.py
diff --git a/...ter_tests/test_mathematical_evaluation.py → tests/logic/test_mathematical_evaluation.py b/...ter_tests/test_mathematical_evaluation.py → tests/logic/test_mathematical_evaluation.py
diff --git a/...c_adapter_tests/test_specific_response.py → tests/logic/test_specific_response.py b/...c_adapter_tests/test_specific_response.py → tests/logic/test_specific_response.py
diff --git a/tests/logic_adapter_tests/test_time.py → tests/logic/test_time.py b/tests/logic_adapter_tests/test_time.py → tests/logic/test_time.py
diff --git a/...gic_adapter_tests/test_unit_conversion.py → tests/logic/test_unit_conversion.py b/...gic_adapter_tests/test_unit_conversion.py → tests/logic/test_unit_conversion.py
diff --git a/.../best_match_integration_tests/__init__.py → tests/output/__init__.py b/.../best_match_integration_tests/__init__.py → tests/output/__init__.py
diff --git a/...apter_tests/test_gitter_output_adapter.py → tests/output/test_gitter_output_adapter.py b/...apter_tests/test_gitter_output_adapter.py → tests/output/test_gitter_output_adapter.py
@@ -1,6 +1,6 @@
 from chatterbot.conversation import Statement
 from chatterbot.output import Gitter
-from tests.api_tests.test_gitter import GitterTestCase
+from tests.api.test_gitter import GitterTestCase
 
 
 class GitterAdapterTestCase(GitterTestCase):

diff --git a/tests/output_adapter_tests/test_mailgun.py → tests/output/test_mailgun.py b/tests/output_adapter_tests/test_mailgun.py → tests/output/test_mailgun.py
diff --git a/...er_tests/test_microsoft_output_adapter.py → ...s/output/test_microsoft_output_adapter.py b/...er_tests/test_microsoft_output_adapter.py → ...s/output/test_microsoft_output_adapter.py
@@ -1,6 +1,6 @@
 from chatterbot.conversation import Statement
 from chatterbot.output import Microsoft
-from tests.api_tests.test_microsoft import MicrosoftTestCase
+from tests.api.test_microsoft import MicrosoftTestCase
 
 
 class MicrosoftAdapterTests(MicrosoftTestCase):

diff --git a/...tput_adapter_tests/test_output_adapter.py → tests/output/test_output_adapter.py b/...tput_adapter_tests/test_output_adapter.py → tests/output/test_output_adapter.py
diff --git a/...ut_adapter_tests/test_terminal_adapter.py → tests/output/test_terminal_adapter.py b/...ut_adapter_tests/test_terminal_adapter.py → tests/output/test_terminal_adapter.py
diff --git a/tests/output_adapter_tests/__init__.py → tests/storage/__init__.py b/tests/output_adapter_tests/__init__.py → tests/storage/__init__.py
diff --git a/...orage_adapter_tests/test_mongo_adapter.py → tests/storage/test_mongo_adapter.py b/...orage_adapter_tests/test_mongo_adapter.py → tests/storage/test_mongo_adapter.py
@@ -5,26 +5,37 @@
 
 class MongoAdapterTestCase(TestCase):
 
-    def setUp(self):
+    @classmethod
+    def setUpClass(cls):
         """
-        Instantiate the adapter.
+        Instantiate the adapter before any tests in the test case run.
         """
         from pymongo.errors import ServerSelectionTimeoutError
         from pymongo import MongoClient
 
-        # Skip these tests if a mongo client is not running
+        cls.has_mongo_connection = False
+
         try:
             client = MongoClient(
                 serverSelectionTimeoutMS=0.1
             )
             client.server_info()
 
-            self.adapter = MongoDatabaseAdapter(
-                database_uri="mongodb://localhost:27017/chatterbot_test_database"
+            cls.adapter = MongoDatabaseAdapter(
+                database_uri='mongodb://localhost:27017/chatterbot_test_database'
             )
 
+            cls.has_mongo_connection = False
+
         except ServerSelectionTimeoutError:
-            self.skipTest("Unable to connect to mongo database.")
+            pass
+
+    def setUp(self):
+        """
+        Skip these tests if a mongo client is not running.
+        """
+        if not self.has_mongo_connection:
+            self.skipTest('Unable to connect to mongo database.')
 
     def tearDown(self):
         """

diff --git a/...storage_adapter_tests/test_sql_adapter.py → tests/storage/test_sql_adapter.py b/...storage_adapter_tests/test_sql_adapter.py → tests/storage/test_sql_adapter.py
diff --git a/...age_adapter_tests/test_storage_adapter.py → tests/storage/test_storage_adapter.py b/...age_adapter_tests/test_storage_adapter.py → tests/storage/test_storage_adapter.py
diff --git a/tests/storage_adapter_tests/integration_tests/__init__.py b/tests/storage_adapter_tests/integration_tests/__init__.py
diff --git a/tests/storage_adapter_tests/integration_tests/mongo_integration_tests.py b/tests/storage_adapter_tests/integration_tests/mongo_integration_tests.py
diff --git a/tests/storage_adapter_tests/integration_tests/sqlalchemy_integration_tests.py b/tests/storage_adapter_tests/integration_tests/sqlalchemy_integration_tests.py
diff --git a/tests/conversation_tests/test_statements.py → tests/test_conversations.py b/tests/conversation_tests/test_statements.py → tests/test_conversations.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from unittest import TestCase
 from chatterbot.conversation import Statement
 

diff --git a/..._tests/test_filters_with_mongo_storage.py → tests/test_filters.py b/..._tests/test_filters_with_mongo_storage.py → tests/test_filters.py
diff --git a/tests/storage_adapter_tests/__init__.py → tests/training/__init__.py b/tests/storage_adapter_tests/__init__.py → tests/training/__init__.py
diff --git a/..._tests/test_chatterbot_corpus_training.py → ...aining/test_chatterbot_corpus_training.py b/..._tests/test_chatterbot_corpus_training.py → ...aining/test_chatterbot_corpus_training.py
diff --git a/.../training_tests/test_data/get_search.json → tests/training/test_data/get_search.json b/.../training_tests/test_data/get_search.json → tests/training/test_data/get_search.json
diff --git a/tests/training_tests/test_database_export.py → tests/training/test_database_export.py b/tests/training_tests/test_database_export.py → tests/training/test_database_export.py
diff --git a/tests/training_tests/test_list_training.py → tests/training/test_list_training.py b/tests/training_tests/test_list_training.py → tests/training/test_list_training.py
diff --git a/tests/training_tests/test_training.py → tests/training/test_training.py b/tests/training_tests/test_training.py → tests/training/test_training.py
diff --git a/...ning_tests/test_training_preprocessors.py → ...s/training/test_training_preprocessors.py b/...ning_tests/test_training_preprocessors.py → ...s/training/test_training_preprocessors.py
diff --git a/tests/training_tests/test_twitter_trainer.py → tests/training/test_twitter_trainer.py b/tests/training_tests/test_twitter_trainer.py → tests/training/test_twitter_trainer.py
diff --git a/...ning_tests/test_ubuntu_corpus_training.py → ...s/training/test_ubuntu_corpus_training.py b/...ning_tests/test_ubuntu_corpus_training.py → ...s/training/test_ubuntu_corpus_training.py
diff --git a/tests/training_tests/__init__.py b/tests/training_tests/__init__.py
diff --git a/tests_django/integration_tests/__init__.py b/tests_django/integration_tests/__init__.py
diff --git a/..._tests/test_chatterbot_corpus_training.py → ...django/test_chatterbot_corpus_training.py b/..._tests/test_chatterbot_corpus_training.py → ...django/test_chatterbot_corpus_training.py
diff --git a/...n_tests/test_input_adapter_integration.py → ..._django/test_input_adapter_integration.py b/...n_tests/test_input_adapter_integration.py → ..._django/test_input_adapter_integration.py
diff --git a/...n_tests/test_logic_adapter_integration.py → ..._django/test_logic_adapter_integration.py b/...n_tests/test_logic_adapter_integration.py → ..._django/test_logic_adapter_integration.py
diff --git a/..._tests/test_output_adapter_integration.py → ...django/test_output_adapter_integration.py b/..._tests/test_output_adapter_integration.py → ...django/test_output_adapter_integration.py
diff --git a/...ation_tests/test_statement_integration.py → tests_django/test_statement_integration.py b/...ation_tests/test_statement_integration.py → tests_django/test_statement_integration.py