summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrasanth Ullattil <prasanth.ullattil@nokia.com>2010-09-15 12:59:38 (GMT)
committerPrasanth Ullattil <prasanth.ullattil@nokia.com>2010-09-15 16:56:43 (GMT)
commitfd4463c07f577d9df212388062028f9119e19add (patch)
tree406671fdc1a87c582fb83b0a6bf573194e229a55
parent925194abd863057618f39dd1289e574dc2a34208 (diff)
downloadQt-fd4463c07f577d9df212388062028f9119e19add.zip
Qt-fd4463c07f577d9df212388062028f9119e19add.tar.gz
Qt-fd4463c07f577d9df212388062028f9119e19add.tar.bz2
Fix tst_QFileSystemEntry::getSetCheck() on windows.
Updated the name of the data field. Reviewed-by: Joao
-rw-r--r--tests/auto/qfilesystementry/tst_qfilesystementry.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qfilesystementry/tst_qfilesystementry.cpp b/tests/auto/qfilesystementry/tst_qfilesystementry.cpp
index e00a214..49afab6 100644
--- a/tests/auto/qfilesystementry/tst_qfilesystementry.cpp
+++ b/tests/auto/qfilesystementry/tst_qfilesystementry.cpp
@@ -123,7 +123,7 @@ void tst_QFileSystemEntry::getSetCheck()
QFETCH(QString, internalnativeFilePath);
QFETCH(QString, filepath);
QFETCH(QString, filename);
- QFETCH(QString, basename);
+ QFETCH(QString, baseName);
QFETCH(QString, completeBasename);
QFETCH(QString, suffix);
QFETCH(QString, completeSuffix);
@@ -137,7 +137,7 @@ void tst_QFileSystemEntry::getSetCheck()
QCOMPARE(entry1.completeSuffix(), completeSuffix);
QCOMPARE(entry1.isAbsolute(), absolute);
QCOMPARE(entry1.isRelative(), !absolute);
- QCOMPARE(entry1.baseName(), basename);
+ QCOMPARE(entry1.baseName(), baseName);
QCOMPARE(entry1.completeBaseName(), completeBasename);
QFileSystemEntry entry2(nativeFilePath, QFileSystemEntry::FromNativePath());
@@ -150,7 +150,7 @@ void tst_QFileSystemEntry::getSetCheck()
// the object shouldnot change nativeFilePath.
QCOMPARE(entry2.nativeFilePath(), nativeFilePath);
QCOMPARE(entry2.fileName(), filename);
- QCOMPARE(entry2.baseName(), basename);
+ QCOMPARE(entry2.baseName(), baseName);
QCOMPARE(entry2.completeBaseName(), completeBasename);
}