SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / tests / draganddrophelpertest.cpp

diff --git a/src/tests/draganddrophelpertest.cpp b/src/tests/draganddrophelpertest.cpp
index a82e75c7b814bbccc45c1ea0cce58d860420cb22..f2c75fef0db4e10914662fd97de17deae3231e46 100644 (file)
--- a/src/tests/draganddrophelpertest.cpp
+++ b/src/tests/draganddrophelpertest.cpp
@@ -29,35 +29,18 @@ void DragAndDropHelperTest::testUrlListMatchesUrl_data()
     QTest::addColumn<QUrl>("url");
     QTest::addColumn<bool>("expected");
 
     QTest::addColumn<QUrl>("url");
     QTest::addColumn<bool>("expected");
 

-    QTest::newRow("test_equal")
-            << QList<QUrl> {QUrl::fromLocalFile("/root")}
-            << QUrl::fromLocalFile("/root")
-            << true;
+    QTest::newRow("test_equal") << QList<QUrl>{QUrl::fromLocalFile("/root")} << QUrl::fromLocalFile("/root") << true;

 
 

-    QTest::newRow("test_trailing_slash")
-            << QList<QUrl> {QUrl::fromLocalFile("/root/")}
-            << QUrl::fromLocalFile("/root")
-            << true;
+    QTest::newRow("test_trailing_slash") << QList<QUrl>{QUrl::fromLocalFile("/root/")} << QUrl::fromLocalFile("/root") << true;

 
 

-    QTest::newRow("test_ftp_scheme")
-            << QList<QUrl> {QUrl("ftp://server:2211/dir")}
-            << QUrl("ftp://server:2211/dir")
-            << true;
+    QTest::newRow("test_ftp_scheme") << QList<QUrl>{QUrl("ftp://server:2211/dir")} << QUrl("ftp://server:2211/dir") << true;

 
 

-    QTest::newRow("test_not_matched")
-            << QList<QUrl> {QUrl::fromLocalFile("/usr/share"), QUrl::fromLocalFile("/usr/local/bin")}
-            << QUrl::fromLocalFile("/usr/bin")
-            << false;
+    QTest::newRow("test_not_matched") << QList<QUrl>{QUrl::fromLocalFile("/usr/share"), QUrl::fromLocalFile("/usr/local/bin")}
+                                      << QUrl::fromLocalFile("/usr/bin") << false;

 
 

-    QTest::newRow("test_empty_target")
-            << QList<QUrl> {QUrl::fromLocalFile("/usr/share"), QUrl::fromLocalFile("/usr/local/bin")}
-            << QUrl()
-            << false;
+    QTest::newRow("test_empty_target") << QList<QUrl>{QUrl::fromLocalFile("/usr/share"), QUrl::fromLocalFile("/usr/local/bin")} << QUrl() << false;

 
 

-    QTest::newRow("test_empty_list")
-            << QList<QUrl>()
-            << QUrl::fromLocalFile("/usr/bin")
-            << false;
+    QTest::newRow("test_empty_list") << QList<QUrl>() << QUrl::fromLocalFile("/usr/bin") << false;

 }
 
 void DragAndDropHelperTest::testUrlListMatchesUrl()
 }
 
 void DragAndDropHelperTest::testUrlListMatchesUrl()


@@ -69,7 +52,6 @@ void DragAndDropHelperTest::testUrlListMatchesUrl()
     QCOMPARE(DragAndDropHelper::urlListMatchesUrl(urlList, url), expected);
 }
 
     QCOMPARE(DragAndDropHelper::urlListMatchesUrl(urlList, url), expected);
 }
 

-

 QTEST_MAIN(DragAndDropHelperTest)
 
 #include "draganddrophelpertest.moc"
 QTEST_MAIN(DragAndDropHelperTest)
 
 #include "draganddrophelpertest.moc"