From e977dbf568e3f3a1ab0633a32c45b5ec7d05b997 Mon Sep 17 00:00:00 2001 From: Vincent Hennebert Date: Thu, 24 Jan 2008 19:56:05 +0000 Subject: [PATCH] Replaced 'non-lead' with 'normal' git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@614964 13f79535-47bb-0310-9956-ffa450edef68 --- ...psed-conditional-borders_test-generator.py | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/test/fotree/unittests/table/collapsed-conditional-borders_test-generator.py b/test/fotree/unittests/table/collapsed-conditional-borders_test-generator.py index 1bd5d441d..c1d11c916 100755 --- a/test/fotree/unittests/table/collapsed-conditional-borders_test-generator.py +++ b/test/fotree/unittests/table/collapsed-conditional-borders_test-generator.py @@ -219,7 +219,7 @@ class TableHFGenerator: comma = ', ' resBody = self.bordersBody[tableNum][1] for i in range(4): - for normLeadRest in ['non-lead', 'lead', 'rest']: + for normLeadRest in ['normal', 'lead', 'rest']: sys.stderr.write(', {border' + resBody[i][normLeadRest][0] + ', Color.' + resBody[i][normLeadRest][1] @@ -334,10 +334,10 @@ def generateTestCasesHeaderFooter(): {'length': '4pt', 'cond': 'discard', 'color': 'magenta'} # footer > row > cell ] defaultResolution = [ - {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, # border-before cell 1 - {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'magenta')}, # border-after cell 1 - {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')}, # border-before cell 2 - {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')} # border-after cell 2 + {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, # border-before cell 1 + {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'magenta')}, # border-after cell 1 + {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')}, # border-before cell 2 + {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')} # border-after cell 2 ] # The following contains changes to the default borders. Depending on the object # targeted (in header, footer, body1 or body2), the affected border is either before @@ -348,46 +348,46 @@ def generateTestCasesHeaderFooter(): # - for footer: border-before for setting in [ {'borders': [(body2, '8pt', 'discard'), (body1, '6pt', 'discard')], 'res': [ - {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, - {'non-lead': ('8pt', 'blue'), 'lead': ('6pt', 'black'), 'rest': ('4pt', 'magenta')}, - {'non-lead': ('8pt', 'blue'), 'lead': ('8pt', 'blue'), 'rest': ('4pt', 'red')}, - {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, + {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, + {'normal': ('8pt', 'blue'), 'lead': ('6pt', 'black'), 'rest': ('4pt', 'magenta')}, + {'normal': ('8pt', 'blue'), 'lead': ('8pt', 'blue'), 'rest': ('4pt', 'red')}, + {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, {'borders': [(row2, '8pt', 'discard'), (row1, '6pt', 'retain')], 'res': [ - {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, - {'non-lead': ('8pt', 'blue'), 'lead': ('6pt', 'black'), 'rest': ('6pt', 'black')}, - {'non-lead': ('8pt', 'blue'), 'lead': ('8pt', 'blue'), 'rest': ('4pt', 'red')}, - {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, + {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, + {'normal': ('8pt', 'blue'), 'lead': ('6pt', 'black'), 'rest': ('6pt', 'black')}, + {'normal': ('8pt', 'blue'), 'lead': ('8pt', 'blue'), 'rest': ('4pt', 'red')}, + {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, {'borders': [(cell2, '6pt', 'retain'), (cellh, '8pt', 'discard'), (cell1, '4pt', 'retain')], 'res': [ - {'non-lead': ('8pt', 'red'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')}, - {'non-lead': ('6pt', 'blue'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'black')}, - {'non-lead': ('6pt', 'blue'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')}, - {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, + {'normal': ('8pt', 'red'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')}, + {'normal': ('6pt', 'blue'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'black')}, + {'normal': ('6pt', 'blue'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')}, + {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, {'borders': [(body2, '6pt', 'retain'), (rowh, '8pt', 'discard'), (row1, '4pt', 'retain')], 'res': [ - {'non-lead': ('8pt', 'red'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')}, - {'non-lead': ('6pt', 'blue'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'magenta')}, - {'non-lead': ('6pt', 'blue'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')}, - {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, + {'normal': ('8pt', 'red'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')}, + {'normal': ('6pt', 'blue'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'magenta')}, + {'normal': ('6pt', 'blue'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')}, + {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, # Almost a copy-paste of the above, swapping 1 and 2, header and footer {'borders': [(body1, '8pt', 'discard'), (body2, '6pt', 'discard')], 'res': [ - {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, - {'non-lead': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('4pt', 'magenta')}, - {'non-lead': ('8pt', 'black'), 'lead': ('6pt', 'blue'), 'rest': ('4pt', 'red')}, - {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, + {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, + {'normal': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('4pt', 'magenta')}, + {'normal': ('8pt', 'black'), 'lead': ('6pt', 'blue'), 'rest': ('4pt', 'red')}, + {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, {'borders': [(cell1, '8pt', 'discard'), (cell2, '6pt', 'retain')], 'res': [ - {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, - {'non-lead': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('4pt', 'magenta')}, - {'non-lead': ('8pt', 'black'), 'lead': ('6pt', 'blue'), 'rest': ('6pt', 'blue')}, - {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, + {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, + {'normal': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('4pt', 'magenta')}, + {'normal': ('8pt', 'black'), 'lead': ('6pt', 'blue'), 'rest': ('6pt', 'blue')}, + {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]}, {'borders': [(row1, '6pt', 'retain'), (footer, '8pt', 'discard'), (body2, '4pt', 'retain')], 'res': [ - {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, - {'non-lead': ('6pt', 'black'), 'lead': ('8pt', 'magenta'), 'rest': ('8pt', 'magenta')}, - {'non-lead': ('6pt', 'black'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')}, - {'non-lead': ('8pt', 'magenta'), 'lead': ('8pt', 'magenta'), 'rest': ('8pt', 'magenta')}]}, + {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, + {'normal': ('6pt', 'black'), 'lead': ('8pt', 'magenta'), 'rest': ('8pt', 'magenta')}, + {'normal': ('6pt', 'black'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')}, + {'normal': ('8pt', 'magenta'), 'lead': ('8pt', 'magenta'), 'rest': ('8pt', 'magenta')}]}, {'borders': [(body1, '8pt', 'retain'), (cellf, '6pt', 'discard'), (row2, '4pt', 'retain')], 'res': [ - {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, - {'non-lead': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('8pt', 'black')}, - {'non-lead': ('8pt', 'black'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')}, - {'non-lead': ('6pt', 'magenta'), 'lead': ('6pt', 'magenta'), 'rest': ('6pt', 'magenta')}]}]: + {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, + {'normal': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('8pt', 'black')}, + {'normal': ('8pt', 'black'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')}, + {'normal': ('6pt', 'magenta'), 'lead': ('6pt', 'magenta'), 'rest': ('6pt', 'magenta')}]}]: finalBorders = copy.deepcopy(defaultBorders) for border in setting['borders']: finalBorders[border[0]]['length'] = border[1] @@ -403,4 +403,4 @@ def generateTestCasesHeaderFooter(): # Uncomment the appropriate line #generateTestCases() -#generateTestCasesHeaderFooter() +generateTestCasesHeaderFooter() -- 2.39.5