feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Add diff pattern tests for CVS and Mercurial

Browse Source 
* Fix Mercurial pattern
* Make fileNameFromDiffSpecification protected again (it was made
  public for running tests, but they are now run from VCSBaseEditor)
* Remove DiffHighlighter::filePattern(). Not used anymore.

Change-Id: Ifc99f761f0ab96cc79f1d018e3f3c8cf4603da10
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-21 22:56:01 +02:00
committed by Tobias Hunger
parent 23844410fd
commit 3b66b11ac4
8 changed files with 77 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -685,4 +685,41 @@ void MercurialPlugin::updateActions(VcsBasePlugin::ActionState as)
repoAction->setEnabled(repoEnabled);
}
#ifdef WITH_TESTS
#include <QTest>
void MercurialPlugin::testDiffFileResolving_data()
{
QTest::addColumn<QByteArray>("header");
QTest::addColumn<QByteArray>("fileName");
QTest::newRow("New") << QByteArray(
"diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp\n"
"new file mode 100644\n"
"--- /dev/null\n"
"+++ b/src/plugins/mercurial/mercurialeditor.cpp\n"
"@@ -0,0 +1,112 @@\n\n")
<< QByteArray("src/plugins/mercurial/mercurialeditor.cpp");
QTest::newRow("Deleted") << QByteArray(
"diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp\n"
"deleted file mode 100644\n"
"--- a/src/plugins/mercurial/mercurialeditor.cpp\n"
"+++ /dev/null\n"
"@@ -1,112 +0,0 @@\n\n")
<< QByteArray("src/plugins/mercurial/mercurialeditor.cpp");
QTest::newRow("Normal") << QByteArray(
"diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp\n"
"--- a/src/plugins/mercurial/mercurialeditor.cpp\n"
"+++ b/src/plugins/mercurial/mercurialeditor.cpp\n"
"@@ -49,6 +49,8 @@\n\n")
<< QByteArray("src/plugins/mercurial/mercurialeditor.cpp");
}
void MercurialPlugin::testDiffFileResolving()
{
MercurialEditor editor(editorParameters + 3, 0);
VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
}
#endif
Q_EXPORT_PLUGIN(MercurialPlugin)