From 64fe884bbc39f01ed176aac91cc64e53f5ae2d66 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 27 May 2013 18:34:02 +0300
Subject: [PATCH] VCS: Fix tests

Some editors were removed, adapt indices

Change-Id: I87ab8c3aa8c6e9ccad494527ec93a171f90ecf83
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/bazaar/bazaarplugin.cpp         | 4 ++--
 src/plugins/clearcase/clearcaseplugin.cpp   | 4 ++--
 src/plugins/mercurial/mercurialplugin.cpp   | 4 ++--
 src/plugins/perforce/perforceplugin.cpp     | 2 +-
 src/plugins/subversion/subversionplugin.cpp | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index f4a3ebd0b7..ebf104bc97 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -606,7 +606,7 @@ void BazaarPlugin::testDiffFileResolving_data()
 
 void BazaarPlugin::testDiffFileResolving()
 {
-    BazaarEditor editor(editorParameters + 3, 0);
+    BazaarEditor editor(editorParameters + 2, 0);
     editor.testDiffFileResolving();
 }
 
@@ -630,7 +630,7 @@ void BazaarPlugin::testLogResolving()
                 "  (gz) Set approved revision and vote \"Approve\" when using lp-propose\n"
                 "   --approve (Jonathan Lange)\n"
                 );
-    BazaarEditor editor(editorParameters + 1, 0);
+    BazaarEditor editor(editorParameters, 0);
     editor.testLogResolving(data, "6572", "6571");
 }
 #endif
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index a31f6e26dc..d7614bf67e 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -2094,7 +2094,7 @@ void ClearCasePlugin::testDiffFileResolving_data()
 
 void ClearCasePlugin::testDiffFileResolving()
 {
-    ClearCaseEditor editor(editorParameters + 3, 0);
+    ClearCaseEditor editor(editorParameters + 2, 0);
     editor.testDiffFileResolving();
 }
 
@@ -2104,7 +2104,7 @@ void ClearCasePlugin::testLogResolving()
                 "13-Sep.17:41   user1      create version \"src/plugins/clearcase/clearcaseeditor.h@@/main/branch1/branch2/9\" (baseline1, baseline2, ...)\n"
                 "22-Aug.14:13   user2      create version \"src/plugins/clearcase/clearcaseeditor.h@@/main/branch1/branch2/8\" (baseline3, baseline4, ...)\n"
                 );
-    ClearCaseEditor editor(editorParameters + 1, 0);
+    ClearCaseEditor editor(editorParameters, 0);
     editor.testLogResolving(data,
                             "src/plugins/clearcase/clearcaseeditor.h@@/main/branch1/branch2/9",
                             "src/plugins/clearcase/clearcaseeditor.h@@/main/branch1/branch2/8");
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index b651afe55d..e53009f4b4 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -707,7 +707,7 @@ void MercurialPlugin::testDiffFileResolving_data()
 
 void MercurialPlugin::testDiffFileResolving()
 {
-    MercurialEditor editor(editorParameters + 3, 0);
+    MercurialEditor editor(editorParameters + 2, 0);
     editor.testDiffFileResolving();
 }
 
@@ -728,7 +728,7 @@ void MercurialPlugin::testLogResolving()
                 "date:        Sat Jan 19 04:08:16 2013 +0100\n"
                 "summary:     test-rebase: add another test for rebase with multiple roots\n"
                 );
-    MercurialEditor editor(editorParameters + 1, 0);
+    MercurialEditor editor(editorParameters, 0);
     editor.testLogResolving(data, "18473:692cbda1eb50", "18472:37100f30590f");
 }
 #endif
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index d90c3ab0c5..70c573c883 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1530,7 +1530,7 @@ void PerforcePlugin::testLogResolving()
                 "\n"
                 "        Comment\n"
                 );
-    PerforceEditor editor(editorParameters + 1, 0);
+    PerforceEditor editor(editorParameters, 0);
     editor.testLogResolving(data, "12345", "12344");
 }
 #endif
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 5a9a82b145..047210732b 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -1417,7 +1417,7 @@ void SubversionPlugin::testDiffFileResolving_data()
 
 void SubversionPlugin::testDiffFileResolving()
 {
-    SubversionEditor editor(editorParameters + 3, 0);
+    SubversionEditor editor(editorParameters + 2, 0);
     editor.testDiffFileResolving();
 }
 
@@ -1439,7 +1439,7 @@ void SubversionPlugin::testLogResolving()
                 "   expectations, remove XFail.\n"
                 "\n"
                 );
-    SubversionEditor editor(editorParameters + 1, 0);
+    SubversionEditor editor(editorParameters, 0);
     editor.testLogResolving(data, "r1439551", "r1439540");
 }
 #endif
-- 
GitLab