feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add midSize image to cache

Browse Source 
There is now a mid size image in the image cache. It's logical size is
150x150, so it is 300x300 for HighDPI.

Task-number: QDS-8918
Change-Id: I6586b2e82b9e74737f46b67c441201ad4964fca0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Marco Bubke
2023-01-25 10:11:18 +01:00
parent aa8b011add
commit d593a5ea9b
47 changed files with 1073 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
tests/unit/unittest/imagecachegenerator-test.cpp
View File

@@ -32,8 +32,9 @@ protected:
Notification waitInThread;
Notification notification;
QImage image1{10, 10, QImage::Format_ARGB32};
QImage midSizeImage1{5, 5, QImage::Format_ARGB32};
QImage smallImage1{1, 1, QImage::Format_ARGB32};
NiceMock<MockFunction<void(const QImage &, const QImage &)>> imageCallbackMock;
NiceMock<MockFunction<void(const QImage &, const QImage &, const QImage &)>> imageCallbackMock;
NiceMock<MockFunction<void(QmlDesigner::ImageCache::AbortReason)>> abortCallbackMock;
NiceMock<ImageCacheCollectorMock> collectorMock;
NiceMock<MockImageCacheStorage> storageMock;
@@ -44,11 +45,11 @@ TEST_F(ImageCacheGenerator, CallsCollectorWithCaptureCallback)
{
EXPECT_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillRepeatedly([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{image1}, QImage{smallImage1});
captureCallback(QImage{image1}, QImage{midSizeImage1}, QImage{smallImage1});
});
EXPECT_CALL(imageCallbackMock, Call(_, _)).WillRepeatedly([&](const QImage &, const QImage &) {
notification.notify();
});
EXPECT_CALL(imageCallbackMock, Call(_, _, _))
.WillRepeatedly(
[&](const QImage &, const QImage &, const QImage &) { notification.notify(); });
generator.generateImage("name", {}, {}, imageCallbackMock.AsStdFunction(), {}, {});
notification.wait();
@@ -66,17 +67,16 @@ TEST_F(ImageCacheGenerator, CallsCollectorOnlyIfNotProcessing)
TEST_F(ImageCacheGenerator, ProcessTaskAfterFirstFinished)
{
ON_CALL(imageCallbackMock, Call(_, _)).WillByDefault([&](const QImage &, const QImage &) {
notification.notify();
});
ON_CALL(imageCallbackMock, Call(_, _, _))
.WillByDefault([&](const QImage &, const QImage &, const QImage &) { notification.notify(); });
EXPECT_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillOnce([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{image1}, QImage{smallImage1});
captureCallback(QImage{image1}, QImage{midSizeImage1}, QImage{smallImage1});
});
EXPECT_CALL(collectorMock, start(Eq("name2"), _, _, _, _))
.WillOnce([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{image1}, QImage{smallImage1});
captureCallback(QImage{image1}, QImage{midSizeImage1}, QImage{smallImage1});
});
generator.generateImage("name", {}, {}, imageCallbackMock.AsStdFunction(), {}, {});
@@ -88,7 +88,7 @@ TEST_F(ImageCacheGenerator, DontCrashAtDestructingGenerator)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{image1}, QImage{smallImage1});
captureCallback(QImage{image1}, QImage{midSizeImage1}, QImage{smallImage1});
});
generator.generateImage(
@@ -105,12 +105,16 @@ TEST_F(ImageCacheGenerator, StoreImage)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{image1}, QImage{smallImage1});
captureCallback(QImage{image1}, QImage{midSizeImage1}, QImage{smallImage1});
});
EXPECT_CALL(storageMock,
storeImage(Eq("name"), Eq(Sqlite::TimeStamp{11}), Eq(image1), Eq(smallImage1)))
.WillRepeatedly([&](auto, auto, auto, auto) { notification.notify(); });
storeImage(Eq("name"),
Eq(Sqlite::TimeStamp{11}),
Eq(image1),
Eq(midSizeImage1),
Eq(smallImage1)))
.WillRepeatedly([&](auto, auto, auto, auto, auto) { notification.notify(); });
generator.generateImage("name", {}, {11}, imageCallbackMock.AsStdFunction(), {}, {});
notification.wait();
@@ -120,12 +124,16 @@ TEST_F(ImageCacheGenerator, StoreImageWithExtraId)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{image1}, QImage{smallImage1});
captureCallback(QImage{image1}, QImage{midSizeImage1}, QImage{smallImage1});
});
EXPECT_CALL(storageMock,
storeImage(Eq("name+extraId"), Eq(Sqlite::TimeStamp{11}), Eq(image1), Eq(smallImage1)))
.WillRepeatedly([&](auto, auto, auto, auto) { notification.notify(); });
storeImage(Eq("name+extraId"),
Eq(Sqlite::TimeStamp{11}),
Eq(image1),
Eq(midSizeImage1),
Eq(smallImage1)))
.WillRepeatedly([&](auto, auto, auto, auto, auto) { notification.notify(); });
generator.generateImage("name", "extraId", {11}, imageCallbackMock.AsStdFunction(), {}, {});
notification.wait();
@@ -135,12 +143,13 @@ TEST_F(ImageCacheGenerator, StoreNullImage)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{}, QImage{});
captureCallback(QImage{}, QImage{}, QImage{});
});
EXPECT_CALL(storageMock,
storeImage(Eq("name"), Eq(Sqlite::TimeStamp{11}), Eq(QImage{}), Eq(QImage{})))
.WillRepeatedly([&](auto, auto, auto, auto) { notification.notify(); });
EXPECT_CALL(
storageMock,
storeImage(Eq("name"), Eq(Sqlite::TimeStamp{11}), Eq(QImage{}), Eq(QImage{}), Eq(QImage{})))
.WillRepeatedly([&](auto, auto, auto, auto, auto) { notification.notify(); });
generator.generateImage(
"name", {}, {11}, imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction(), {});
@@ -151,12 +160,16 @@ TEST_F(ImageCacheGenerator, StoreNullImageWithExtraId)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{}, QImage{});
captureCallback(QImage{}, QImage{}, QImage{});
});
EXPECT_CALL(storageMock,
storeImage(Eq("name+extraId"), Eq(Sqlite::TimeStamp{11}), Eq(QImage{}), Eq(QImage{})))
.WillRepeatedly([&](auto, auto, auto, auto) { notification.notify(); });
storeImage(Eq("name+extraId"),
Eq(Sqlite::TimeStamp{11}),
Eq(QImage{}),
Eq(QImage{}),
Eq(QImage{})))
.WillRepeatedly([&](auto, auto, auto, auto, auto) { notification.notify(); });
generator.generateImage("name",
"extraId",
@@ -171,16 +184,15 @@ TEST_F(ImageCacheGenerator, AbortCallback)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{image1}, QImage{smallImage1});
captureCallback(QImage{image1}, QImage{midSizeImage1}, QImage{smallImage1});
});
ON_CALL(collectorMock, start(Eq("name2"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto, auto abortCallback) {
abortCallback(QmlDesigner::ImageCache::AbortReason::Failed);
});
EXPECT_CALL(imageCallbackMock, Call(_, _)).WillOnce([&](const QImage &, const QImage &) {
notification.notify();
});
EXPECT_CALL(imageCallbackMock, Call(_, _, _))
.WillOnce([&](const QImage &, const QImage &, const QImage &) { notification.notify(); });
EXPECT_CALL(abortCallbackMock, Call(Eq(QmlDesigner::ImageCache::AbortReason::Failed)))
.WillOnce([&](auto) { notification.notify(); });
@@ -200,7 +212,7 @@ TEST_F(ImageCacheGenerator, StoreNullImageForAbortCallbackAbort)
ON_CALL(collectorMock, start(Eq("dummyNotify"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto, auto) { notification.notify(); });
EXPECT_CALL(storageMock, storeImage(Eq("name"), _, _, _)).Times(0);
EXPECT_CALL(storageMock, storeImage(Eq("name"), _, _, _, _)).Times(0);
generator.generateImage(
"name", {}, {11}, imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction(), {});
@@ -215,9 +227,10 @@ TEST_F(ImageCacheGenerator, DontStoreNullImageForAbortCallbackFailed)
abortCallback(QmlDesigner::ImageCache::AbortReason::Failed);
});
EXPECT_CALL(storageMock,
storeImage(Eq("name"), Eq(Sqlite::TimeStamp{11}), Eq(QImage{}), Eq(QImage{})))
.WillOnce([&](auto, auto, auto, auto) { notification.notify(); });
EXPECT_CALL(
storageMock,
storeImage(Eq("name"), Eq(Sqlite::TimeStamp{11}), Eq(QImage{}), Eq(QImage{}), Eq(QImage{})))
.WillOnce([&](auto, auto, auto, auto, auto) { notification.notify(); });
generator.generateImage(
"name", {}, {11}, imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction(), {});
@@ -228,7 +241,7 @@ TEST_F(ImageCacheGenerator, AbortForNullImage)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{}, QImage{});
captureCallback(QImage{}, QImage{}, QImage{});
});
EXPECT_CALL(abortCallbackMock, Call(Eq(QmlDesigner::ImageCache::AbortReason::Failed)))
@@ -243,12 +256,11 @@ TEST_F(ImageCacheGenerator, CallImageCallbackIfSmallImageIsNotNull)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{}, smallImage1);
captureCallback({}, {}, smallImage1);
});
EXPECT_CALL(imageCallbackMock, Call(Eq(QImage()), Eq(smallImage1))).WillOnce([&](auto, auto) {
notification.notify();
});
EXPECT_CALL(imageCallbackMock, Call(Eq(QImage()), Eq(QImage()), Eq(smallImage1)))
.WillOnce([&](auto, auto, auto) { notification.notify(); });
generator.generateImage(
"name", {}, {}, imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction(), {});
@@ -259,11 +271,41 @@ TEST_F(ImageCacheGenerator, StoreImageIfSmallImageIsNotNull)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{}, smallImage1);
captureCallback({}, {}, smallImage1);
});
EXPECT_CALL(storageMock, storeImage(_, _, Eq(QImage()), Eq(smallImage1)))
.WillOnce([&](auto, auto, auto, auto) { notification.notify(); });
EXPECT_CALL(storageMock, storeImage(_, _, Eq(QImage()), Eq(QImage()), Eq(smallImage1)))
.WillOnce([&](auto, auto, auto, auto, auto) { notification.notify(); });
generator.generateImage(
"name", {}, {}, imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction(), {});
notification.wait();
}
TEST_F(ImageCacheGenerator, CallImageCallbackIfMidSizeImageIsNotNull)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback({}, midSizeImage1, {});
});
EXPECT_CALL(imageCallbackMock, Call(Eq(QImage()), Eq(midSizeImage1), Eq(QImage{})))
.WillOnce([&](auto, auto, auto) { notification.notify(); });
generator.generateImage(
"name", {}, {}, imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction(), {});
notification.wait();
}
TEST_F(ImageCacheGenerator, StoreImageIfMidSizeImageIsNotNull)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback({}, midSizeImage1, {});
});
EXPECT_CALL(storageMock, storeImage(_, _, Eq(QImage()), Eq(midSizeImage1), Eq(QImage())))
.WillOnce([&](auto, auto, auto, auto, auto) { notification.notify(); });
generator.generateImage(
"name", {}, {}, imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction(), {});
@@ -273,13 +315,11 @@ TEST_F(ImageCacheGenerator, StoreImageIfSmallImageIsNotNull)
TEST_F(ImageCacheGenerator, CallImageCallbackIfImageIsNotNull)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(image1, QImage{});
});
.WillByDefault(
[&](auto, auto, auto, auto captureCallback, auto) { captureCallback(image1, {}, {}); });
EXPECT_CALL(imageCallbackMock, Call(Eq(image1), Eq(QImage{}))).WillOnce([&](auto, auto) {
notification.notify();
});
EXPECT_CALL(imageCallbackMock, Call(Eq(image1), Eq(QImage{}), Eq(QImage{})))
.WillOnce([&](auto, auto, auto) { notification.notify(); });
generator.generateImage(
"name", {}, {}, imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction(), {});
@@ -289,12 +329,11 @@ TEST_F(ImageCacheGenerator, CallImageCallbackIfImageIsNotNull)
TEST_F(ImageCacheGenerator, StoreImageIfImageIsNotNull)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(image1, QImage{});
});
.WillByDefault(
[&](auto, auto, auto, auto captureCallback, auto) { captureCallback(image1, {}, {}); });
EXPECT_CALL(storageMock, storeImage(_, _, Eq(image1), Eq(QImage{})))
.WillOnce([&](auto, auto, auto, auto) { notification.notify(); });
EXPECT_CALL(storageMock, storeImage(_, _, Eq(image1), Eq(QImage{}), Eq(QImage{})))
.WillOnce([&](auto, auto, auto, auto, auto) { notification.notify(); });
generator.generateImage(
"name", {}, {}, imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction(), {});
@@ -304,7 +343,8 @@ TEST_F(ImageCacheGenerator, StoreImageIfImageIsNotNull)
TEST_F(ImageCacheGenerator, CallWalCheckpointFullIfQueueIsEmpty)
{
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) { captureCallback({}, {}); });
.WillByDefault(
[&](auto, auto, auto, auto captureCallback, auto) { captureCallback({}, {}, {}); });
EXPECT_CALL(storageMock, walCheckpointFull()).WillRepeatedly([&]() { notification.notify(); });
@@ -339,11 +379,11 @@ TEST_F(ImageCacheGenerator, WaitForFinished)
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
waitInThread.wait();
captureCallback(QImage{image1}, QImage{smallImage1});
captureCallback(QImage{image1}, QImage{midSizeImage1}, QImage{smallImage1});
});
ON_CALL(collectorMock, start(Eq("name2"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{image1}, QImage{smallImage1});
captureCallback(QImage{image1}, QImage{midSizeImage1}, QImage{smallImage1});
});
generator.generateImage(
@@ -351,7 +391,7 @@ TEST_F(ImageCacheGenerator, WaitForFinished)
generator.generateImage(
"name2", {}, {11}, imageCallbackMock.AsStdFunction(), abortCallbackMock.AsStdFunction(), {});
EXPECT_CALL(imageCallbackMock, Call(_, _)).Times(2);
EXPECT_CALL(imageCallbackMock, Call(_, _, _)).Times(2);
waitInThread.notify();
generator.waitForFinished();
@@ -469,7 +509,7 @@ TEST_F(ImageCacheGenerator, UseLastTimeStampIfTasksAreMerged)
abortCallback(QmlDesigner::ImageCache::AbortReason::Failed);
});
EXPECT_CALL(storageMock, storeImage(Eq("name"), Eq(Sqlite::TimeStamp{4}), _, _));
EXPECT_CALL(storageMock, storeImage(Eq("name"), Eq(Sqlite::TimeStamp{4}), _, _, _));
generator.generateImage("waitDummy", {}, {}, {}, {}, {});
generator.generateImage("name", {}, {3}, {}, abortCallbackMock.AsStdFunction(), {});
@@ -481,18 +521,18 @@ TEST_F(ImageCacheGenerator, UseLastTimeStampIfTasksAreMerged)
TEST_F(ImageCacheGenerator, MergeCaptureCallbackIfTasksAreMerged)
{
NiceMock<MockFunction<void(const QImage &, const QImage &)>> newerImageCallbackMock;
NiceMock<MockFunction<void(const QImage &, const QImage &, const QImage &)>> newerImageCallbackMock;
ON_CALL(collectorMock, start(Eq("waitDummy"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto, auto) { waitInThread.wait(); });
ON_CALL(collectorMock, start(Eq("notificationDummy"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto, auto) { notification.notify(); });
ON_CALL(collectorMock, start(Eq("name"), _, _, _, _))
.WillByDefault([&](auto, auto, auto, auto imageCallback, auto) {
imageCallback(QImage{image1}, QImage{smallImage1});
imageCallback(QImage{image1}, QImage{midSizeImage1}, QImage{smallImage1});
});
EXPECT_CALL(imageCallbackMock, Call(_, _));
EXPECT_CALL(newerImageCallbackMock, Call(_, _));
EXPECT_CALL(imageCallbackMock, Call(_, _, _));
EXPECT_CALL(newerImageCallbackMock, Call(_, _, _));
generator.generateImage("waitDummy", {}, {}, {}, {}, {});
generator.generateImage("name", {}, {}, imageCallbackMock.AsStdFunction(), {}, {});
@@ -529,7 +569,7 @@ TEST_F(ImageCacheGenerator, DontCallNullImageCallback)
{
EXPECT_CALL(collectorMock, start(_, _, _, _, _))
.WillOnce([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(image1, smallImage1);
captureCallback(image1, midSizeImage1, smallImage1);
notification.notify();
});
@@ -541,7 +581,7 @@ TEST_F(ImageCacheGenerator, DontCallNullAbortCallbackForNullImage)
{
EXPECT_CALL(collectorMock, start(_, _, _, _, _))
.WillOnce([&](auto, auto, auto, auto captureCallback, auto) {
captureCallback(QImage{}, QImage{});
captureCallback(QImage{}, QImage{}, QImage{});
notification.notify();
});