fix: [vault] add UT

1. add vault UT 2. modify the code format
linuxdeepin · Jul 20, 2023 · 7ba37b1 · 7ba37b1
1 parent 9e9d339
commit 7ba37b1
Show file tree

Hide file tree

Showing 45 changed files with 1,157 additions and 91 deletions.
diff --git a/src/plugins/filemanager/dfmplugin-vault/dbus/vaultdbusutils.cpp b/src/plugins/filemanager/dfmplugin-vault/dbus/vaultdbusutils.cpp
@@ -12,7 +12,7 @@
 
 #include <unistd.h>
 
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
 
 QVariant VaultDBusUtils::vaultManagerDBusCall(QString function, const QVariant &vaule)
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/events/vaulteventcaller.cpp b/src/plugins/filemanager/dfmplugin-vault/events/vaulteventcaller.cpp
@@ -9,7 +9,7 @@
 #include <dfm-framework/event/event.h>
 
 DFMBASE_USE_NAMESPACE
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
 
 void VaultEventCaller::sendItemActived(quint64 windowId, const QUrl &url)
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/events/vaulteventreceiver.cpp b/src/plugins/filemanager/dfmplugin-vault/events/vaulteventreceiver.cpp
@@ -29,7 +29,7 @@ Q_DECLARE_METATYPE(bool *)
 
 DPF_USE_NAMESPACE
 DFMBASE_USE_NAMESPACE
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
 
 VaultEventReceiver::VaultEventReceiver(QObject *parent)
     : QObject(parent)
@@ -87,7 +87,7 @@ void VaultEventReceiver::computerOpenItem(quint64 winId, const QUrl &url)
             VaultHelper::instance()->unlockVaultDialog();
         } break;
         case VaultState::kNotExisted: {
-            VaultHelper::instance()->creatVaultDialog();
+            VaultHelper::instance()->createVaultDialog();
         } break;
         default:
             break;
@@ -190,7 +190,7 @@ bool VaultEventReceiver::changeUrlEventFilter(quint64 windowId, const QUrl &url)
         VaultHelper::instance()->appendWinID(windowId);
         const VaultState &state = VaultHelper::instance()->state(PathManager::vaultLockPath());
         if (VaultState::kNotExisted == state) {
-            VaultHelper::instance()->creatVaultDialog();
+            VaultHelper::instance()->createVaultDialog();
             return true;
         } else if (VaultState::kEncrypted == state) {
             VaultHelper::instance()->unlockVaultDialog();

diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/private/vaultfileinfo_p.h b/src/plugins/filemanager/dfmplugin-vault/fileutils/private/vaultfileinfo_p.h
@@ -17,17 +17,18 @@ class VaultFileInfoPrivate
     friend class VaultFileInfo;
 
 public:
-    explicit VaultFileInfoPrivate(VaultFileInfo *qq);
+    explicit VaultFileInfoPrivate(const QUrl &url, VaultFileInfo *qq);
     virtual ~VaultFileInfoPrivate();
 
 private:
     QString fileDisplayPath() const;
     QString absolutePath(const QString &path) const;
     QUrl vaultUrl(const QUrl &url) const;
     QUrl getUrlByNewFileName(const QString &fileName) const;
-    bool isRoot() const;
 
     VaultFileInfo *const q;
+    QUrl localUrl;
+    bool isRoot { false };
 };
 
 }

diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/private/vaultfileiteratorprivate.cpp b/src/plugins/filemanager/dfmplugin-vault/fileutils/private/vaultfileiteratorprivate.cpp
@@ -12,7 +12,8 @@
 
 USING_IO_NAMESPACE
 DFMBASE_USE_NAMESPACE
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
+
 VaultFileIteratorPrivate::VaultFileIteratorPrivate(const QUrl &url,
                                                    const QStringList &nameFilters,
                                                    QDir::Filters filters,

diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/private/vaultfilewatcherprivate.cpp b/src/plugins/filemanager/dfmplugin-vault/fileutils/private/vaultfilewatcherprivate.cpp
@@ -6,7 +6,7 @@
 #include "fileutils/vaultfilewatcher.h"
 
 DFMBASE_USE_NAMESPACE
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
 
 VaultFileWatcherPrivate::VaultFileWatcherPrivate(const QUrl &fileUrl, VaultFileWatcher *qq)
     : AbstractFileWatcherPrivate(fileUrl, qq)

diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfileinfo.cpp b/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfileinfo.cpp
@@ -24,11 +24,13 @@
 
 DWIDGET_USE_NAMESPACE
 DFMBASE_USE_NAMESPACE
-namespace dfmplugin_vault {
+DPVAULT_USE_NAMESPACE
 
-VaultFileInfoPrivate::VaultFileInfoPrivate(VaultFileInfo *qq)
+VaultFileInfoPrivate::VaultFileInfoPrivate(const QUrl &url, VaultFileInfo *qq)
     : q(qq)
 {
+    localUrl = VaultHelper::vaultToLocalUrl(url);
+    isRoot = (url == VaultHelper::instance()->rootUrl() ? true : false);
 }
 
 VaultFileInfoPrivate::~VaultFileInfoPrivate()
@@ -61,31 +63,21 @@ QUrl VaultFileInfoPrivate::vaultUrl(const QUrl &url) const
 QUrl VaultFileInfoPrivate::getUrlByNewFileName(const QString &fileName) const
 {
     QUrl theUrl = q->urlOf(FileInfo::FileUrlInfoType::kUrl);
-
-    theUrl.setPath(DFMIO::DFMUtils::buildFilePath(q->pathOf(PathInfoType::kAbsolutePath).toStdString().c_str(),
-                                                  fileName.toStdString().c_str(), nullptr));
+    QString newPath =  DFMIO::DFMUtils::buildFilePath(q->pathOf(PathInfoType::kAbsolutePath).toStdString().c_str(),
+                                                      fileName.toStdString().c_str(), nullptr);
+    if (!newPath.startsWith(QDir::separator()))
+        newPath = QDir::separator() + newPath;
+    theUrl.setPath(newPath);
 
     theUrl.setHost("");
 
     return theUrl;
 }
 
-bool VaultFileInfoPrivate::isRoot() const
-{
-    bool bRootDir = false;
-    const QString &localFilePath = DFMIO::DFMUtils::buildFilePath(kVaultBasePath.toStdString().c_str(), kVaultDecryptDirName, nullptr);
-    QString path = q->pathOf(PathInfoType::kFilePath);
-    if (localFilePath == path || localFilePath + "/" == path || localFilePath == path + "/") {
-        bRootDir = true;
-    }
-    return bRootDir;
-}
-
 VaultFileInfo::VaultFileInfo(const QUrl &url)
-    : ProxyFileInfo(url), d(new VaultFileInfoPrivate(this))
+    : ProxyFileInfo(url), d(new VaultFileInfoPrivate(url, this))
 {
-    localUrl = VaultHelper::vaultToLocalUrl(url);
-    setProxy(InfoFactory::create<FileInfo>(localUrl,  Global::CreateFileInfoType::kCreateFileInfoSyncAndCache));
+    setProxy(InfoFactory::create<FileInfo>(d->localUrl,  Global::CreateFileInfoType::kCreateFileInfoSyncAndCache));
 }
 
 VaultFileInfo::~VaultFileInfo()
@@ -132,7 +124,7 @@ QUrl VaultFileInfo::urlOf(const UrlInfoType type) const
     case FileUrlInfoType::kUrl:
         return url;
     case FileUrlInfoType::kRedirectedFileUrl:
-        return localUrl;
+        return d->localUrl;
     default:
         return ProxyFileInfo::urlOf(type);
     }
@@ -194,7 +186,7 @@ bool VaultFileInfo::canAttributes(const CanableInfoType type) const
 QVariantHash VaultFileInfo::extraProperties() const
 {
     if (!proxy)
-        ProxyFileInfo::extraProperties();
+        return ProxyFileInfo::extraProperties();
     return proxy->extraProperties();
 }
 
@@ -210,20 +202,20 @@ QUrl VaultFileInfo::getUrlByType(const UrlInfoType type, const QString &fileName
 
 QIcon VaultFileInfo::fileIcon()
 {
-    if (d->isRoot()) {
+    if (d->isRoot) {
         QString iconName = "dfm_safebox";   // 如果是根目录，用保险柜图标
         return QIcon::fromTheme(iconName);
     }
 
     if (!proxy)
-        ProxyFileInfo::fileIcon();
+        return ProxyFileInfo::fileIcon();
     return proxy->fileIcon();
 }
 
 qint64 VaultFileInfo::size() const
 {
     if (!proxy)
-        ProxyFileInfo::size();
+        return ProxyFileInfo::size();
     return proxy->size();
 }
 
@@ -258,15 +250,14 @@ QString VaultFileInfo::nameOf(const NameInfoType type) const
         return displayOf(DisPlayInfoType::kFileDisplayName);
     case NameInfoType::kIconName: {
         QString iconName = "dfm_safebox";   // 如果是根目录，用保险柜图标
-        if (isRoot())
+        if (d->isRoot) {
             return iconName;
-        else {
+        } else {
             if (!proxy)
                 return const_cast<VaultFileInfo *>(this)->fileMimeType(QMimeDatabase::MatchDefault).iconName();
             else
-                proxy->nameOf(NameInfoType::kIconName);
+                return proxy->nameOf(NameInfoType::kIconName);
         }
-        return QString();
     }
     default:
         return ProxyFileInfo::nameOf(type);
@@ -275,16 +266,16 @@ QString VaultFileInfo::nameOf(const NameInfoType type) const
 
 QString VaultFileInfo::displayOf(const DisPlayInfoType type) const
 {
-    if (DisPlayInfoType::kFileDisplayName == type) {
-        if (d->isRoot()) {
+    switch (type) {
+    case DisPlayInfoType::kFileDisplayName:
+        if (d->isRoot)
             return QObject::tr("My Vault");
-        }
         if (proxy)
             return proxy->displayOf(DisPlayInfoType::kFileDisplayName);
-    } else if (DisPlayInfoType::kFileDisplayPath == type) {
+        return ProxyFileInfo::displayOf(type);
+    case DisPlayInfoType::kFileDisplayPath:
         return d->fileDisplayPath();
+    default:
+        return ProxyFileInfo::displayOf(type);
     }
-
-    return ProxyFileInfo::displayOf(type);
-}
 }
diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfileinfo.h b/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfileinfo.h
@@ -41,9 +41,6 @@ class VaultFileInfo : public DFMBASE_NAMESPACE::ProxyFileInfo
     virtual QString nameOf(const FileNameInfoType type) const override;
 
     virtual QString displayOf(const DisplayInfoType type) const override;
-
-private:
-    QUrl localUrl {};
 };
 }
 #endif   //! VAULTFILEINFO_H
diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfileiterator.cpp b/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfileiterator.cpp
@@ -11,7 +11,7 @@
 #include <QSharedPointer>
 
 DFMBASE_USE_NAMESPACE
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
 
 VaultFileIterator::VaultFileIterator(const QUrl &url, const QStringList &nameFilters, QDir::Filters filters, QDirIterator::IteratorFlags flags)
     : AbstractDirIterator(VaultHelper::vaultToLocalUrl(url), nameFilters, filters, flags)

diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfilewatcher.cpp b/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfilewatcher.cpp
@@ -10,7 +10,8 @@
 #include <dfm-base/base/schemefactory.h>
 
 DFMBASE_USE_NAMESPACE
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
+
 VaultFileWatcher::VaultFileWatcher(const QUrl &url, QObject *parent)
     : AbstractFileWatcher(new VaultFileWatcherPrivate(VaultHelper::vaultToLocalUrl(url), this), parent)
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/menus/vaultcomputermenuscene.cpp b/src/plugins/filemanager/dfmplugin-vault/menus/vaultcomputermenuscene.cpp
@@ -11,7 +11,7 @@
 
 #include <QMenu>
 
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
 DFMBASE_USE_NAMESPACE
 
 AbstractMenuScene *VaultComputerMenuCreator::create()

diff --git a/src/plugins/filemanager/dfmplugin-vault/menus/vaultmenuscene.cpp b/src/plugins/filemanager/dfmplugin-vault/menus/vaultmenuscene.cpp
@@ -14,7 +14,7 @@
 #include <QList>
 
 DFMBASE_USE_NAMESPACE
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
 
 static const char *const kWorkSpaceScene = "WorkspaceMenu";
 

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/encryption/interfaceactivevault.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/encryption/interfaceactivevault.cpp
@@ -7,7 +7,8 @@
 #include "utils/vaulthelper.h"
 #include "utils/pathmanager.h"
 
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
+
 InterfaceActiveVault::InterfaceActiveVault(QObject *parent)
     : QObject(parent)
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/encryption/operatorcenter.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/encryption/operatorcenter.cpp
@@ -27,7 +27,8 @@ extern "C" {
 }
 #define signals public
 
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
+
 OperatorCenter::OperatorCenter(QObject *parent)
     : QObject(parent), strCryfsPassword(""), strUserKey(""), standOutput("")
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/encryption/vaultconfig.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/encryption/vaultconfig.cpp
@@ -10,7 +10,7 @@
 #include <QDir>
 #include <QSettings>
 
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
 
 VaultConfig::VaultConfig(const QString &filePath)
     : currentFilePath(filePath)

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/pathmanager.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/pathmanager.cpp
@@ -7,7 +7,8 @@
 
 #include <dfm-io/dfmio_utils.h>
 
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
+
 PathManager::PathManager(QObject *parent)
     : QObject(parent)
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/policy/policymanager.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/policy/policymanager.cpp
@@ -9,7 +9,8 @@
 
 #include <QDBusConnection>
 
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
+
 PolicyManager::VaultPageMark PolicyManager::recordVaultPageMark;
 bool PolicyManager::vaultVisiable = true;
 PolicyManager::PolicyManager(QObject *parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/servicemanager.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/servicemanager.cpp
@@ -11,8 +11,9 @@
 #include <mutex>
 #include <QUrl>
 
-using namespace dfmbase;
-using namespace dfmplugin_vault;
+DFMBASE_USE_NAMESPACE
+DPVAULT_USE_NAMESPACE
+
 ServiceManager::ServiceManager(QObject *parent)
     : QObject(parent)
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/vaultautolock.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/vaultautolock.cpp
@@ -14,10 +14,12 @@
 
 #include <unistd.h>
 
-DFMBASE_USE_NAMESPACE
-using namespace dfmplugin_vault;
 constexpr char kVaultGroup[] = { "Vault/AutoLock" };
 constexpr char kVaultAutoLockKey[] { "AutoLock" };
+
+DFMBASE_USE_NAMESPACE
+DPVAULT_USE_NAMESPACE
+
 VaultAutoLock::VaultAutoLock(QObject *parent)
     : QObject(parent)
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/vaultentryfileentity.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/vaultentryfileentity.cpp
@@ -9,7 +9,8 @@
 #include <QApplication>
 
 DFMBASE_USE_NAMESPACE
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
+
 VaultEntryFileEntity::VaultEntryFileEntity(const QUrl &url)
     : AbstractEntryFileEntity(url)
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/vaulthelper.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/vaulthelper.cpp
@@ -40,7 +40,7 @@ Q_DECLARE_METATYPE(QList<QUrl> *)
 
 DFMBASE_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
-using namespace dfmplugin_vault;
+DPVAULT_USE_NAMESPACE
 
 QUrl VaultHelper::rootUrl()
 {
@@ -124,7 +124,7 @@ void VaultHelper::siderItemClicked(quint64 windowId, const QUrl &url)
 
     switch (instance()->state(PathManager::vaultLockPath())) {
     case VaultState::kNotExisted: {
-        VaultHelper::instance()->creatVaultDialog();
+        VaultHelper::instance()->createVaultDialog();
     } break;
     case VaultState::kEncrypted: {
         VaultHelper::instance()->unlockVaultDialog();
@@ -203,7 +203,7 @@ DMenu *VaultHelper::createMenu()
     DMenu *timeMenu = new DMenu;
     switch (instance()->state(PathManager::vaultLockPath())) {
     case VaultState::kNotExisted:
-        menu->addAction(QObject::tr("Create Vault"), VaultHelper::instance(), &VaultHelper::creatVaultDialog);
+        menu->addAction(QObject::tr("Create Vault"), VaultHelper::instance(), &VaultHelper::createVaultDialog);
         break;
     case VaultState::kEncrypted:
         menu->addAction(QObject::tr("Unlock"), VaultHelper::instance(), &VaultHelper::unlockVaultDialog);
@@ -332,7 +332,7 @@ void VaultHelper::lockVault(bool isForced)
     FileEncryptHandle::instance()->lockVault(PathManager::vaultUnlockPath(), isForced);
 }
 
-void VaultHelper::creatVaultDialog()
+void VaultHelper::createVaultDialog()
 {
     VaultPageBase *page = new VaultActiveView();
     page->exec();