[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=f4f16ca

The following commit has been merged in the master branch:
commit f4f16ca928c609c10e53b8f725cfe451cc412969
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Aug 28 16:05:11 2012 +0200

    [tests] add more tests
---
 tests/message-processor-basic-tests.cpp | 18 ++++++++++++------
 tests/message-processor-basic-tests.h   |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/message-processor-basic-tests.cpp b/tests/message-processor-basic-tests.cpp
index 06ab841..098855b 100644
--- a/tests/message-processor-basic-tests.cpp
+++ b/tests/message-processor-basic-tests.cpp
@@ -34,13 +34,13 @@
     QString href = QLatin1String(expected); \
     QCOMPARE(processed, href); \
     QTextDocument inputdoc, processeddoc; \
-    inputdoc.setHtml(QLatin1String(input)); \
+    inputdoc.setHtml(QRegExp::escape(QLatin1String(input))); \
     processeddoc.setHtml(href); \
-    QString processedtext = processeddoc.toPlainText().replace(QLatin1String("\*"), QLatin1String("*")); \
-    QCOMPARE(inputdoc.toPlainText(), processedtext); \
+    QCOMPARE(inputdoc.toPlainText(), processeddoc.toPlainText()); \
 }
 
 
+
 Tp::Message normalMessage(const char* msg) {
     return Tp::Message(Tp::ChannelTextMessageTypeNormal, QLatin1String(msg));
 }
@@ -194,10 +194,16 @@ void MessageProcessorBasicTests::testBoldItalics()
     compareWithPlainText("/*this is italics bold*/", "<i>/<b>\*this is italics bold\*</b>/</i>");
     compareWithPlainText("*/this is bold italics/*", "<b>\*<i>/this is bold italics/</i>\*</b>");
 
-    compareWithPlainText("/*this is just wrong/*", "/*this is just wrong/*");
-
     compareWithPlainText("this is /*italics bold*/ , this is */bold italics/*", "this is <i>/<b>\*italics bold\*</b>/</i> , this is <b>\*<i>/bold italics/</i>\*</b>");
-//    compareWithPlainText("this is /*italics bold*/, this is */bold italics/*", "this is <i>/<b>\*italics bold\*</b>/</i>, this is <b>\*<i>/bold italics/</i>\*</b>");
+
+//    compareWithPlainText("/*this is wrong italics bold/*", "/\*this is wrong italics bold/\*");
+//    compareWithPlainText("this has a /punctuation mark/, after the slash", "this has a <i>/punctuation mark/</i>, after the slash");
+}
+
+void MessageProcessorBasicTests::testRandomFormatting()
+{
+    compareWithPlainText("/this *should* work/ but /let's be *sure*/", "<i>/this <b>\*should\*</b> work/</i> but <i>/let's be <b>\*sure\*</b>/</i>");
+    compareWithPlainText("/this -should- work/ and /this -should- work as well/", "<i>/this <s>-should-</s> work/</i> and <i>/this <s>-should-</s> work as well/</i>");
 }
 
 
diff --git a/tests/message-processor-basic-tests.h b/tests/message-processor-basic-tests.h
index dd02c9b..2fa3177 100644
--- a/tests/message-processor-basic-tests.h
+++ b/tests/message-processor-basic-tests.h
@@ -48,6 +48,7 @@ private Q_SLOTS:
     void testStrikethrough();
     void testUnderline();
     void testBoldItalics();
+    void testRandomFormatting();
 };
 
 #endif // MESSAGE_PROCESSOR_BASIC_TESTS_H

-- 
ktp-text-ui packaging