mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-22 20:35:48 +03:00
Utility::fsCasePreserving: remove UNIT_TESTING ifdef
Since the release package will be build with unit test, we don't want to query the env variable at every call to fsCasePreserving. So only test the env variable at startup. And the testutility can still change the value. (The env variable is still used from t8.pl and maybe smashbox) Issue #6318
This commit is contained in:
parent
5e2270bd57
commit
d4aebd30de
2 changed files with 17 additions and 12 deletions
|
@ -254,15 +254,17 @@ void Utility::usleep(int usec)
|
||||||
QThread::usleep(usec);
|
QThread::usleep(usec);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Utility::fsCasePreserving()
|
// This can be overriden from the tests
|
||||||
{
|
OCSYNC_EXPORT bool fsCasePreserving_override = []()-> bool {
|
||||||
#ifdef WITH_TESTING
|
|
||||||
QByteArray env = qgetenv("OWNCLOUD_TEST_CASE_PRESERVING");
|
QByteArray env = qgetenv("OWNCLOUD_TEST_CASE_PRESERVING");
|
||||||
if (!env.isEmpty())
|
if (!env.isEmpty())
|
||||||
return env.toInt();
|
return env.toInt();
|
||||||
#endif
|
return Utility::isWindows() || Utility::isMac();
|
||||||
|
}();
|
||||||
|
|
||||||
return isWindows() || isMac();
|
bool Utility::fsCasePreserving()
|
||||||
|
{
|
||||||
|
return fsCasePreserving_override;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Utility::fileNamesEqual(const QString &fn1, const QString &fn2)
|
bool Utility::fileNamesEqual(const QString &fn1, const QString &fn2)
|
||||||
|
|
|
@ -11,6 +11,10 @@
|
||||||
|
|
||||||
using namespace OCC::Utility;
|
using namespace OCC::Utility;
|
||||||
|
|
||||||
|
namespace OCC {
|
||||||
|
OCSYNC_EXPORT extern bool fsCasePreserving_override;
|
||||||
|
}
|
||||||
|
|
||||||
class TestUtility : public QObject
|
class TestUtility : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
@ -150,12 +154,12 @@ private slots:
|
||||||
|
|
||||||
void testFsCasePreserving()
|
void testFsCasePreserving()
|
||||||
{
|
{
|
||||||
qputenv("OWNCLOUD_TEST_CASE_PRESERVING", "1");
|
|
||||||
QVERIFY(fsCasePreserving());
|
|
||||||
qputenv("OWNCLOUD_TEST_CASE_PRESERVING", "0");
|
|
||||||
QVERIFY(! fsCasePreserving());
|
|
||||||
qunsetenv("OWNCLOUD_TEST_CASE_PRESERVING");
|
|
||||||
QVERIFY(isMac() || isWindows() ? fsCasePreserving() : ! fsCasePreserving());
|
QVERIFY(isMac() || isWindows() ? fsCasePreserving() : ! fsCasePreserving());
|
||||||
|
QScopedValueRollback<bool> scope(OCC::fsCasePreserving_override);
|
||||||
|
OCC::fsCasePreserving_override = 1;
|
||||||
|
QVERIFY(fsCasePreserving());
|
||||||
|
OCC::fsCasePreserving_override = 0;
|
||||||
|
QVERIFY(! fsCasePreserving());
|
||||||
}
|
}
|
||||||
|
|
||||||
void testFileNamesEqual()
|
void testFileNamesEqual()
|
||||||
|
@ -178,13 +182,12 @@ private slots:
|
||||||
QVERIFY(fileNamesEqual(a+"/test", b+"/test")); // both exist
|
QVERIFY(fileNamesEqual(a+"/test", b+"/test")); // both exist
|
||||||
QVERIFY(fileNamesEqual(a+"/test/TESTI", b+"/test/../test/TESTI")); // both exist
|
QVERIFY(fileNamesEqual(a+"/test/TESTI", b+"/test/../test/TESTI")); // both exist
|
||||||
|
|
||||||
qputenv("OWNCLOUD_TEST_CASE_PRESERVING", "1");
|
QScopedValueRollback<bool> scope(OCC::fsCasePreserving_override, true);
|
||||||
QVERIFY(fileNamesEqual(a+"/test", b+"/TEST")); // both exist
|
QVERIFY(fileNamesEqual(a+"/test", b+"/TEST")); // both exist
|
||||||
|
|
||||||
QVERIFY(!fileNamesEqual(a+"/test", b+"/test/TESTI")); // both are different
|
QVERIFY(!fileNamesEqual(a+"/test", b+"/test/TESTI")); // both are different
|
||||||
|
|
||||||
dir.remove();
|
dir.remove();
|
||||||
qunsetenv("OWNCLOUD_TEST_CASE_PRESERVING");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue