diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-01-19 23:19:38 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-01-21 12:19:55 +0100 |
| commit | 7b39f41c052e219ae708cf8429d3b5e30bf4819e (patch) | |
| tree | ffede11e2faaa42dd2209b63578524cdec2a1c69 /src/plugins/bazaar/bazaarplugin.cpp | |
| parent | 57ee50d52fe405670c2558c72ace91d44fb7d71f (diff) | |
| download | qt-creator-7b39f41c052e219ae708cf8429d3b5e30bf4819e.tar.gz | |
VCS: Refactor fileNameFromDiffSpecification
Use diff file pattern to match file name. Avoid duplication.
Include unit tests for Git
Change-Id: Ib68a08368270a27976a3e16bdd1cb219a52b8889
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/bazaar/bazaarplugin.cpp')
| -rw-r--r-- | src/plugins/bazaar/bazaarplugin.cpp | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 618b9d3ca7..bfee3ee634 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -591,6 +591,41 @@ void BazaarPlugin::diffFromEditorSelected(const QStringList &files) m_client->diff(m_submitRepository, files); } +#ifdef WITH_TESTS +#include <QTest> + +void BazaarPlugin::testDiffFileResolving_data() +{ + QTest::addColumn<QByteArray>("header"); + QTest::addColumn<QByteArray>("fileName"); + + QTest::newRow("New") << QByteArray( + "=== added file 'src/plugins/bazaar/bazaareditor.cpp'\n" + "--- src/plugins/bazaar/bazaareditor.cpp\t1970-01-01 00:00:00 +0000\n" + "+++ src/plugins/bazaar/bazaareditor.cpp\t2013-01-20 21:39:47 +0000\n" + "@@ -0,0 +1,121 @@\n\n") + << QByteArray("src/plugins/bazaar/bazaareditor.cpp"); + QTest::newRow("Deleted") << QByteArray( + "=== removed file 'src/plugins/bazaar/bazaareditor.cpp'\n" + "--- src/plugins/bazaar/bazaareditor.cpp\t2013-01-20 21:39:47 +0000\n" + "+++ src/plugins/bazaar/bazaareditor.cpp\t1970-01-01 00:00:00 +0000\n" + "@@ -1,121 +0,0 @@\n\n") + << QByteArray("src/plugins/bazaar/bazaareditor.cpp"); + QTest::newRow("Modified") << QByteArray( + "=== modified file 'src/plugins/bazaar/bazaareditor.cpp'\n" + "--- src/plugins/bazaar/bazaareditor.cpp\t2010-08-27 14:12:44 +0000\n" + "+++ src/plugins/bazaar/bazaareditor.cpp\t2011-02-28 21:24:19 +0000\n" + "@@ -727,6 +727,9 @@\n\n") + << QByteArray("src/plugins/bazaar/bazaareditor.cpp"); +} + +void BazaarPlugin::testDiffFileResolving() +{ + BazaarEditor editor(editorParameters + 3, 0); + VcsBase::VcsBaseEditorWidget::testDiffFileResolving(&editor); +} +#endif + void BazaarPlugin::commitFromEditor() { // Close the submit editor |