From 749e97db2ba6276f23d84f21ecc863aa7def9483 Mon Sep 17 00:00:00 2001
From: Leandro Melo <leandro.melo@nokia.com>
Date: Wed, 16 Jun 2010 09:05:52 +0200
Subject: [PATCH] Fixing unit test due to change in the Highlighter's
constructor.
---
.../generichighlighter/highlighterengine/highlightermock.cpp | 5 ++---
.../generichighlighter/highlighterengine/highlightermock.h | 3 +--
.../highlighterengine/tst_highlighterengine.cpp | 3 ++-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp b/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp
index f3de75d19b4..d558a9eb418 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp
+++ b/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp
@@ -47,9 +47,8 @@ char *toString(const QTextCharFormat &format)
using namespace TextEditor;
using namespace Internal;
-HighlighterMock::HighlighterMock(const QSharedPointer<Context> &defaultContext,
- QTextDocument *parent) :
- Highlighter(defaultContext, parent),
+HighlighterMock::HighlighterMock(QTextDocument *parent) :
+ Highlighter(parent),
m_debugDetails(false),
m_statesCounter(0),
m_formatsCounter(0),
diff --git a/tests/auto/generichighlighter/highlighterengine/highlightermock.h b/tests/auto/generichighlighter/highlighterengine/highlightermock.h
index cd8cdb84072..e2be96505d6 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlightermock.h
+++ b/tests/auto/generichighlighter/highlighterengine/highlightermock.h
@@ -61,8 +61,7 @@ struct HighlightSequence
class HighlighterMock : public TextEditor::Internal::Highlighter
{
public:
- HighlighterMock(const QSharedPointer<TextEditor::Internal::Context> &defaultContext,
- QTextDocument *parent = 0);
+ HighlighterMock(QTextDocument *parent = 0);
void reset();
void showDebugDetails();
diff --git a/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp b/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp
index d771ea9956f..8e402f8b8b0 100644
--- a/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp
+++ b/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp
@@ -122,7 +122,8 @@ void tst_HighlighterEngine::initTestCase()
createContexts();
createItemDatas();
- m_highlighterMock.reset(new HighlighterMock(m_definition->initialContext()));
+ m_highlighterMock.reset(new HighlighterMock());
+ m_highlighterMock->setDefaultContext(m_definition->initialContext());
m_highlighterMock->setDocument(m_text.document());
m_highlighterMock->configureFormat(Highlighter::Keyword, Formats::instance().keywordFormat());
m_highlighterMock->configureFormat(Highlighter::DataType, Formats::instance().dataTypeFormat());
--
GitLab