Commit 57e97a60 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

fix typos and cleanup.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26516 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 66a20e77
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
# Aurelien Calonne <aurel@nexedi.com> # Aurelien Calonne <aurel@nexedi.com>
# #
# WARNING: This program as such is intended to be used by professional # WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential # programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs # consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial # End users who are looking for a ready-to-use solution with commercial
# garantees and support are strongly adviced to contract a Free Software # guarantees and support are strongly adviced to contract a Free Software
# Service Company # Service Company
# #
# This program is Free Software; you can redistribute it and/or # This program is Free Software; you can redistribute it and/or
...@@ -147,7 +147,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -147,7 +147,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
self.failIf(core_bt is None) self.failIf(core_bt is None)
sequence.edit(current_bt=core_bt) sequence.edit(current_bt=core_bt)
def stepCopyCoreBusinessTemplate(self, sequence=None, def stepCopyCoreBusinessTemplate(self, sequence=None,
sequence_list=None, **kw): sequence_list=None, **kw):
""" """
...@@ -1380,7 +1379,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -1380,7 +1379,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
# check filter # check filter
self.failUnless(method_id not in catalog.filter_dict.keys()) self.failUnless(method_id not in catalog.filter_dict.keys())
def stepRemoveCatalogMethod(self, sequence=None, sequence_list=None, **kw): def stepRemoveCatalogMethod(self, sequence=None, sequence_list=None, **kw):
""" """
Remove ZSQL Method from catalog Remove ZSQL Method from catalog
...@@ -1702,7 +1700,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -1702,7 +1700,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
catalog.sql_catalog_local_role_keys = tuple(sql_catalog_local_role_keys) catalog.sql_catalog_local_role_keys = tuple(sql_catalog_local_role_keys)
self.failUnless(local_role_key not in catalog.sql_catalog_local_role_keys) self.failUnless(local_role_key not in catalog.sql_catalog_local_role_keys)
def stepCheckKeysAndTableExists(self, sequence=list, sequence_list=None, **kw): def stepCheckKeysAndTableExists(self, sequence=list, sequence_list=None, **kw):
""" """
Check presence of some keys and tables Check presence of some keys and tables
...@@ -2551,7 +2548,7 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -2551,7 +2548,7 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self, quiet=quiet)
def test_021_BusinessTemplateWithPortalTypesAdnWrongValues(self, quiet=quiet, run=run_all_test): def test_021_BusinessTemplateWithPortalTypesAndWrongValues(self, quiet=quiet, run=run_all_test):
if not run: return if not run: return
if not quiet: if not quiet:
message = 'Test Business Template With Portal Types and Bad Values' message = 'Test Business Template With Portal Types and Bad Values'
...@@ -2575,7 +2572,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -2575,7 +2572,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self, quiet=quiet)
# test of skins # test of skins
def test_03_BusinessTemplateWithSkins(self, quiet=quiet, run=run_all_test): def test_03_BusinessTemplateWithSkins(self, quiet=quiet, run=run_all_test):
if not run: return if not run: return
...@@ -2732,7 +2728,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -2732,7 +2728,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self, quiet=quiet)
# test of module # test of module
def test_05_BusinessTemplateWithModule(self, quiet=quiet, run=run_all_test): def test_05_BusinessTemplateWithModule(self, quiet=quiet, run=run_all_test):
if not run: return if not run: return
...@@ -2891,7 +2886,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -2891,7 +2886,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self, quiet=quiet)
def test_07_BusinessTemplateWithEmptyAction(self, quiet=quiet, run=run_all_test): def test_07_BusinessTemplateWithEmptyAction(self, quiet=quiet, run=run_all_test):
if not run: return if not run: return
if not quiet: if not quiet:
...@@ -2937,8 +2931,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -2937,8 +2931,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self, quiet=quiet)
def test_08_BusinessTemplateWithTwoActions(self, quiet=quiet, run=run_all_test): def test_08_BusinessTemplateWithTwoActions(self, quiet=quiet, run=run_all_test):
if not run: return if not run: return
if not quiet: if not quiet:
...@@ -3438,7 +3430,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -3438,7 +3430,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self, quiet=quiet)
def test_155_BusinessTemplateUpdateWithPropertySheet(self, quiet=quiet, run=run_all_test): def test_155_BusinessTemplateUpdateWithPropertySheet(self, quiet=quiet, run=run_all_test):
if not run: return if not run: return
if not quiet: if not quiet:
...@@ -3716,8 +3707,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -3716,8 +3707,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self, quiet=quiet)
def test_17_SubobjectsAfterUpgradOfBusinessTemplate(self, quiet=quiet, run=run_all_test): def test_17_SubobjectsAfterUpgradOfBusinessTemplate(self, quiet=quiet, run=run_all_test):
if not run: return if not run: return
if not quiet: if not quiet:
...@@ -4007,7 +3996,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -4007,7 +3996,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self, quiet=quiet)
def test_20_checkUpdateTool(self, quiet=quiet, run=run_all_test): def test_20_checkUpdateTool(self, quiet=quiet, run=run_all_test):
if not run: return if not run: return
if not quiet: if not quiet:
...@@ -4105,7 +4093,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -4105,7 +4093,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self, quiet=quiet)
def test_21_CategoryIncludeSubobjects(self, quiet=quiet, run=run_all_test): def test_21_CategoryIncludeSubobjects(self, quiet=quiet, run=run_all_test):
if not run: return if not run: return
if not quiet: if not quiet:
...@@ -4493,7 +4480,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -4493,7 +4480,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
self.assertTrue('erp5_core' in layers, layers) self.assertTrue('erp5_core' in layers, layers)
self.assertFalse('erp5_xhtml_style' in layers, layers) self.assertFalse('erp5_xhtml_style' in layers, layers)
def test_33_BusinessTemplateWithNewSkinSelection(self, quiet=quiet, def test_33_BusinessTemplateWithNewSkinSelection(self, quiet=quiet,
run=run_all_test): run=run_all_test):
if not run: return if not run: return
...@@ -4622,7 +4608,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -4622,7 +4608,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
self.assertEquals(-1, compareVersions('1.0a', '1.0.1')) self.assertEquals(-1, compareVersions('1.0a', '1.0.1'))
self.assertEquals(-1, compareVersions('1.1', '2.0')) self.assertEquals(-1, compareVersions('1.1', '2.0'))
def test_CompareVersionStrings(self): def test_CompareVersionStrings(self):
"""Test compareVersionStrings on template tool""" """Test compareVersionStrings on template tool"""
compareVersionStrings = \ compareVersionStrings = \
...@@ -4633,7 +4618,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -4633,7 +4618,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
self.assertFalse(compareVersionStrings('1.0rc1', '>= 1.0')) self.assertFalse(compareVersionStrings('1.0rc1', '>= 1.0'))
self.assertTrue(compareVersionStrings('1.0rc1', '>= 1.0rc1')) self.assertTrue(compareVersionStrings('1.0rc1', '>= 1.0rc1'))
def test_checkDependencies(self): def test_checkDependencies(self):
from Products.ERP5Type.Document.BusinessTemplate import \ from Products.ERP5Type.Document.BusinessTemplate import \
BusinessTemplateMissingDependency BusinessTemplateMissingDependency
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment