mirror of
https://github.com/chylex/Nextcloud-Desktop.git
synced 2024-11-26 22:42:44 +01:00
ec86d1a151
The owncloud wizard already created the directory, but the recent addition of FolderMan::checkPathValidityForNewFolder stopped allowing unexisting directories. So change FolderMan::checkPathValidityForNewFolder to allow non existing directory and whange the FolderWizard to create the directory if it does not exist. Issue #3492
122 lines
4.9 KiB
C++
122 lines
4.9 KiB
C++
/*
|
|
* This software is in the public domain, furnished "as is", without technical
|
|
* support, and with no warranty, express or implied, as to its usefulness for
|
|
* any purpose.
|
|
*
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <qglobal.h>
|
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
|
|
#include <QTemporaryDir>
|
|
#endif
|
|
#include <QtTest>
|
|
|
|
#include "utility.h"
|
|
#include "folderman.h"
|
|
#include "accountstate.h"
|
|
|
|
using namespace OCC;
|
|
|
|
|
|
static FolderDefinition folderDefinition(const QString &path) {
|
|
FolderDefinition d;
|
|
d.localPath = path;
|
|
d.targetPath = path;
|
|
d.alias = path;
|
|
return d;
|
|
}
|
|
|
|
|
|
class TestFolderMan: public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
FolderMan _fm;
|
|
|
|
private slots:
|
|
void testCheckPathValidityForNewFolder()
|
|
{
|
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
|
|
QTemporaryDir dir;
|
|
QVERIFY(dir.isValid());
|
|
QDir dir2(dir.path());
|
|
QVERIFY(dir2.mkpath("sub/ownCloud1/folder/f"));
|
|
QVERIFY(dir2.mkpath("ownCloud2"));
|
|
QVERIFY(dir2.mkpath("sub/free"));
|
|
QVERIFY(dir2.mkpath("free2/sub"));
|
|
{
|
|
QFile f(dir.path() + "/sub/file.txt");
|
|
f.open(QFile::WriteOnly);
|
|
f.write("hello");
|
|
}
|
|
|
|
FolderMan *folderman = FolderMan::instance();
|
|
QCOMPARE(folderman, &_fm);
|
|
QVERIFY(folderman->addFolder(0, folderDefinition(dir.path() + "/sub/ownCloud1")));
|
|
QVERIFY(folderman->addFolder(0, folderDefinition(dir.path() + "/ownCloud2")));
|
|
|
|
|
|
// those should be allowed
|
|
QCOMPARE(folderman->checkPathValidityForNewFolder(dir.path() + "/sub/free"), QString());
|
|
QCOMPARE(folderman->checkPathValidityForNewFolder(dir.path() + "/free2/"), QString());
|
|
// Not an existing directory -> Ok
|
|
QCOMPARE(folderman->checkPathValidityForNewFolder(dir.path() + "/sub/bliblablu"), QString());
|
|
QCOMPARE(folderman->checkPathValidityForNewFolder(dir.path() + "/sub/free/bliblablu"), QString());
|
|
QCOMPARE(folderman->checkPathValidityForNewFolder(dir.path() + "/sub/bliblablu/some/more"), QString());
|
|
|
|
// A file -> Error
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/sub/file.txt").isNull());
|
|
|
|
// There are folders configured in those folders: -> ERROR
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/sub/ownCloud1").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/ownCloud2/").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/sub").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/sub/").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path()).isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/sub/ownCloud1/folder").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/sub/ownCloud1/folder/f").isNull());
|
|
|
|
|
|
// make a bunch of links
|
|
QVERIFY(QFile::link(dir.path() + "/sub/free", dir.path() + "/link1"));
|
|
QVERIFY(QFile::link(dir.path() + "/sub", dir.path() + "/link2"));
|
|
QVERIFY(QFile::link(dir.path() + "/sub/ownCloud1", dir.path() + "/link3"));
|
|
QVERIFY(QFile::link(dir.path() + "/sub/ownCloud1/folder", dir.path() + "/link4"));
|
|
|
|
// Ok
|
|
QVERIFY(folderman->checkPathValidityForNewFolder(dir.path() + "/link1").isNull());
|
|
QVERIFY(folderman->checkPathValidityForNewFolder(dir.path() + "/link2/free").isNull());
|
|
|
|
// Not Ok
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/link2").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/link3").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/link4").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/link3/folder").isNull());
|
|
|
|
|
|
// test some non existing sub path (error)
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/sub/ownCloud1/some/sub/path").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/ownCloud2/blublu").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/sub/ownCloud1/folder/g/h").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/link3/folder/neu_folder").isNull());
|
|
|
|
// Subfolder of links
|
|
QVERIFY(folderman->checkPathValidityForNewFolder(dir.path() + "/link1/subfolder").isNull());
|
|
QVERIFY(folderman->checkPathValidityForNewFolder(dir.path() + "/link2/free/subfolder").isNull());
|
|
|
|
// Invalid paths
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder("").isNull());
|
|
|
|
// Should not have the rights
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
|
|
QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
|
|
#else
|
|
QSKIP("Test not supported with Qt4", SkipSingle);
|
|
#endif
|
|
}
|
|
};
|
|
|
|
|