浏览代码

method rename

Bastien Sevajol 9 年前
父节点
当前提交
7e8b12406b

+ 6 - 6
tracim/tracim/tests/__init__.py 查看文件

300
 
300
 
301
 class BaseTest(object):
301
 class BaseTest(object):
302
 
302
 
303
-    def _create_workspace(self, name, *args, **kwargs) -> Workspace:
303
+    def _create_workspace_and_test(self, name, *args, **kwargs) -> Workspace:
304
         """
304
         """
305
         All extra parameters (*args, **kwargs) are for Workspace init
305
         All extra parameters (*args, **kwargs) are for Workspace init
306
         :return: Created workspace instance
306
         :return: Created workspace instance
312
         eq_(1, DBSession.query(Workspace).filter(Workspace.label == name).count())
312
         eq_(1, DBSession.query(Workspace).filter(Workspace.label == name).count())
313
         return DBSession.query(Workspace).filter(Workspace.label == name).one()
313
         return DBSession.query(Workspace).filter(Workspace.label == name).one()
314
 
314
 
315
-    def _create_content(self, name, workspace, *args, **kwargs) -> Content:
315
+    def _create_content_and_test(self, name, workspace, *args, **kwargs) -> Content:
316
         """
316
         """
317
         All extra parameters (*args, **kwargs) are for Content init
317
         All extra parameters (*args, **kwargs) are for Content init
318
         :return: Created Content instance
318
         :return: Created Content instance
329
 
329
 
330
 class BaseTestThread(BaseTest):
330
 class BaseTestThread(BaseTest):
331
 
331
 
332
-    def _create_thread(self, workspace_name='workspace_1', folder_name='folder_1', thread_name='thread_1') -> Content:
332
+    def _create_thread_and_test(self, workspace_name='workspace_1', folder_name='folder_1', thread_name='thread_1') -> Content:
333
         """
333
         """
334
         :return: Thread
334
         :return: Thread
335
         """
335
         """
336
-        workspace = self._create_workspace(workspace_name)
337
-        folder = self._create_content(folder_name, workspace, type=ContentType.Folder)
338
-        thread = self._create_content(thread_name, workspace, type=ContentType.Thread, parent=folder)
336
+        workspace = self._create_workspace_and_test(workspace_name)
337
+        folder = self._create_content_and_test(folder_name, workspace, type=ContentType.Folder)
338
+        thread = self._create_content_and_test(thread_name, workspace, type=ContentType.Thread, parent=folder)
339
         return thread
339
         return thread

+ 1 - 1
tracim/tracim/tests/library/test_thread.py 查看文件

8
 class TestThread(BaseTestThread, TestStandard):
8
 class TestThread(BaseTestThread, TestStandard):
9
 
9
 
10
     def test_create_thread(self, key='1'):
10
     def test_create_thread(self, key='1'):
11
-        return self._create_thread(
11
+        return self._create_thread_and_test(
12
             workspace_name='workspace_%s' % key,
12
             workspace_name='workspace_%s' % key,
13
             folder_name='folder_%s' % key,
13
             folder_name='folder_%s' % key,
14
             thread_name='thread_%s' % key,
14
             thread_name='thread_%s' % key,

+ 1 - 1
tracim/tracim/tests/library/test_workspace.py 查看文件

11
 class TestThread(BaseTestThread, TestStandard):
11
 class TestThread(BaseTestThread, TestStandard):
12
 
12
 
13
     def test_children(self):
13
     def test_children(self):
14
-        self._create_thread(
14
+        self._create_thread_and_test(
15
             workspace_name='workspace_1',
15
             workspace_name='workspace_1',
16
             folder_name='folder_1',
16
             folder_name='folder_1',
17
             thread_name='thread_1',
17
             thread_name='thread_1',

+ 3 - 3
tracim/tracim/tests/models/test_content_revision.py 查看文件

32
 
32
 
33
     def test_new_revision(self):
33
     def test_new_revision(self):
34
         admin = DBSession.query(User).filter(User.email == 'admin@admin.admin').one()
34
         admin = DBSession.query(User).filter(User.email == 'admin@admin.admin').one()
35
-        workspace = self._create_workspace(name='workspace_1')
36
-        folder = self._create_content(name='folder_1', workspace=workspace, type=ContentType.Folder)
37
-        page = self._create_content(
35
+        workspace = self._create_workspace_and_test(name='workspace_1')
36
+        folder = self._create_content_and_test(name='folder_1', workspace=workspace, type=ContentType.Folder)
37
+        page = self._create_content_and_test(
38
             workspace=workspace,
38
             workspace=workspace,
39
             parent=folder,
39
             parent=folder,
40
             name='file_1',
40
             name='file_1',