1 files changed, 249 insertions, 238 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp
index bc72b33..163a38a 100644
--- a/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp
+++ b/Swift/Controllers/Chat/UnitTest/ChatMessageParserTest.cpp
@@ -1,30 +1,22 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <hippomocks.h>
+#include <gtest/gtest.h>
 
 #include <Swift/Controllers/Chat/ChatMessageParser.h>
+#include <Swift/Controllers/Highlighting/HighlightConfiguration.h>
+#include <Swift/Controllers/Highlighting/HighlightManager.h>
+#include <Swift/Controllers/Settings/DummySettingsProvider.h>
 
 using namespace Swift;
 
-class ChatMessageParserTest : public CppUnit::TestFixture {
-    CPPUNIT_TEST_SUITE(ChatMessageParserTest);
-    CPPUNIT_TEST(testFullBody);
-    CPPUNIT_TEST(testOneEmoticon);
-    CPPUNIT_TEST(testBareEmoticon);
-    CPPUNIT_TEST(testHiddenEmoticon);
-    CPPUNIT_TEST(testEndlineEmoticon);
-    CPPUNIT_TEST(testBoundedEmoticons);
-    CPPUNIT_TEST(testNoColourNoHighlight);
-    CPPUNIT_TEST_SUITE_END();
-
-public:
-    void setUp() {
+// Common test state
+class ChatMessageParserTest : public ::testing::Test {
+protected:
+    virtual void SetUp() {
         smile1_ = ":)";
         smile1Path_ = "/blah/smile1.png";
         smile2_ = ":(";
@@ -33,244 +25,54 @@ public:
         emoticons_[smile2_] = smile2Path_;
     }
 
-    void tearDown() {
+    virtual void TearDown() {
         emoticons_.clear();
     }
 
-    void assertText(const ChatWindow::ChatMessage& result, size_t index, const std::string& text) {
+    static void assertText(const ChatWindow::ChatMessage& result, size_t index, const std::string& text) {
+        ASSERT_LT(index, result.getParts().size());
         std::shared_ptr<ChatWindow::ChatTextMessagePart> part = std::dynamic_pointer_cast<ChatWindow::ChatTextMessagePart>(result.getParts()[index]);
-        CPPUNIT_ASSERT_EQUAL(text, part->text);
+        ASSERT_EQ(text, part->text);
     }
 
-    void assertEmoticon(const ChatWindow::ChatMessage& result, size_t index, const std::string& text, const std::string& path) {
+    static void assertEmoticon(const ChatWindow::ChatMessage& result, size_t index, const std::string& text, const std::string& path) {
+        ASSERT_LT(index, result.getParts().size());
         std::shared_ptr<ChatWindow::ChatEmoticonMessagePart> part = std::dynamic_pointer_cast<ChatWindow::ChatEmoticonMessagePart>(result.getParts()[index]);
-        CPPUNIT_ASSERT(!!part);
-        CPPUNIT_ASSERT_EQUAL(text, part->alternativeText);
-        CPPUNIT_ASSERT_EQUAL(path, part->imagePath);
+        ASSERT_NE(nullptr, part);
+        ASSERT_EQ(text, part->alternativeText);
+        ASSERT_EQ(path, part->imagePath);
     }
 
-#define assertHighlight(RESULT, INDEX, TEXT, EXPECTED_HIGHLIGHT) \
-    { \
-        std::shared_ptr<ChatWindow::ChatHighlightingMessagePart> part = std::dynamic_pointer_cast<ChatWindow::ChatHighlightingMessagePart>(RESULT.getParts()[INDEX]); \
-        CPPUNIT_ASSERT_EQUAL(std::string(TEXT), part->text); \
-        CPPUNIT_ASSERT(EXPECTED_HIGHLIGHT == part->action); \
-    }
-
-    void assertURL(const ChatWindow::ChatMessage& result, size_t index, const std::string& text) {
+    static void assertURL(const ChatWindow::ChatMessage& result, size_t index, const std::string& text) {
+        ASSERT_LT(index, result.getParts().size());
         std::shared_ptr<ChatWindow::ChatURIMessagePart> part = std::dynamic_pointer_cast<ChatWindow::ChatURIMessagePart>(result.getParts()[index]);
-        CPPUNIT_ASSERT_EQUAL(text, part->target);
-    }
-
-    static HighlightRule ruleFromKeyword(const std::string& keyword, bool matchCase, bool matchWholeWord)
-    {
-        HighlightRule rule;
-        std::vector<std::string> keywords;
-        keywords.push_back(keyword);
-        rule.setKeywords(keywords);
-        rule.setMatchCase(matchCase);
-        rule.setMatchWholeWords(matchWholeWord);
-        rule.setMatchChat(true);
-        rule.getAction().setTextBackground("white");
-        return rule;
-    }
-
-    static const HighlightRulesListPtr ruleListFromKeyword(const std::string& keyword, bool matchCase, bool matchWholeWord)
-    {
-        std::shared_ptr<HighlightManager::HighlightRulesList> list = std::make_shared<HighlightManager::HighlightRulesList>();
-        list->addRule(ruleFromKeyword(keyword, matchCase, matchWholeWord));
-        return list;
-    }
-
-    static const HighlightRulesListPtr ruleListFromKeywords(const HighlightRule &rule1, const HighlightRule &rule2)
-    {
-        std::shared_ptr<HighlightManager::HighlightRulesList> list = std::make_shared<HighlightManager::HighlightRulesList>();
-        list->addRule(rule1);
-        list->addRule(rule2);
-        return list;
-    }
-
-    static HighlightRulesListPtr ruleListWithNickHighlight(bool withHighlightColour = true)
-    {
-        HighlightRule rule;
-        rule.setMatchChat(true);
-        rule.setNickIsKeyword(true);
-        rule.setMatchCase(true);
-        rule.setMatchWholeWords(true);
-        if (withHighlightColour) {
-            rule.getAction().setTextBackground("white");
-        }
-        std::shared_ptr<HighlightManager::HighlightRulesList> list = std::make_shared<HighlightManager::HighlightRulesList>();
-        list->addRule(rule);
-        return list;
-    }
-
-    void testFullBody() {
-        const std::string no_special_message = "a message with no special content";
-        ChatMessageParser testling(emoticons_, std::make_shared<HighlightManager::HighlightRulesList>());
-        ChatWindow::ChatMessage result = testling.parseMessageBody(no_special_message);
-        assertText(result, 0, no_special_message);
-
-        HighlightRulesListPtr highlightRuleList = ruleListFromKeyword("trigger", false, false);
-        testling = ChatMessageParser(emoticons_, highlightRuleList);
-        result = testling.parseMessageBody(":) shiny :( trigger :) http://wonderland.lit/blah http://denmark.lit boom boom");
-        assertEmoticon(result, 0, smile1_, smile1Path_);
-        assertText(result, 1, " shiny ");
-        assertEmoticon(result, 2, smile2_, smile2Path_);
-        assertText(result, 3, " ");
-        assertHighlight(result, 4, "trigger", highlightRuleList->getRule(0).getAction());
-        assertText(result, 5, " ");
-        assertEmoticon(result, 6, smile1_, smile1Path_);
-        assertText(result, 7, " ");
-        assertURL(result, 8, "http://wonderland.lit/blah");
-        assertText(result, 9, " ");
-        assertURL(result, 10, "http://denmark.lit");
-        assertText(result, 11, " boom boom");
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeyword("trigger", false, false));
-        result = testling.parseMessageBody("testtriggermessage");
-        assertText(result, 0, "test");
-        assertHighlight(result, 1, "trigger", highlightRuleList->getRule(0).getAction());
-        assertText(result, 2, "message");
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeyword("trigger", false, true));
-        result = testling.parseMessageBody("testtriggermessage");
-        assertText(result, 0, "testtriggermessage");
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeyword("trigger", true, false));
-        result = testling.parseMessageBody("TrIgGeR");
-        assertText(result, 0, "TrIgGeR");
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeyword("trigger", false, false));
-        result = testling.parseMessageBody("TrIgGeR");
-        assertHighlight(result, 0, "TrIgGeR", highlightRuleList->getRule(0).getAction());
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeyword("trigger", false, false));
-        result = testling.parseMessageBody("partialTrIgGeRmatch");
-        assertText(result, 0, "partial");
-        assertHighlight(result, 1, "TrIgGeR", highlightRuleList->getRule(0).getAction());
-        assertText(result, 2, "match");
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeywords(ruleFromKeyword("one", false, false), ruleFromKeyword("three", false, false)));
-        result = testling.parseMessageBody("zero one two three");
-        assertText(result, 0, "zero ");
-        assertHighlight(result, 1, "one", highlightRuleList->getRule(0).getAction());
-        assertText(result, 2, " two ");
-        assertHighlight(result, 3, "three", highlightRuleList->getRule(0).getAction());
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeywords(ruleFromKeyword("one", false, false), ruleFromKeyword("three", false, false)));
-        result = testling.parseMessageBody("zero oNe two tHrEe");
-        assertText(result, 0, "zero ");
-        assertHighlight(result, 1, "oNe", highlightRuleList->getRule(0).getAction());
-        assertText(result, 2, " two ");
-        assertHighlight(result, 3, "tHrEe", highlightRuleList->getRule(0).getAction());
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeywords(ruleFromKeyword("one", false, false), ruleFromKeyword("three", true, false)));
-        result = testling.parseMessageBody("zero oNe two tHrEe");
-        assertText(result, 0, "zero ");
-        assertHighlight(result, 1, "oNe", highlightRuleList->getRule(0).getAction());
-        assertText(result, 2, " two tHrEe");
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeywords(ruleFromKeyword("one", true, false), ruleFromKeyword("three", true, false)));
-        result = testling.parseMessageBody("zero oNe two tHrEe");
-        assertText(result, 0, "zero oNe two tHrEe");
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeywords(ruleFromKeyword("one", false, false), ruleFromKeyword("three", false, false)));
-        result = testling.parseMessageBody("zeroonetwothree");
-        assertText(result, 0, "zero");
-        assertHighlight(result, 1, "one", highlightRuleList->getRule(0).getAction());
-        assertText(result, 2, "two");
-        assertHighlight(result, 3, "three", highlightRuleList->getRule(0).getAction());
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeywords(ruleFromKeyword("one", true, false), ruleFromKeyword("three", false, false)));
-        result = testling.parseMessageBody("zeroOnEtwoThReE");
-        assertText(result, 0, "zeroOnEtwo");
-        assertHighlight(result, 1, "ThReE", highlightRuleList->getRule(0).getAction());
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeywords(ruleFromKeyword("one", false, true), ruleFromKeyword("three", false, false)));
-        result = testling.parseMessageBody("zeroonetwothree");
-        assertText(result, 0, "zeroonetwo");
-        assertHighlight(result, 1, "three", highlightRuleList->getRule(0).getAction());
-
-        testling = ChatMessageParser(emoticons_, ruleListFromKeywords(ruleFromKeyword("one", false, true), ruleFromKeyword("three", false, true)));
-        result = testling.parseMessageBody("zeroonetwothree");
-        assertText(result, 0, "zeroonetwothree");
-
-        testling = ChatMessageParser(emoticons_, ruleListWithNickHighlight());
-        result = testling.parseMessageBody("Alice", "Alice");
-        assertHighlight(result, 0, "Alice", highlightRuleList->getRule(0).getAction());
-
-        testling = ChatMessageParser(emoticons_, ruleListWithNickHighlight());
-        result = testling.parseMessageBody("TextAliceText", "Alice");
-        assertText(result, 0, "TextAliceText");
-
-        testling = ChatMessageParser(emoticons_, ruleListWithNickHighlight());
-        result = testling.parseMessageBody("Text Alice Text", "Alice");
-        assertText(result, 0, "Text ");
-        assertHighlight(result, 1, "Alice", highlightRuleList->getRule(0).getAction());
-        assertText(result, 2, " Text");
-
-        testling = ChatMessageParser(emoticons_, ruleListWithNickHighlight());
-        result = testling.parseMessageBody("Alice Text", "Alice");
-        assertHighlight(result, 0, "Alice", highlightRuleList->getRule(0).getAction());
-        assertText(result, 1, " Text");
-
-        testling = ChatMessageParser(emoticons_, ruleListWithNickHighlight());
-        result = testling.parseMessageBody("Text Alice", "Alice");
-        assertText(result, 0, "Text ");
-        assertHighlight(result, 1, "Alice", highlightRuleList->getRule(0).getAction());
-    }
-
-    void testOneEmoticon() {
-        ChatMessageParser testling(emoticons_, std::make_shared<HighlightManager::HighlightRulesList>());
-        ChatWindow::ChatMessage result = testling.parseMessageBody(" :) ");
-        assertText(result, 0, " ");
-        assertEmoticon(result, 1, smile1_, smile1Path_);
-        assertText(result, 2, " ");
-    }
-
-
-    void testBareEmoticon() {
-        ChatMessageParser testling(emoticons_, std::make_shared<HighlightManager::HighlightRulesList>());
-        ChatWindow::ChatMessage result = testling.parseMessageBody(":)");
-        assertEmoticon(result, 0, smile1_, smile1Path_);
-    }
-
-    void testHiddenEmoticon() {
-        ChatMessageParser testling(emoticons_, std::make_shared<HighlightManager::HighlightRulesList>());
-        ChatWindow::ChatMessage result = testling.parseMessageBody("b:)a");
-        assertText(result, 0, "b:)a");
-    }
-
-    void testEndlineEmoticon() {
-        ChatMessageParser testling(emoticons_, std::make_shared<HighlightManager::HighlightRulesList>());
-        ChatWindow::ChatMessage result = testling.parseMessageBody("Lazy:)");
-        assertText(result, 0, "Lazy");
-        assertEmoticon(result, 1, smile1_, smile1Path_);
+        ASSERT_EQ(text, part->target);
     }
 
-    void testBoundedEmoticons() {
-        ChatMessageParser testling(emoticons_, std::make_shared<HighlightManager::HighlightRulesList>());
-        ChatWindow::ChatMessage result = testling.parseMessageBody(":)Lazy:(");
-        assertEmoticon(result, 0, smile1_, smile1Path_);
-        assertText(result, 1, "Lazy");
-        assertEmoticon(result, 2, smile2_, smile2Path_);
+    void assertHighlight(const ChatWindow::ChatMessage& result, size_t index, const std::string& text, const HighlightAction& action) {
+        ASSERT_LT(index, result.getParts().size());
+        std::shared_ptr<ChatWindow::ChatHighlightingMessagePart> part = std::dynamic_pointer_cast<ChatWindow::ChatHighlightingMessagePart>(result.getParts()[index]);
+        ASSERT_EQ(std::string(text), part->text);
+        ASSERT_EQ(action, part->action);
     }
 
-    void testEmoticonParenthesis() {
-        ChatMessageParser testling(emoticons_, std::make_shared<HighlightManager::HighlightRulesList>());
-        ChatWindow::ChatMessage result = testling.parseMessageBody("(Like this :))");
-        assertText(result, 0, "(Like this ");
-        assertEmoticon(result, 1, smile1_, smile1Path_);
-        assertText(result, 2, ")");
+    static const std::shared_ptr<HighlightConfiguration> highlightConfigFromKeyword(const std::string& keyword, bool matchCase) {
+        std::shared_ptr<HighlightConfiguration> config = std::make_shared<HighlightConfiguration>();
+        HighlightConfiguration::KeywordHightlight keywordHighlight;
+        keywordHighlight.keyword = keyword;
+        keywordHighlight.matchCaseSensitive = matchCase;
+        keywordHighlight.action.setFrontColor(std::string("#121212"));
+        config->keywordHighlights.push_back(keywordHighlight);
+        return config;
     }
 
-    void testNoColourNoHighlight() {
-        ChatMessageParser testling(emoticons_, ruleListWithNickHighlight(false));
-        ChatWindow::ChatMessage result = testling.parseMessageBody("Alice", "Alice");
-        assertText(result, 0, "Alice");
+    static const std::shared_ptr<HighlightConfiguration> mergeHighlightConfig(const std::shared_ptr<HighlightConfiguration>& configA, const std::shared_ptr<HighlightConfiguration>& configB) {
+        std::shared_ptr<HighlightConfiguration> config = std::make_shared<HighlightConfiguration>();
+        config->keywordHighlights.insert(config->keywordHighlights.end(), configA->keywordHighlights.begin(), configA->keywordHighlights.end());
+        config->keywordHighlights.insert(config->keywordHighlights.end(), configB->keywordHighlights.begin(), configB->keywordHighlights.end());
+        return config;
     }
 
-private:
     std::map<std::string, std::string> emoticons_;
     std::string smile1_;
     std::string smile1Path_;
@@ -278,4 +80,213 @@ private:
     std::string smile2Path_;
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION(ChatMessageParserTest);
+TEST_F(ChatMessageParserTest, testNoHighlightingWithEmtpyConfiguration) {
+    const std::string no_special_message = "a message with no special content";
+    ChatMessageParser testling(emoticons_, std::make_shared<HighlightConfiguration>());
+    auto result = testling.parseMessageBody(no_special_message);
+    assertText(result, 0, no_special_message);
+}
+
+TEST_F(ChatMessageParserTest, testSimpleHighlightAndEmojiAndUrlParsing) {
+    auto highlightConfig = highlightConfigFromKeyword("trigger", false);
+    auto testling = ChatMessageParser(emoticons_, highlightConfig);
+    auto result = testling.parseMessageBody(":) shiny :( trigger :) http://wonderland.lit/blah http://denmark.lit boom boom");
+    assertEmoticon(result, 0, smile1_, smile1Path_);
+    assertText(result, 1, " shiny ");
+    assertEmoticon(result, 2, smile2_, smile2Path_);
+    assertText(result, 3, " ");
+    assertHighlight(result, 4, "trigger", highlightConfig->keywordHighlights[0].action);
+    assertText(result, 5, " ");
+    assertEmoticon(result, 6, smile1_, smile1Path_);
+    assertText(result, 7, " ");
+    assertURL(result, 8, "http://wonderland.lit/blah");
+    assertText(result, 9, " ");
+    assertURL(result, 10, "http://denmark.lit");
+    assertText(result, 11, " boom boom");
+}
+
+TEST_F(ChatMessageParserTest, testNoKeywordHighlightAsPartOfLongerWords) {
+    auto testling = ChatMessageParser(emoticons_, highlightConfigFromKeyword("trigger", false));
+    auto result = testling.parseMessageBody("testtriggermessage");
+    assertText(result, 0, "testtriggermessage");
+}
+
+TEST_F(ChatMessageParserTest, testCaseInsensitiveKeyordHighlight) {
+    auto config = highlightConfigFromKeyword("trigger", true);
+    auto testling = ChatMessageParser(emoticons_, config);
+    auto result = testling.parseMessageBody("TrIgGeR");
+    assertText(result, 0, "TrIgGeR");
+
+    testling = ChatMessageParser(emoticons_, highlightConfigFromKeyword("trigger", false));
+    result = testling.parseMessageBody("TrIgGeR");
+    assertHighlight(result, 0, "TrIgGeR", config->keywordHighlights[0].action);
+}
+
+TEST_F(ChatMessageParserTest, testMultipleKeywordHighlights) {
+    auto config = mergeHighlightConfig(highlightConfigFromKeyword("one", false), highlightConfigFromKeyword("three", false));
+    auto testling = ChatMessageParser(emoticons_, config);
+    auto result = testling.parseMessageBody("zero one two three");
+    assertText(result, 0, "zero ");
+    assertHighlight(result, 1, "one", config->keywordHighlights[0].action);
+    assertText(result, 2, " two ");
+    assertHighlight(result, 3, "three", config->keywordHighlights[0].action);
+}
+
+TEST_F(ChatMessageParserTest, testMultipleCaseInsensitiveKeywordHighlights) {
+    auto config = mergeHighlightConfig(highlightConfigFromKeyword("one", false), highlightConfigFromKeyword("three", false));
+    auto testling = ChatMessageParser(emoticons_, config);
+    auto result = testling.parseMessageBody("zero oNe two tHrEe");
+    assertText(result, 0, "zero ");
+    assertHighlight(result, 1, "oNe", config->keywordHighlights[0].action);
+    assertText(result, 2, " two ");
+    assertHighlight(result, 3, "tHrEe", config->keywordHighlights[0].action);
+}
+
+TEST_F(ChatMessageParserTest, testMultipleCaseSensitiveKeywordHighlights) {
+    auto config = mergeHighlightConfig(highlightConfigFromKeyword("one", false), highlightConfigFromKeyword("three", true));
+    auto testling = ChatMessageParser(emoticons_, config);
+    auto result = testling.parseMessageBody("zero oNe two tHrEe");
+    assertText(result, 0, "zero ");
+    assertHighlight(result, 1, "oNe", config->keywordHighlights[0].action);
+    assertText(result, 2, " two tHrEe");
+
+    config = mergeHighlightConfig(highlightConfigFromKeyword("one", true), highlightConfigFromKeyword("three", false));
+    testling = ChatMessageParser(emoticons_, config);
+    result = testling.parseMessageBody("zero oNe two tHrEe");
+    assertText(result, 0, "zero oNe two ");
+    assertHighlight(result, 1, "tHrEe", config->keywordHighlights[0].action);
+}
+
+TEST_F(ChatMessageParserTest, testOneEmoticon) {
+    auto testling = ChatMessageParser(emoticons_, std::make_shared<HighlightConfiguration>());
+    auto result = testling.parseMessageBody(" :) ");
+    assertText(result, 0, " ");
+    assertEmoticon(result, 1, smile1_, smile1Path_);
+    assertText(result, 2, " ");
+}
+
+TEST_F(ChatMessageParserTest, testBareEmoticon) {
+    auto testling = ChatMessageParser(emoticons_, std::make_shared<HighlightConfiguration>());
+    auto result = testling.parseMessageBody(":)");
+    assertEmoticon(result, 0, smile1_, smile1Path_);
+}
+
+TEST_F(ChatMessageParserTest, testHiddenEmoticon) {
+    auto testling = ChatMessageParser(emoticons_, std::make_shared<HighlightConfiguration>());
+    auto result = testling.parseMessageBody("b:)a");
+    assertText(result, 0, "b:)a");
+}
+
+TEST_F(ChatMessageParserTest, testEndlineEmoticon) {
+    auto testling = ChatMessageParser(emoticons_, std::make_shared<HighlightConfiguration>());
+    auto result = testling.parseMessageBody("Lazy:)");
+    assertText(result, 0, "Lazy");
+    assertEmoticon(result, 1, smile1_, smile1Path_);
+}
+
+TEST_F(ChatMessageParserTest, testBoundedEmoticons) {
+    auto testling = ChatMessageParser(emoticons_, std::make_shared<HighlightConfiguration>());
+    auto result = testling.parseMessageBody(":)Lazy:(");
+    assertEmoticon(result, 0, smile1_, smile1Path_);
+    assertText(result, 1, "Lazy");
+    assertEmoticon(result, 2, smile2_, smile2Path_);
+}
+
+TEST_F(ChatMessageParserTest, testEmoticonParenthesis) {
+    auto testling = ChatMessageParser(emoticons_, std::make_shared<HighlightConfiguration>());
+    auto result = testling.parseMessageBody("(Like this :))");
+    assertText(result, 0, "(Like this ");
+    assertEmoticon(result, 1, smile1_, smile1Path_);
+    assertText(result, 2, ")");
+}
+
+TEST_F(ChatMessageParserTest, testSenderAndKeywordHighlighting) {
+    auto config = std::make_shared<HighlightConfiguration>();
+    auto contactHighlight = HighlightConfiguration::ContactHighlight();
+    contactHighlight.action.setFrontColor(std::string("#f0f0f0"));
+    contactHighlight.action.setBackColor(std::string("#0f0f0f"));
+    contactHighlight.name = "Romeo";
+    config->contactHighlights.push_back(contactHighlight);
+    auto keywordHighlight = HighlightConfiguration::KeywordHightlight();
+    keywordHighlight.action.setFrontColor(std::string("#abcdef"));
+    keywordHighlight.action.setBackColor(std::string("#fedcba"));
+    keywordHighlight.keyword = "XMPP";
+    config->keywordHighlights.push_back(keywordHighlight);
+    auto testling = ChatMessageParser(emoticons_, config);
+    auto result = testling.parseMessageBody("Heard any news about xmpp recently?", "Romeo");
+    assertText(result, 0, "Heard any news about ");
+    assertHighlight(result, 1, "xmpp", keywordHighlight.action);
+    assertText(result, 2, " recently?");
+    ASSERT_EQ(contactHighlight.action, result.getHighlightActionSender());
+    ASSERT_EQ(HighlightAction(), result.getHighlightActionOwnMention());
+}
+
+TEST_F(ChatMessageParserTest, testKeywordWithEmptyActionIsIgnored) {
+    auto config = std::make_shared<HighlightConfiguration>();
+    auto keywordHighlight = HighlightConfiguration::KeywordHightlight();
+    keywordHighlight.keyword = "XMPP";
+    config->keywordHighlights.push_back(keywordHighlight);
+    auto testling = ChatMessageParser(emoticons_, config);
+    auto result = testling.parseMessageBody("Heard any news about xmpp recently?", "Romeo");
+    assertText(result, 0, "Heard any news about xmpp recently?");
+    ASSERT_EQ(HighlightAction(), result.getHighlightActionOwnMention());
+}
+
+TEST_F(ChatMessageParserTest, testMeMessageAndOwnMention) {
+    auto config = std::make_shared<HighlightConfiguration>();
+    config->ownMentionAction.setFrontColor(std::string("#f0f0f0"));
+    config->ownMentionAction.setBackColor(std::string("#0f0f0f"));
+    config->ownMentionAction.setSoundFilePath(std::string("someSoundFile.wav"));
+    auto ownMentionActionForPart = config->ownMentionAction;
+    ownMentionActionForPart.setSoundFilePath(boost::optional<std::string>());
+    auto testling = ChatMessageParser(emoticons_, config);
+    testling.setNick("Juliet");
+    auto result = testling.parseMessageBody("/me wonders when Juliet is coming?", "Romeo");
+    assertText(result, 0, "wonders when ");
+    assertHighlight(result, 1, "Juliet", ownMentionActionForPart);
+    assertText(result, 2, " is coming?");
+    ASSERT_EQ(true, result.isMeCommand());
+    ASSERT_EQ(config->ownMentionAction, result.getHighlightActionOwnMention());
+}
+
+TEST_F(ChatMessageParserTest, testSoundAndNotificationOnDirectMessage) {
+    auto defaultConfiguration = std::make_shared<HighlightConfiguration>();
+    defaultConfiguration->playSoundOnIncomingDirectMessages = true;
+    defaultConfiguration->showNotificationOnIncomingDirectMessages = true;
+    defaultConfiguration->ownMentionAction.setFrontColor(std::string("black"));
+    defaultConfiguration->ownMentionAction.setBackColor(std::string("yellow"));
+    defaultConfiguration->ownMentionAction.setSoundFilePath(std::string(""));
+    defaultConfiguration->ownMentionAction.setSystemNotificationEnabled(true);
+
+    auto testling = ChatMessageParser(emoticons_, defaultConfiguration, ChatMessageParser::Mode::Chat);
+    auto result = testling.parseMessageBody("I wonder when Juliet is coming?", "Romeo");
+
+    ASSERT_EQ(std::string(""), result.getHighlightActionDirectMessage().getSoundFilePath().get_value_or(std::string("somethingElse")));
+    ASSERT_EQ(true, result.getHighlightActionDirectMessage().isSystemNotificationEnabled());
+    ASSERT_EQ(HighlightAction(), result.getHighlightActionOwnMention());
+}
+
+TEST_F(ChatMessageParserTest, testWithDefaultConfiguration) {
+    DummySettingsProvider settings;
+    HighlightManager manager(&settings);
+    manager.resetToDefaultConfiguration();
+    auto testling = ChatMessageParser(emoticons_, manager.getConfiguration(), ChatMessageParser::Mode::GroupChat);
+    testling.setNick("Juliet");
+    auto result = testling.parseMessageBody("Hello, how is it going?", "Romeo");
+    assertText(result, 0, "Hello, how is it going?");
+    ASSERT_EQ(HighlightAction(), result.getHighlightActionOwnMention());
+    ASSERT_EQ(HighlightAction(), result.getHighlightActionDirectMessage());
+    ASSERT_EQ(HighlightAction(), result.getHighlightActionGroupMessage());
+    ASSERT_EQ(HighlightAction(), result.getHighlightActionSender());
+
+    result = testling.parseMessageBody("Juliet, seen the new interface design?", "Romeo");
+    auto mentionKeywordAction = manager.getConfiguration()->ownMentionAction;
+    mentionKeywordAction.setSoundFilePath(boost::optional<std::string>());
+    mentionKeywordAction.setSystemNotificationEnabled(false);
+    assertHighlight(result, 0, "Juliet", mentionKeywordAction);
+    assertText(result, 1, ", seen the new interface design?");
+    ASSERT_EQ(manager.getConfiguration()->ownMentionAction, result.getHighlightActionOwnMention());
+    ASSERT_EQ(HighlightAction(), result.getHighlightActionDirectMessage());
+    ASSERT_EQ(HighlightAction(), result.getHighlightActionGroupMessage());
+    ASSERT_EQ(HighlightAction(), result.getHighlightActionSender());
+}