D17130: Fix projectmodel unittest to work on Windows.

[Morten Volden]

volden created this revision.
volden added a reviewer: KDevelop.
Herald added a project: KDevelop.
volden requested review of this revision.

REVISION SUMMARY
Fix projectmodel unittest to work on Windows. Use paths according to the platform we are using

TEST PLAN
Compile and test on Windows (Debug build) to see the unittests are passing. Compile and test on Linux to see that the test pass (As before)

REPOSITORY
R32 KDevelop

BRANCH
fixProjectModelTest (branched from master)

REVISION DETAIL
https://phabricator.kde.org/D17130

AFFECTED FILES
kdevplatform/project/tests/test_projectmodel.cpp
kdevplatform/util/path.cpp

To: volden, #kdevelop
Cc: kdevelop-devel, glebaccon, antismap, iodelay, vbspam, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd

[Morten Volden]

volden updated this revision to Diff 46106.
volden added a comment.


Renaming to prependPathRoot

REPOSITORY
R32 KDevelop

CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D17130?vs=46101&id=46106

BRANCH
fixProjectModelTest (branched from master)

REVISION DETAIL
https://phabricator.kde.org/D17130

AFFECTED FILES
kdevplatform/project/tests/test_projectmodel.cpp
kdevplatform/util/path.cpp

To: volden, #kdevelop
Cc: kdevelop-devel, glebaccon, antismap, iodelay, vbspam, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd

[Morten Volden]

volden updated this revision to Diff 46211.
volden added a comment.


Prefer QDir::rootPath() to poluting our files with define macros

REPOSITORY
R32 KDevelop

CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D17130?vs=46106&id=46211

BRANCH
fixProjectModelTest (branched from master)

REVISION DETAIL
https://phabricator.kde.org/D17130

AFFECTED FILES
kdevplatform/project/tests/test_projectmodel.cpp
kdevplatform/util/path.cpp

To: volden, #kdevelop
Cc: kdevelop-devel, glebaccon, antismap, iodelay, vbspam, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd

[Kevin Funk]

kfunk accepted this revision.
This revision is now accepted and ready to land.

REPOSITORY
R32 KDevelop

BRANCH
fixProjectModelTest (branched from master)

REVISION DETAIL
https://phabricator.kde.org/D17130

To: volden, #kdevelop, kfunk
Cc: kdevelop-devel, glebaccon, antismap, iodelay, vbspam, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd

[Morten Volden]

volden added a comment.


@kfunk Land on 5.3 and merge to master? (For this and the other ones?)

REPOSITORY
R32 KDevelop

BRANCH
fixProjectModelTest (branched from master)

REVISION DETAIL
https://phabricator.kde.org/D17130

To: volden, #kdevelop, kfunk
Cc: kdevelop-devel, glebaccon, antismap, iodelay, vbspam, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd

[Kevin Funk]

kfunk added a comment.


Yes, please.

REPOSITORY
R32 KDevelop

BRANCH
fixProjectModelTest (branched from master)

REVISION DETAIL
https://phabricator.kde.org/D17130

To: volden, #kdevelop, kfunk
Cc: kdevelop-devel, glebaccon, antismap, iodelay, vbspam, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd

[Morten Volden]

This revision was automatically updated to reflect the committed changes.
Closed by commit R32:de81ab5c5b48: Fix projectmodel unittest to work on Windows. (authored by volden).

CHANGED PRIOR TO COMMIT
https://phabricator.kde.org/D17130?vs=46211&id=46250#toc

REPOSITORY
R32 KDevelop

CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D17130?vs=46211&id=46250

REVISION DETAIL
https://phabricator.kde.org/D17130

AFFECTED FILES
kdevplatform/project/tests/test_projectmodel.cpp
kdevplatform/util/path.cpp

To: volden, #kdevelop, kfunk
Cc: kdevelop-devel, glebaccon, antismap, iodelay, vbspam, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd

[Kevin Funk]

kfunk added inline comments.

INLINE COMMENTS

path.cpp:163
+ if(!data.at(0).endsWith(QLatin1Char(':'))) {
+ qWarning("Path::generatePathOrUrl: invalid Windows drive encountered (expected C: or similar): \"%s\"",
+ qPrintable(data.at(0)));

Ah, one thing: Could you use `qCWarning(UTIL)` here?

REPOSITORY
R32 KDevelop

REVISION DETAIL
https://phabricator.kde.org/D17130

To: volden, #kdevelop, kfunk
Cc: kdevelop-devel, glebaccon, antismap, iodelay, vbspam, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd

[Morten Volden]

volden added inline comments.

INLINE COMMENTS

kfunk wrote in path.cpp:163
Ah, one thing: Could you use `qCWarning(UTIL)` here?

Sure. Will fix that now.

REPOSITORY
R32 KDevelop

REVISION DETAIL
https://phabricator.kde.org/D17130

To: volden, #kdevelop, kfunk
Cc: kdevelop-devel, glebaccon, antismap, iodelay, vbspam, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd