Commit 44edfb63 authored by Łukasz Nowak's avatar Łukasz Nowak

- run and quiet parameters are not needed in test methods


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43427 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 09bbf03c
...@@ -577,9 +577,8 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -577,9 +577,8 @@ class TestOOoImport(TestOOoImportMixin):
## Tests ## Tests
################################## ##################################
def test_01_ImportFileLine(self, quiet=QUIET, run=RUN_ALL_TEST): def test_01_ImportFileLine(self):
# Simulate import of OOo file Base_importFile for Person Module. # Simulate import of OOo file Base_importFile for Person Module.
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportRawDataFile' step_list = [ 'stepImportRawDataFile'
,'stepCheckActivitiesCount' ,'stepCheckActivitiesCount'
...@@ -588,12 +587,11 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -588,12 +587,11 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_02_ImportFileBlankLine(self, quiet=QUIET, run=RUN_ALL_TEST): def test_02_ImportFileBlankLine(self):
#Simulate import of an OOo file with blank lines. #Simulate import of an OOo file with blank lines.
#self.logMessage('Simulate import of an OOo file with blank lines') #self.logMessage('Simulate import of an OOo file with blank lines')
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportFileWithBlankLine' step_list = [ 'stepImportFileWithBlankLine'
,'Tic' ,'Tic'
...@@ -601,20 +599,18 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -601,20 +599,18 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_03_ImportNoMapping(self, quiet=QUIET, run=RUN_ALL_TEST): def test_03_ImportNoMapping(self):
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportFileNoMapping' step_list = [ 'stepImportFileNoMapping'
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_04_ImportFileWithCategory(self, quiet=QUIET, run=RUN_ALL_TEST): def test_04_ImportFileWithCategory(self):
#self.logMessage('Simulate import of an OOo file with blank lines') #self.logMessage('Simulate import of an OOo file with blank lines')
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportFileWithCategory' step_list = [ 'stepImportFileWithCategory'
,'Tic' ,'Tic'
...@@ -622,11 +618,10 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -622,11 +618,10 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_05_ImportOrganisation(self, quiet=QUIET, run=RUN_ALL_TEST): def test_05_ImportOrganisation(self):
#self.logMessage('Simulate import of an OOo file with blank lines') #self.logMessage('Simulate import of an OOo file with blank lines')
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportOrganisation' step_list = [ 'stepImportOrganisation'
,'Tic' ,'Tic'
...@@ -634,11 +629,10 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -634,11 +629,10 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_06_AuthorImportFile(self, quiet=QUIET, run=RUN_ALL_TEST): def test_06_AuthorImportFile(self):
#self.logMessage('Simulate import of an OOo file with blank lines') #self.logMessage('Simulate import of an OOo file with blank lines')
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepAuthorImportFile' step_list = [ 'stepAuthorImportFile'
,'Tic' ,'Tic'
...@@ -646,10 +640,9 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -646,10 +640,9 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_07_ImportFileWithFreeText(self, quiet=QUIET, run=RUN_ALL_TEST): def test_07_ImportFileWithFreeText(self):
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportFileWithFreeText' step_list = [ 'stepImportFileWithFreeText'
,'Tic' ,'Tic'
...@@ -657,10 +650,9 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -657,10 +650,9 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_08_ImportFileWithAccentuatedText(self, quiet=QUIET, run=RUN_ALL_TEST): def test_08_ImportFileWithAccentuatedText(self):
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportFileWithAccentuatedText' step_list = [ 'stepImportFileWithAccentuatedText'
,'Tic' ,'Tic'
...@@ -668,10 +660,9 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -668,10 +660,9 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_09_ImportXLSFile(self, quiet=QUIET, run=RUN_ALL_TEST): def test_09_ImportXLSFile(self):
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportXLSFile' step_list = [ 'stepImportXLSFile'
,'Tic' ,'Tic'
...@@ -679,10 +670,9 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -679,10 +670,9 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_10_ImportFileWithDates(self, quiet=QUIET, run=RUN_ALL_TEST): def test_10_ImportFileWithDates(self):
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportFileWithDates' step_list = [ 'stepImportFileWithDates'
,'Tic' ,'Tic'
...@@ -690,10 +680,9 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -690,10 +680,9 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_11_ImportFloatAndPercentage(self, quiet=QUIET, run=RUN_ALL_TEST): def test_11_ImportFloatAndPercentage(self):
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportFloatsAndPercentage' step_list = [ 'stepImportFloatsAndPercentage'
,'Tic' ,'Tic'
...@@ -701,10 +690,9 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -701,10 +690,9 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
def test_12_ImportBigFile_1(self, quiet=QUIET, run=RUN_ALL_TEST): def test_12_ImportBigFile_1(self):
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportBigFile_1' step_list = [ 'stepImportBigFile_1'
,'Tic' ,'Tic'
...@@ -712,12 +700,11 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -712,12 +700,11 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
''' '''
def test_12_ImportBigFile_2(self, quiet=QUIET, run=RUN_ALL_TEST): def test_12_ImportBigFile_2(self):
#self.logMessage('Simulate import of an OOo file with blank lines') #self.logMessage('Simulate import of an OOo file with blank lines')
if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
step_list = [ 'stepImportBigFile_2' step_list = [ 'stepImportBigFile_2'
,'Tic' ,'Tic'
...@@ -725,7 +712,7 @@ class TestOOoImport(TestOOoImportMixin): ...@@ -725,7 +712,7 @@ class TestOOoImport(TestOOoImportMixin):
] ]
sequence_string = ' '.join(step_list) sequence_string = ' '.join(step_list)
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=quiet) sequence_list.play(self)
''' '''
# CategoryTool_importCategoryFile tests # CategoryTool_importCategoryFile tests
......
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