refact: ApplicationService ctor and some member functions
Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
@ -33,8 +33,8 @@ public:
|
||||
|
||||
m_am = new ApplicationManager1Service{std::make_unique<CGroupsIdentifier>(), bus.globalServerBus()};
|
||||
|
||||
DesktopFile file{"/usr/share/applications/test-Application.desktop", "test-Application", 0};
|
||||
QSharedPointer<ApplicationService> app = QSharedPointer<ApplicationService>::create(std::move(file));
|
||||
DesktopFile file{true, "/usr/share/applications/test-Application.desktop", "test-Application", 0};
|
||||
QSharedPointer<ApplicationService> app = QSharedPointer<ApplicationService>::create(std::move(file), nullptr);
|
||||
QSharedPointer<InstanceService> instance =
|
||||
QSharedPointer<InstanceService>::create(InstancePath.path().split('/').last(), ApplicationPath.path(), QString{"/"});
|
||||
app->m_Instances.insert(InstancePath, instance);
|
||||
|
@ -45,7 +45,7 @@ TEST_F(TestDesktopEntry, desktopFile)
|
||||
auto curDir = QDir::current();
|
||||
QString path{curDir.absolutePath() + QDir::separator() + "data" + QDir::separator() + "applications" + QDir::separator() +
|
||||
"deepin-editor.desktop"};
|
||||
EXPECT_EQ(exampleFile->filePath().toStdString(), path.toStdString());
|
||||
EXPECT_EQ(exampleFile->fileSource().toStdString(), path.toStdString());
|
||||
EXPECT_EQ(exampleFile->desktopId().toStdString(), "deepin-editor");
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ TEST_F(TestDesktopEntry, prase)
|
||||
const auto &exampleFile = file();
|
||||
ASSERT_FALSE(exampleFile.isNull());
|
||||
DesktopEntry entry;
|
||||
QFile in{exampleFile->filePath()};
|
||||
QFile in{exampleFile->fileSource()};
|
||||
ASSERT_TRUE(in.open(QFile::ExistingOnly | QFile::ReadOnly | QFile::Text));
|
||||
QTextStream fs{&in};
|
||||
auto err = entry.parse(fs);
|
||||
|
Reference in New Issue
Block a user