method rename

tracim/tracim/tests/__init__.py

@@ -300,7 +300,7 @@ class ArgumentParser(argparse.ArgumentParser):
 
 class BaseTest(object):
 
-    def _create_workspace(self, name, *args, **kwargs) -> Workspace:
+    def _create_workspace_and_test(self, name, *args, **kwargs) -> Workspace:
         """
         All extra parameters (*args, **kwargs) are for Workspace init
         :return: Created workspace instance
@@ -312,7 +312,7 @@ class BaseTest(object):
         eq_(1, DBSession.query(Workspace).filter(Workspace.label == name).count())
         return DBSession.query(Workspace).filter(Workspace.label == name).one()
 
-    def _create_content(self, name, workspace, *args, **kwargs) -> Content:
+    def _create_content_and_test(self, name, workspace, *args, **kwargs) -> Content:
         """
         All extra parameters (*args, **kwargs) are for Content init
         :return: Created Content instance
@@ -329,11 +329,11 @@ class BaseTest(object):
 
 class BaseTestThread(BaseTest):
 
-    def _create_thread(self, workspace_name='workspace_1', folder_name='folder_1', thread_name='thread_1') -> Content:
+    def _create_thread_and_test(self, workspace_name='workspace_1', folder_name='folder_1', thread_name='thread_1') -> Content:
         """
         :return: Thread
         """
-        workspace = self._create_workspace(workspace_name)
-        folder = self._create_content(folder_name, workspace, type=ContentType.Folder)
-        thread = self._create_content(thread_name, workspace, type=ContentType.Thread, parent=folder)
+        workspace = self._create_workspace_and_test(workspace_name)
+        folder = self._create_content_and_test(folder_name, workspace, type=ContentType.Folder)
+        thread = self._create_content_and_test(thread_name, workspace, type=ContentType.Thread, parent=folder)
         return thread

tracim/tracim/tests/library/test_thread.py

@@ -8,7 +8,7 @@ from tracim.tests import BaseTestThread, TestStandard
 class TestThread(BaseTestThread, TestStandard):
 
     def test_create_thread(self, key='1'):
-        return self._create_thread(
+        return self._create_thread_and_test(
             workspace_name='workspace_%s' % key,
             folder_name='folder_%s' % key,
             thread_name='thread_%s' % key,

tracim/tracim/tests/library/test_workspace.py

@@ -11,7 +11,7 @@ from tracim.tests import BaseTestThread, TestStandard
 class TestThread(BaseTestThread, TestStandard):
 
     def test_children(self):
-        self._create_thread(
+        self._create_thread_and_test(
             workspace_name='workspace_1',
             folder_name='folder_1',
             thread_name='thread_1',

tracim/tracim/tests/models/test_content_revision.py

@@ -32,9 +32,9 @@ class TestContentRevision(BaseTest, TestStandard):
 
     def test_new_revision(self):
         admin = DBSession.query(User).filter(User.email == 'admin@admin.admin').one()
-        workspace = self._create_workspace(name='workspace_1')
-        folder = self._create_content(name='folder_1', workspace=workspace, type=ContentType.Folder)
-        page = self._create_content(
+        workspace = self._create_workspace_and_test(name='workspace_1')
+        folder = self._create_content_and_test(name='folder_1', workspace=workspace, type=ContentType.Folder)
+        page = self._create_content_and_test(
             workspace=workspace,
             parent=folder,
             name='file_1',