TianZD/QtXlsxWriter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code refactoring: Introduce new class CellFormula

Browse Source
This commit is contained in:
Debao Zhang
2014-10-22 00:32:39 +08:00
parent d9f627b9ca
commit 4669640c27
13 changed files with 555 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/document/tst_documenttest.cpp
+24 -23
View File
@@ -1,6 +1,7 @@
#include "xlsxdocument.h"
#include "xlsxcell.h"
#include "xlsxformat.h"
#include "xlsxcellformula.h"
#include <QString>
#include <QtTest>
@@ -69,9 +70,9 @@ void DocumentTest::testReadWriteString()
device.open(QIODevice::ReadOnly);
Document xlsx2(&device);
QCOMPARE(xlsx2.cellAt("A1")->dataType(), Cell::String);
QCOMPARE(xlsx2.cellAt("A1")->cellType(), Cell::SharedStringType);
QCOMPARE(xlsx2.cellAt("A1")->value().toString(), QString("Hello Qt!"));
QCOMPARE(xlsx2.cellAt("A2")->dataType(), Cell::String);
QCOMPARE(xlsx2.cellAt("A2")->cellType(), Cell::SharedStringType);
QCOMPARE(xlsx2.cellAt("A2")->value().toString(), QString("Hello Qt again!"));
Format format2 = xlsx2.cellAt("A2")->format();
QVERIFY(format2.isValid());
@@ -79,7 +80,7 @@ void DocumentTest::testReadWriteString()
// qDebug()<<format;
QCOMPARE(format2, format);
QCOMPARE(xlsx2.cellAt("A3")->dataType(), Cell::String);
QCOMPARE(xlsx2.cellAt("A3")->cellType(), Cell::SharedStringType);
QCOMPARE(xlsx2.cellAt("A3")->value().toString(), QString("12345"));
}
@@ -100,9 +101,9 @@ void DocumentTest::testReadWriteNumeric()
device.open(QIODevice::ReadOnly);
Document xlsx2(&device);
QCOMPARE(xlsx2.cellAt("A1")->dataType(), Cell::Numeric);
QCOMPARE(xlsx2.cellAt("A1")->cellType(), Cell::NumberType);
QCOMPARE(xlsx2.cellAt("A1")->value().toDouble(), 123.0);
QCOMPARE(xlsx2.cellAt("A2")->dataType(), Cell::Numeric);
QCOMPARE(xlsx2.cellAt("A2")->cellType(), Cell::NumberType);
QCOMPARE(xlsx2.cellAt("A2")->value().toDouble(), 12345.0);
QVERIFY(xlsx2.cellAt("A2")->format().isValid());
QCOMPARE(xlsx2.cellAt("A2")->format(), format);
@@ -124,9 +125,9 @@ void DocumentTest::testReadWriteBool()
device.open(QIODevice::ReadOnly);
Document xlsx2(&device);
QCOMPARE(xlsx2.cellAt("A1")->dataType(), Cell::Boolean);
QCOMPARE(xlsx2.cellAt("A1")->cellType(), Cell::BooleanType);
QCOMPARE(xlsx2.cellAt("A1")->value().toBool(), true);
QCOMPARE(xlsx2.cellAt("A2")->dataType(), Cell::Boolean);
QCOMPARE(xlsx2.cellAt("A2")->cellType(), Cell::BooleanType);
QCOMPARE(xlsx2.cellAt("A2")->value().toBool(), false);
QVERIFY(xlsx2.cellAt("A2")->format().isValid());
QCOMPARE(xlsx2.cellAt("A2")->format(), format);
@@ -149,10 +150,10 @@ void DocumentTest::testReadWriteBlank()
device.open(QIODevice::ReadOnly);
Document xlsx2(&device);
QVERIFY(xlsx2.cellAt("A1"));
QCOMPARE(xlsx2.cellAt("A1")->dataType(), Cell::Blank);
QCOMPARE(xlsx2.cellAt("A1")->cellType(), Cell::NumberType);
QVERIFY(!xlsx2.cellAt("A1")->value().isValid());
QVERIFY(xlsx2.cellAt("A2"));
QCOMPARE(xlsx2.cellAt("A2")->dataType(), Cell::Blank);
QCOMPARE(xlsx2.cellAt("A2")->cellType(), Cell::NumberType);
QVERIFY(!xlsx2.cellAt("A2")->value().isValid());
QVERIFY(xlsx2.cellAt("A2")->format().isValid());
QCOMPARE(xlsx2.cellAt("A2")->format(), format);
@@ -175,12 +176,11 @@ void DocumentTest::testReadWriteFormula()
device.open(QIODevice::ReadOnly);
Document xlsx2(&device);
QCOMPARE(xlsx2.cellAt("A1")->dataType(), Cell::Formula);
// QCOMPARE(xlsx2.cellAt("A1")->value().toDouble(), 0.0);
QCOMPARE(xlsx2.cellAt("A1")->formula(), QStringLiteral("11+22"));
QCOMPARE(xlsx2.cellAt("A2")->dataType(), Cell::Formula);
// QCOMPARE(xlsx2.cellAt("A2")->value().toDouble(), 0.0);
QCOMPARE(xlsx2.cellAt("A2")->formula(), QStringLiteral("22+33"));
QCOMPARE(xlsx2.cellAt("A1")->cellType(), Cell::NumberType);
QVERIFY(xlsx2.cellAt("A1")->hasFormula());
QCOMPARE(xlsx2.cellAt("A1")->formula(), CellFormula("11+22"));
QCOMPARE(xlsx2.cellAt("A2")->cellType(), Cell::NumberType);
QCOMPARE(xlsx2.cellAt("A2")->formula(), CellFormula("22+33"));
QVERIFY(xlsx2.cellAt("A2")->format().isValid());
QCOMPARE(xlsx2.cellAt("A2")->format(), format);
}
@@ -211,17 +211,17 @@ void DocumentTest::testReadWriteDateTime()
device.open(QIODevice::ReadOnly);
Document xlsx2(&device);
QCOMPARE(xlsx2.cellAt("A1")->dataType(), Cell::Numeric);
QCOMPARE(xlsx2.cellAt("A1")->cellType(), Cell::NumberType);
QCOMPARE(xlsx2.cellAt("A1")->isDateTime(), true);
QCOMPARE(xlsx2.cellAt("A1")->dateTime(), dt);
QVERIFY(xlsx2.read("A1").userType() == QMetaType::QDateTime);
QCOMPARE(xlsx2.cellAt("A2")->dataType(), Cell::Numeric);
QCOMPARE(xlsx2.cellAt("A2")->cellType(), Cell::NumberType);
QCOMPARE(xlsx2.cellAt("A2")->isDateTime(), true);
QCOMPARE(xlsx2.cellAt("A2")->dateTime(), dt);
QVERIFY(xlsx2.read("A2").userType() == QMetaType::QDateTime);
QCOMPARE(xlsx2.cellAt("A3")->dataType(), Cell::Numeric);
QCOMPARE(xlsx2.cellAt("A3")->cellType(), Cell::NumberType);
QVERIFY(xlsx2.cellAt("A3")->format().isValid());
QCOMPARE(xlsx2.cellAt("A3")->isDateTime(), true);
QCOMPARE(xlsx2.cellAt("A3")->dateTime(), dt);
@@ -259,16 +259,16 @@ void DocumentTest::testReadWriteDate()
device.open(QIODevice::ReadOnly);
Document xlsx2(&device);
QCOMPARE(xlsx2.cellAt("A1")->dataType(), Cell::Numeric);
QCOMPARE(xlsx2.cellAt("A1")->cellType(), Cell::NumberType);
QCOMPARE(xlsx2.cellAt("A1")->isDateTime(), true);
QVERIFY(xlsx2.read("A1").userType() == QMetaType::QDate);
QCOMPARE(xlsx2.read("A1").toDate(), d);
QCOMPARE(xlsx2.cellAt("A2")->dataType(), Cell::Numeric);
QCOMPARE(xlsx2.cellAt("A2")->cellType(), Cell::NumberType);
QCOMPARE(xlsx2.cellAt("A2")->isDateTime(), true);
QVERIFY(xlsx2.read("A2").userType() == QMetaType::QDate);
QCOMPARE(xlsx2.cellAt("A3")->dataType(), Cell::Numeric);
QCOMPARE(xlsx2.cellAt("A3")->cellType(), Cell::NumberType);
QVERIFY(xlsx2.cellAt("A3")->format().isValid());
QCOMPARE(xlsx2.cellAt("A3")->isDateTime(), true);
QCOMPARE(xlsx2.cellAt("A3")->format().numberFormat(), QString("dd/mm/yyyy"));
@@ -297,9 +297,10 @@ void DocumentTest::testReadWriteTime()
device.open(QIODevice::ReadOnly);
Document xlsx2(&device);
QCOMPARE(xlsx2.cellAt("A1")->dataType(), Cell::Blank);
QCOMPARE(xlsx2.cellAt("A1")->cellType(), Cell::NumberType);
QVERIFY(!xlsx2.cellAt("A1")->value().isValid());
QCOMPARE(xlsx2.cellAt("A2")->dataType(), Cell::Numeric);
QCOMPARE(xlsx2.cellAt("A2")->cellType(), Cell::NumberType);
QCOMPARE(xlsx2.cellAt("A2")->isDateTime(), true);
QVERIFY(xlsx2.read("A2").userType() == QMetaType::QTime);
QCOMPARE(xlsx2.read("A2").toTime(), QTime(1, 22));
tests/auto/worksheet/tst_worksheet.cpp
+11 -10
View File
@@ -9,6 +9,7 @@
#include "private/xlsxworksheet_p.h"
#include "private/xlsxsharedstrings_p.h"
#include "xlsxrichstring.h"
#include "xlsxcellformula.h"
class WorksheetTest : public QObject
{
@@ -114,8 +115,8 @@ void WorksheetTest::testWriteCells()
QVERIFY2(xmldata.contains("<c r=\"A2\" t=\"s\"><v>0</v></c>"), "string");
QVERIFY2(xmldata.contains("<c r=\"A3\" t=\"inlineStr\"><is><t>Hello inline</t></is></c>"), "inline string");
QVERIFY2(xmldata.contains("<c r=\"A4\" t=\"b\"><v>1</v></c>"), "boolean");
QVERIFY2(xmldata.contains("<c r=\"A5\" t=\"str\"><f>44+33</f><v>0</v></c>"), "formula");
QVERIFY2(xmldata.contains("<c r=\"B5\" t=\"str\"><f>44+33</f><v>77</v></c>"), "formula");
QVERIFY2(xmldata.contains("<c r=\"A5\"><f>44+33</f><v>0</v></c>"), "formula");
QVERIFY2(xmldata.contains("<c r=\"B5\"><f>44+33</f><v>77</v></c>"), "formula");
QCOMPARE(sheet.d_func()->sharedStrings()->getSharedString(0).toPlainString(), QStringLiteral("Hello"));
}
@@ -204,29 +205,29 @@ void WorksheetTest::testReadSheetData()
QCOMPARE(sheet.d_func()->cellTable.size(), 2);
//A1
QCOMPARE(sheet.cellAt("A1")->dataType(), QXlsx::Cell::String);
QCOMPARE(sheet.cellAt("A1")->cellType(), QXlsx::Cell::SharedStringType);
QCOMPARE(sheet.cellAt("A1")->value().toString(), QStringLiteral("Hello"));
//B1
QCOMPARE(sheet.cellAt("B1")->dataType(), QXlsx::Cell::Formula);
QCOMPARE(sheet.cellAt("B1")->cellType(), QXlsx::Cell::NumberType);
QCOMPARE(sheet.cellAt("B1")->value().toInt(), 77);
QCOMPARE(sheet.cellAt("B1")->formula(), QStringLiteral("44+33"));
QCOMPARE(sheet.cellAt("B1")->formula(), QXlsx::CellFormula("44+33"));
//C1
QCOMPARE(sheet.cellAt("C1")->dataType(), QXlsx::Cell::Formula);
QCOMPARE(sheet.cellAt("C1")->cellType(), QXlsx::Cell::StringType);
QCOMPARE(sheet.cellAt("C1")->value().toInt(), 77);
QCOMPARE(sheet.cellAt("C1")->formula(), QStringLiteral("44+33"));
QCOMPARE(sheet.cellAt("C1")->formula(), QXlsx::CellFormula("44+33"));
//B3
QCOMPARE(sheet.cellAt("B3")->dataType(), QXlsx::Cell::Numeric);
QCOMPARE(sheet.cellAt("B3")->cellType(), QXlsx::Cell::NumberType);
QCOMPARE(sheet.cellAt("B3")->value().toInt(), 12345);
//C3
QCOMPARE(sheet.cellAt("C3")->dataType(), QXlsx::Cell::InlineString);
QCOMPARE(sheet.cellAt("C3")->cellType(), QXlsx::Cell::InlineStringType);
QCOMPARE(sheet.cellAt("C3")->value().toString(), QStringLiteral("inline test string"));
//E3
QCOMPARE(sheet.cellAt("E3")->dataType(), QXlsx::Cell::Error);
QCOMPARE(sheet.cellAt("E3")->cellType(), QXlsx::Cell::ErrorType);
QCOMPARE(sheet.cellAt("E3")->value().toString(), QStringLiteral("#DIV/0!"));
}