Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KDE PIM Add-ons
Commits
c5900676
Commit
c5900676
authored
Aug 23, 2021
by
Laurent Montel
😁
Browse files
Fix autotest
parent
e5006a85
Pipeline
#76177
passed with stage
in 55 minutes and 15 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
kaddressbook/plugins/mergelib/autotests/mergecontactstest.cpp
View file @
c5900676
...
...
@@ -591,7 +591,7 @@ void MergeContactsTest::shouldMergeTitle_data()
QTest
::
addColumn
<
QString
>
(
"nameItemC"
);
QTest
::
addColumn
<
bool
>
(
"isEmpty"
);
QTest
::
addColumn
<
QString
>
(
"result"
);
QTest
::
newRow
(
"empty"
)
<<
QString
()
<<
QString
()
<<
QString
()
<<
tru
e
<<
QString
();
QTest
::
newRow
(
"empty"
)
<<
QString
()
<<
QString
()
<<
QString
()
<<
fals
e
<<
QString
();
QTest
::
newRow
(
"noWithOneNameConflict"
)
<<
QString
()
<<
QString
()
<<
QStringLiteral
(
"foo"
)
<<
false
<<
QStringLiteral
(
"foo"
);
QTest
::
newRow
(
"noWithOneNameConflict1"
)
<<
QString
()
<<
QStringLiteral
(
"foo"
)
<<
QString
()
<<
false
<<
QStringLiteral
(
"foo"
);
QTest
::
newRow
(
"noWithOneNameConflict2"
)
<<
QStringLiteral
(
"foo"
)
<<
QString
()
<<
QString
()
<<
false
<<
QStringLiteral
(
"foo"
);
...
...
@@ -641,7 +641,7 @@ void MergeContactsTest::shouldMergeDepartement_data()
QTest
::
addColumn
<
QString
>
(
"nameItemC"
);
QTest
::
addColumn
<
bool
>
(
"isEmpty"
);
QTest
::
addColumn
<
QString
>
(
"result"
);
QTest
::
newRow
(
"empty"
)
<<
QString
()
<<
QString
()
<<
QString
()
<<
tru
e
<<
QString
();
QTest
::
newRow
(
"empty"
)
<<
QString
()
<<
QString
()
<<
QString
()
<<
fals
e
<<
QString
();
QTest
::
newRow
(
"noWithOneNameConflict"
)
<<
QString
()
<<
QString
()
<<
QStringLiteral
(
"foo"
)
<<
false
<<
QStringLiteral
(
"foo"
);
QTest
::
newRow
(
"noWithOneNameConflict1"
)
<<
QString
()
<<
QStringLiteral
(
"foo"
)
<<
QString
()
<<
false
<<
QStringLiteral
(
"foo"
);
QTest
::
newRow
(
"noWithOneNameConflict2"
)
<<
QStringLiteral
(
"foo"
)
<<
QString
()
<<
QString
()
<<
false
<<
QStringLiteral
(
"foo"
);
...
...
@@ -949,7 +949,7 @@ void MergeContactsTest::shouldMergeFamilyname_data()
QTest
::
addColumn
<
QString
>
(
"nameItemC"
);
QTest
::
addColumn
<
bool
>
(
"isEmpty"
);
QTest
::
addColumn
<
QString
>
(
"result"
);
QTest
::
newRow
(
"empty"
)
<<
QString
()
<<
QString
()
<<
QString
()
<<
tru
e
<<
QString
();
QTest
::
newRow
(
"empty"
)
<<
QString
()
<<
QString
()
<<
QString
()
<<
fals
e
<<
QString
();
QTest
::
newRow
(
"noWithOneNameConflict"
)
<<
QString
()
<<
QString
()
<<
QStringLiteral
(
"foo"
)
<<
false
<<
QStringLiteral
(
"foo"
);
QTest
::
newRow
(
"noWithOneNameConflict1"
)
<<
QString
()
<<
QStringLiteral
(
"foo"
)
<<
QString
()
<<
false
<<
QStringLiteral
(
"foo"
);
QTest
::
newRow
(
"noWithOneNameConflict2"
)
<<
QStringLiteral
(
"foo"
)
<<
QString
()
<<
QString
()
<<
false
<<
QStringLiteral
(
"foo"
);
...
...
@@ -999,7 +999,7 @@ void MergeContactsTest::shouldMergeBlogFeed_data()
QTest
::
addColumn
<
QString
>
(
"nameItemC"
);
QTest
::
addColumn
<
bool
>
(
"isEmpty"
);
QTest
::
addColumn
<
QString
>
(
"result"
);
QTest
::
newRow
(
"empty"
)
<<
QString
()
<<
QString
()
<<
QString
()
<<
tru
e
<<
QString
();
QTest
::
newRow
(
"empty"
)
<<
QString
()
<<
QString
()
<<
QString
()
<<
fals
e
<<
QString
();
QTest
::
newRow
(
"noWithOneNameConflict"
)
<<
QString
()
<<
QString
()
<<
QStringLiteral
(
"foo"
)
<<
false
<<
QStringLiteral
(
"foo"
);
QTest
::
newRow
(
"noWithOneNameConflict1"
)
<<
QString
()
<<
QStringLiteral
(
"foo"
)
<<
QString
()
<<
false
<<
QStringLiteral
(
"foo"
);
QTest
::
newRow
(
"noWithOneNameConflict2"
)
<<
QStringLiteral
(
"foo"
)
<<
QString
()
<<
QString
()
<<
false
<<
QStringLiteral
(
"foo"
);
...
...
@@ -1051,7 +1051,7 @@ void MergeContactsTest::shouldMergeHomePage_data()
QTest
::
addColumn
<
QUrl
>
(
"nameItemC"
);
QTest
::
addColumn
<
bool
>
(
"isEmpty"
);
QTest
::
addColumn
<
QUrl
>
(
"result"
);
QTest
::
newRow
(
"noConflict"
)
<<
QUrl
()
<<
QUrl
()
<<
QUrl
()
<<
tru
e
<<
QUrl
();
QTest
::
newRow
(
"noConflict"
)
<<
QUrl
()
<<
QUrl
()
<<
QUrl
()
<<
fals
e
<<
QUrl
();
QTest
::
newRow
(
"noWithOneNameConflict"
)
<<
QUrl
()
<<
QUrl
()
<<
QUrl
(
QStringLiteral
(
"http://www.kde.org"
))
<<
false
<<
QUrl
(
QStringLiteral
(
"http://www.kde.org"
));
QTest
::
newRow
(
"noWithOneNameConflict1"
)
<<
QUrl
()
<<
QUrl
(
QStringLiteral
(
"http://www.kde.org"
))
<<
QUrl
()
<<
false
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment