summaryrefslogtreecommitdiffstats
path: root/tests/tst_pathutils.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-17 02:09:58 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-20 23:04:11 +0100
commitd6c71488b34a2854461feee3296c11568542ecbe (patch)
tree9486ced2bfb437178d1abe827dc29f00edd7783d /tests/tst_pathutils.cpp
parent20e86801b3cc889a07cd8eef744b06b77a2239cc (diff)
downloadMultiMC-d6c71488b34a2854461feee3296c11568542ecbe.tar
MultiMC-d6c71488b34a2854461feee3296c11568542ecbe.tar.gz
MultiMC-d6c71488b34a2854461feee3296c11568542ecbe.tar.lz
MultiMC-d6c71488b34a2854461feee3296c11568542ecbe.tar.xz
MultiMC-d6c71488b34a2854461feee3296c11568542ecbe.zip
Some test madness
Diffstat (limited to 'tests/tst_pathutils.cpp')
-rw-r--r--tests/tst_pathutils.cpp32
1 files changed, 15 insertions, 17 deletions
diff --git a/tests/tst_pathutils.cpp b/tests/tst_pathutils.cpp
index 1e4a83bf..a1310d00 100644
--- a/tests/tst_pathutils.cpp
+++ b/tests/tst_pathutils.cpp
@@ -23,13 +23,12 @@ slots:
QTest::addColumn<QString>("path1");
QTest::addColumn<QString>("path2");
-#if defined(Q_OS_UNIX)
- QTest::newRow("unix 1") << "/abc/def/ghi/jkl" << "/abc/def" << "ghi/jkl";
- QTest::newRow("unix 2") << "/abc/def/ghi/jkl" << "/abc/def/" << "ghi/jkl";
-#elif defined(Q_OS_WIN)
- QTest::newRow("win, from C:") << "C:\\abc" << "C:" << "abc\\def";
- QTest::newRow("win 1") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc\\def" << "ghi\\jkl";
- QTest::newRow("win 2") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc\\def\\" << "ghi\\jkl";
+ QTest::newRow("qt 1") << "/abc/def/ghi/jkl" << "/abc/def" << "ghi/jkl";
+ QTest::newRow("qt 2") << "/abc/def/ghi/jkl" << "/abc/def/" << "ghi/jkl";
+#if defined(Q_OS_WIN)
+ QTest::newRow("win native, from C:") << "C:/abc" << "C:" << "abc";
+ QTest::newRow("win native 1") << "C:/abc/def/ghi/jkl" << "C:\\abc\\def" << "ghi\\jkl";
+ QTest::newRow("win native 2") << "C:/abc/def/ghi/jkl" << "C:\\abc\\def\\" << "ghi\\jkl";
#endif
}
void test_PathCombine1()
@@ -48,16 +47,15 @@ slots:
QTest::addColumn<QString>("path2");
QTest::addColumn<QString>("path3");
-#if defined(Q_OS_UNIX)
- QTest::newRow("unix 1") << "/abc/def/ghi/jkl" << "/abc" << "def" << "ghi/jkl";
- QTest::newRow("unix 2") << "/abc/def/ghi/jkl" << "/abc/" << "def" << "ghi/jkl";
- QTest::newRow("unix 3") << "/abc/def/ghi/jkl" << "/abc" << "def/" << "ghi/jkl";
- QTest::newRow("unix 4") << "/abc/def/ghi/jkl" << "/abc/" << "def/" << "ghi/jkl";
-#elif defined(Q_OS_WIN)
- QTest::newRow("win 1") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc" << "def" << "ghi\\jkl";
- QTest::newRow("win 2") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
- QTest::newRow("win 3") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc" << "def\\" << "ghi\\jkl";
- QTest::newRow("win 4") << "C:\\abc\\def\\ghi\\jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
+ QTest::newRow("qt 1") << "/abc/def/ghi/jkl" << "/abc" << "def" << "ghi/jkl";
+ QTest::newRow("qt 2") << "/abc/def/ghi/jkl" << "/abc/" << "def" << "ghi/jkl";
+ QTest::newRow("qt 3") << "/abc/def/ghi/jkl" << "/abc" << "def/" << "ghi/jkl";
+ QTest::newRow("qt 4") << "/abc/def/ghi/jkl" << "/abc/" << "def/" << "ghi/jkl";
+#if defined(Q_OS_WIN)
+ QTest::newRow("win 1") << "C:/abc/def/ghi/jkl" << "C:\\abc" << "def" << "ghi\\jkl";
+ QTest::newRow("win 2") << "C:/abc/def/ghi/jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
+ QTest::newRow("win 3") << "C:/abc/def/ghi/jkl" << "C:\\abc" << "def\\" << "ghi\\jkl";
+ QTest::newRow("win 4") << "C:/abc/def/ghi/jkl" << "C:\\abc\\" << "def" << "ghi\\jkl";
#endif
}
void test_PathCombine2()