forked from qt-creator/qt-creator
VCS: Un-static testDiffFileResolving
Change-Id: I43c40585e5ac50369422d78f74240d7249be95ae Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
ce4ead4001
commit
ea33bed564
@@ -622,7 +622,7 @@ void BazaarPlugin::testDiffFileResolving_data()
|
||||
void BazaarPlugin::testDiffFileResolving()
|
||||
{
|
||||
BazaarEditor editor(editorParameters + 3, 0);
|
||||
VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
|
||||
editor.testDiffFileResolving();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1961,7 +1961,7 @@ void ClearCasePlugin::testDiffFileResolving_data()
|
||||
void ClearCasePlugin::testDiffFileResolving()
|
||||
{
|
||||
ClearCaseEditor editor(editorParameters + 3, 0);
|
||||
VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
|
||||
editor.testDiffFileResolving();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1398,7 +1398,7 @@ void CvsPlugin::testDiffFileResolving_data()
|
||||
void CvsPlugin::testDiffFileResolving()
|
||||
{
|
||||
CvsEditor editor(editorParameters + 3, 0);
|
||||
VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
|
||||
editor.testDiffFileResolving();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1312,7 +1312,7 @@ void GitPlugin::testDiffFileResolving_data()
|
||||
void GitPlugin::testDiffFileResolving()
|
||||
{
|
||||
GitEditor editor(editorParameters + 3, 0);
|
||||
VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
|
||||
editor.testDiffFileResolving();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -718,7 +718,7 @@ void MercurialPlugin::testDiffFileResolving_data()
|
||||
void MercurialPlugin::testDiffFileResolving()
|
||||
{
|
||||
MercurialEditor editor(editorParameters + 3, 0);
|
||||
VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
|
||||
editor.testDiffFileResolving();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1425,7 +1425,7 @@ void SubversionPlugin::testDiffFileResolving_data()
|
||||
void SubversionPlugin::testDiffFileResolving()
|
||||
{
|
||||
SubversionEditor editor(editorParameters + 3, 0);
|
||||
VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor);
|
||||
editor.testDiffFileResolving();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1528,14 +1528,14 @@ Core::IEditor* VcsBaseEditorWidget::locateEditorByTag(const QString &tag)
|
||||
#ifdef WITH_TESTS
|
||||
#include <QTest>
|
||||
|
||||
void VcsBase::VcsBaseEditorWidget::testDiffFileResolving(VcsBaseEditorWidget *editor)
|
||||
void VcsBase::VcsBaseEditorWidget::testDiffFileResolving()
|
||||
{
|
||||
QFETCH(QByteArray, header);
|
||||
QFETCH(QByteArray, fileName);
|
||||
QTextDocument doc(QString::fromLatin1(header));
|
||||
editor->init();
|
||||
init();
|
||||
QTextBlock block = doc.lastBlock();
|
||||
QVERIFY(editor->fileNameFromDiffSpecification(block).endsWith(QString::fromLatin1(fileName)));
|
||||
QVERIFY(fileNameFromDiffSpecification(block).endsWith(QString::fromLatin1(fileName)));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -275,7 +275,7 @@ private:
|
||||
|
||||
#ifdef WITH_TESTS
|
||||
public:
|
||||
static void testDiffFileResolving(VcsBaseEditorWidget *editor);
|
||||
void testDiffFileResolving();
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user