Commit 64fe884b authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Tobias Hunger

VCS: Fix tests

Some editors were removed, adapt indices

Change-Id: I87ab8c3aa8c6e9ccad494527ec93a171f90ecf83
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 5b648d8b
...@@ -606,7 +606,7 @@ void BazaarPlugin::testDiffFileResolving_data() ...@@ -606,7 +606,7 @@ void BazaarPlugin::testDiffFileResolving_data()
void BazaarPlugin::testDiffFileResolving() void BazaarPlugin::testDiffFileResolving()
{ {
BazaarEditor editor(editorParameters + 3, 0); BazaarEditor editor(editorParameters + 2, 0);
editor.testDiffFileResolving(); editor.testDiffFileResolving();
} }
...@@ -630,7 +630,7 @@ void BazaarPlugin::testLogResolving() ...@@ -630,7 +630,7 @@ void BazaarPlugin::testLogResolving()
" (gz) Set approved revision and vote \"Approve\" when using lp-propose\n" " (gz) Set approved revision and vote \"Approve\" when using lp-propose\n"
" --approve (Jonathan Lange)\n" " --approve (Jonathan Lange)\n"
); );
BazaarEditor editor(editorParameters + 1, 0); BazaarEditor editor(editorParameters, 0);
editor.testLogResolving(data, "6572", "6571"); editor.testLogResolving(data, "6572", "6571");
} }
#endif #endif
......
...@@ -2094,7 +2094,7 @@ void ClearCasePlugin::testDiffFileResolving_data() ...@@ -2094,7 +2094,7 @@ void ClearCasePlugin::testDiffFileResolving_data()
void ClearCasePlugin::testDiffFileResolving() void ClearCasePlugin::testDiffFileResolving()
{ {
ClearCaseEditor editor(editorParameters + 3, 0); ClearCaseEditor editor(editorParameters + 2, 0);
editor.testDiffFileResolving(); editor.testDiffFileResolving();
} }
...@@ -2104,7 +2104,7 @@ void ClearCasePlugin::testLogResolving() ...@@ -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" "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" "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, editor.testLogResolving(data,
"src/plugins/clearcase/clearcaseeditor.h@@/main/branch1/branch2/9", "src/plugins/clearcase/clearcaseeditor.h@@/main/branch1/branch2/9",
"src/plugins/clearcase/clearcaseeditor.h@@/main/branch1/branch2/8"); "src/plugins/clearcase/clearcaseeditor.h@@/main/branch1/branch2/8");
......
...@@ -707,7 +707,7 @@ void MercurialPlugin::testDiffFileResolving_data() ...@@ -707,7 +707,7 @@ void MercurialPlugin::testDiffFileResolving_data()
void MercurialPlugin::testDiffFileResolving() void MercurialPlugin::testDiffFileResolving()
{ {
MercurialEditor editor(editorParameters + 3, 0); MercurialEditor editor(editorParameters + 2, 0);
editor.testDiffFileResolving(); editor.testDiffFileResolving();
} }
...@@ -728,7 +728,7 @@ void MercurialPlugin::testLogResolving() ...@@ -728,7 +728,7 @@ void MercurialPlugin::testLogResolving()
"date: Sat Jan 19 04:08:16 2013 +0100\n" "date: Sat Jan 19 04:08:16 2013 +0100\n"
"summary: test-rebase: add another test for rebase with multiple roots\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"); editor.testLogResolving(data, "18473:692cbda1eb50", "18472:37100f30590f");
} }
#endif #endif
......
...@@ -1530,7 +1530,7 @@ void PerforcePlugin::testLogResolving() ...@@ -1530,7 +1530,7 @@ void PerforcePlugin::testLogResolving()
"\n" "\n"
" Comment\n" " Comment\n"
); );
PerforceEditor editor(editorParameters + 1, 0); PerforceEditor editor(editorParameters, 0);
editor.testLogResolving(data, "12345", "12344"); editor.testLogResolving(data, "12345", "12344");
} }
#endif #endif
......
...@@ -1417,7 +1417,7 @@ void SubversionPlugin::testDiffFileResolving_data() ...@@ -1417,7 +1417,7 @@ void SubversionPlugin::testDiffFileResolving_data()
void SubversionPlugin::testDiffFileResolving() void SubversionPlugin::testDiffFileResolving()
{ {
SubversionEditor editor(editorParameters + 3, 0); SubversionEditor editor(editorParameters + 2, 0);
editor.testDiffFileResolving(); editor.testDiffFileResolving();
} }
...@@ -1439,7 +1439,7 @@ void SubversionPlugin::testLogResolving() ...@@ -1439,7 +1439,7 @@ void SubversionPlugin::testLogResolving()
" expectations, remove XFail.\n" " expectations, remove XFail.\n"
"\n" "\n"
); );
SubversionEditor editor(editorParameters + 1, 0); SubversionEditor editor(editorParameters, 0);
editor.testLogResolving(data, "r1439551", "r1439540"); editor.testLogResolving(data, "r1439551", "r1439540");
} }
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment