Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deepin-devicemanager/src/Page/PageInfo.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -77,7 +77,7 @@ bool PageInfo::packageHasInstalled(const QString &packageName)
p.waitForFinished(-1);

QByteArray r = p.readAll();
bool installed = r.contains("installed");
bool installed = r.contains("Status: install ok installed");
qCDebug(appLog) << "Package" << packageName << "is" << (installed ? "installed" : "not installed");
return installed;
}
Expand Down
49 changes: 48 additions & 1 deletion deepin-devicemanager/tests/src/Page/ut_pageinfo.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 UnionTech Software Technology Co.,Ltd
// Copyright (C) 2019-2026 ~ 2020 UnionTech Software Technology Co.,Ltd
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -48,3 +48,50 @@
m_pageInfo->paintEvent(&paint);
delete p;
}

// Parametrized test for PageInfo::packageHasInstalled
// Stub readAll to inject controlled dpkg output without running dpkg
static QByteArray g_readAllData;

static QByteArray ut_QIODevice_readAll(void *self)
{
Q_UNUSED(self)

Check warning on line 58 in deepin-devicemanager/tests/src/Page/ut_pageinfo.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

syntax error
return g_readAllData;
}

struct PackageHasInstalledParam {
QByteArray dpkgOutput;
bool expected;
};

class PackageHasInstalled_UT
: public UT_HEAD
, public testing::WithParamInterface<PackageHasInstalledParam>
{
public:
void SetUp() override {}
void TearDown() override {}
};

TEST_P(PackageHasInstalled_UT, packageHasInstalled)
{
g_readAllData = GetParam().dpkgOutput;

Stub stub;
stub.set(ADDR(QIODevice, readAll), ut_QIODevice_readAll);

PageMultiInfo *p = new PageMultiInfo;
PageInfo *pageInfo = dynamic_cast<PageInfo *>(p);
bool result = pageInfo->packageHasInstalled("test-package");
EXPECT_EQ(GetParam().expected, result);
delete p;
}

INSTANTIATE_TEST_SUITE_P(PackageHasInstalledCases, PackageHasInstalled_UT,
testing::Values(
PackageHasInstalledParam{"Status: install ok installed\n", true},
PackageHasInstalledParam{"Package: dde-printer\nStatus: install ok installed\nPriority: optional\n", true},
PackageHasInstalledParam{"", false},
PackageHasInstalledParam{"package 'x' is not installed\n", false}
)
);
Loading