* Tests updated to work with current code (i.e. no new RPN support yet).

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2930 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
bigchimp
2014-04-08 09:33:13 +00:00
parent d8c10d8668
commit b7eb5352c0
2 changed files with 12 additions and 2 deletions

View File

@ -49,8 +49,13 @@ type
procedure SetUp; override;
procedure TearDown; override;
published
// Current fpspreadsheet does not yet have support for new RPN formulas
{.$DEFINE FPSPREAD_HAS_NEWRPNSUPPORT}
{$IFDEF FPSPREAD_HAS_NEWRPNSUPPORT}
// As described in bug 25718: Feature request & patch: Implementation of writing more functions
// Writes all rpn formulas. Use Excel or Open/LibreOffice to check validity.
procedure TestRPNFormula;
{$ENDIF}
// Writes all background colors in A1..A16
procedure TestBiff8CellBackgroundColor;
end;
@ -62,6 +67,8 @@ uses
fpsUtils;
const
COLORSHEETNAME='colorsheet'; //for background color tests
RPNSHEETNAME='formula_sheet'; //for rpn formula tests
OUTPUT_FORMAT = sfExcel8;
FALSE_TRUE: array[Boolean] of String = ('FALSE', 'TRUE');
@ -166,7 +173,7 @@ begin
if Workbook = nil then
Workbook := TsWorkbook.Create;
Worksheet := Workbook.AddWorksheet('colorsheet');
Worksheet := Workbook.AddWorksheet(COLORSHEETNAME);
WorkSheet.WriteUTF8Text(0,1,'TSpreadManualTests.TestBiff8CellBackgroundColor');
RowOffset:=1;
for i:=Low(SollColors) to High(SollColors) do
@ -180,8 +187,11 @@ begin
end;
end;
{$IFDEF FPSPREAD_HAS_NEWRPNSUPPORT}
// As described in bug 25718: Feature request & patch: Implementation of writing more functions
procedure TSpreadManualTests.TestRPNFormula;
{$I rpntests.inc}
{$ENDIF}
initialization
// Register so these tests are included in a full run

View File

@ -23,7 +23,7 @@ begin
if Workbook = nil then
Workbook := TsWorkbook.Create;
Worksheet := Workbook.AddWorksheet('formula_sheet');
Worksheet := Workbook.AddWorksheet(RPNSHEETNAME);
Worksheet.WriteUTF8Text(0, 0, SBaseCells);
Worksheet.WriteUsedFormatting(0, 0, [uffBold]);
Worksheet.WriteNumber(0,1, cellB1);