Add mergeCells() function

tests/auto/auto.pro

@@ -1,3 +1,4 @@
 TEMPLATE=subdirs
 SUBDIRS=\
-    utility
+    utility \
+    mergecell

tests/auto/mergecell/mergecell.pro

@@ -0,0 +1,18 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2013-09-06T10:52:56
+#
+#-------------------------------------------------
+
+QT       += testlib xlsx xlsx-private
+CONFIG += testcase
+DEFINES += XLSX_TEST
+
+TARGET = tst_mergecelltest
+CONFIG   += console
+CONFIG   -= app_bundle
+
+TEMPLATE = app
+
+SOURCES += tst_mergecelltest.cpp
+DEFINES += SRCDIR=\\\"$$PWD/\\\"

tests/auto/mergecell/tst_mergecelltest.cpp

@@ -0,0 +1,71 @@
+#include <QBuffer>
+#include <QtTest>
+
+#include "xlsxworksheet.h"
+#include "xlsxworkbook.h"
+
+class MergeCellTest : public QObject
+{
+    Q_OBJECT
+
+public:
+    MergeCellTest();
+
+private Q_SLOTS:
+    void testWithoutMerge();
+    void testMerge();
+    void testUnMerge();
+};
+
+MergeCellTest::MergeCellTest()
+{
+}
+
+void MergeCellTest::testWithoutMerge()
+{
+    QXlsx::Workbook book;
+    QXlsx::Worksheet *sheet = book.addWorksheet("Sheet1");
+    sheet->write("B1", "Hello");
+
+    QByteArray xmldata;
+    QBuffer buffer(&xmldata);
+    buffer.open(QIODevice::WriteOnly);
+    sheet->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");
+
+    QByteArray xmldata;
+    QBuffer buffer(&xmldata);
+    buffer.open(QIODevice::WriteOnly);
+    sheet->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");
+
+    QByteArray xmldata;
+    QBuffer buffer(&xmldata);
+    buffer.open(QIODevice::WriteOnly);
+    sheet->saveToXmlFile(&buffer);
+
+    QVERIFY2(!xmldata.contains("<mergeCell"), "");
+}
+
+QTEST_APPLESS_MAIN(MergeCellTest)
+
+#include "tst_mergecelltest.moc"

tests/auto/utility/utility.pro

@@ -5,15 +5,14 @@
 #-------------------------------------------------
 
 QT       += testlib xlsx xlsx-private
+CONFIG += testcase
+DEFINES += XLSX_TEST
 
 TARGET = tst_utilitytest
 CONFIG   += console
 CONFIG   -= app_bundle
 
-DEFINES += XLSX_TEST
-
 TEMPLATE = app
 
-
 SOURCES += tst_utilitytest.cpp
 DEFINES += SRCDIR=\\\"$$PWD/\\\"