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

Make constructor of Workbook private

Browse Source
This commit is contained in:
Debao Zhang
2013-09-11 17:12:56 +08:00
parent 5817ebdbfd
commit 6ee507b0d8
4 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/mergecell/tst_mergecelltest.cpp
+13 -16
View File
@@ -2,7 +2,7 @@
#include <QtTest>
#include "xlsxworksheet.h"
#include "xlsxworkbook.h"
#include "xlsxdocument.h"
class MergeCellTest : public QObject
{
@@ -23,45 +23,42 @@ MergeCellTest::MergeCellTest()
void MergeCellTest::testWithoutMerge()
{
QXlsx::Workbook book;
QXlsx::Worksheet *sheet = book.addWorksheet("Sheet1");
sheet->write("B1", "Hello");
QXlsx::Document xlsx;
xlsx.write("B1", "Hello");
QByteArray xmldata;
QBuffer buffer(&xmldata);
buffer.open(QIODevice::WriteOnly);
sheet->saveToXmlFile(&buffer);
xlsx.activedWorksheet()->saveToXmlFile(&buffer);
QVERIFY2(!xmldata.contains("<mergeCell"), "");
}
void MergeCellTest::testMerge()
{
QXlsx::Workbook book;
QXlsx::Worksheet *sheet = book.addWorksheet("Sheet1");
sheet->write("B1", "Test Merged Cell");
sheet->mergeCells("B1:B5");
QXlsx::Document xlsx;
xlsx.write("B1", "Test Merged Cell");
xlsx.mergeCells("B1:B5");
QByteArray xmldata;
QBuffer buffer(&xmldata);
buffer.open(QIODevice::WriteOnly);
sheet->saveToXmlFile(&buffer);
xlsx.activedWorksheet()->saveToXmlFile(&buffer);
QVERIFY2(xmldata.contains("<mergeCells count=\"1\"><mergeCell ref=\"B1:B5\"/></mergeCells>"), "");
}
void MergeCellTest::testUnMerge()
{
QXlsx::Workbook book;
QXlsx::Worksheet *sheet = book.addWorksheet("Sheet1");
sheet->write("B1", "Test Merged Cell");
sheet->mergeCells("B1:B5");
sheet->unmergeCells("B1:B5");
QXlsx::Document xlsx;
xlsx.write("B1", "Test Merged Cell");
xlsx.mergeCells("B1:B5");
xlsx.unmergeCells("B1:B5");
QByteArray xmldata;
QBuffer buffer(&xmldata);
buffer.open(QIODevice::WriteOnly);
sheet->saveToXmlFile(&buffer);
xlsx.activedWorksheet()->saveToXmlFile(&buffer);
QVERIFY2(!xmldata.contains("<mergeCell"), "");
}
tests/auto/relationships/tst_relationshipstest.cpp
+2 -8
View File
@@ -24,10 +24,7 @@ void RelationshipsTest::testSaveXml()
QXlsx::Relationships rels;
rels.addDocumentRelationship("/officeDocument", "xl/workbook.xml");
QByteArray xmldata;
QBuffer buffer(&xmldata);
buffer.open(QIODevice::WriteOnly);
rels.saveToXmlFile(&buffer);
QByteArray xmldata = rels.saveToXmlData();
QVERIFY2(xmldata.contains("<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\" Target=\"xl/workbook.xml\"/>"), "");
}
@@ -38,11 +35,8 @@ void RelationshipsTest::testLoadXml()
"<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">"
"<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\" Target=\"xl/workbook.xml\"/>"
"</Relationships>");
QBuffer buffer(&xmldata);
buffer.open(QIODevice::ReadOnly);
QXlsx::Relationships rels;
rels.loadFromXmlFile(&buffer);
QXlsx::Relationships rels = QXlsx::Relationships::loadFromXmlData(xmldata);
QCOMPARE(rels.documentRelationships("/officeDocument").size(), 1);
}