feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
32fd70ce3c6b84be7252cf9f370dc4fd67181c8f
qt-creator/tests/unit/unittest/projectstorage-test.cpp

3009 lines
141 KiB
C++
Raw Normal View History

QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
/****************************************************************************
**
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "googletest.h"
#include "sqlitedatabasemock.h"
#include <modelnode.h>
QmlDesigner: Move project storage to projectstorage subdirectory We save their not meta info related data. So it is better we move it their own subdirectory. Task-number: QDS-4304 Change-Id: Ib99419e992fced93fb245a8c48e02ee256823def Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-04 13:27:42 +02:00
#include <projectstorage/projectstorage.h>
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
#include <projectstorage/sourcepathcache.h>
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
#include <sqlitedatabase.h>
#include <sqlitereadstatement.h>
#include <sqlitewritestatement.h>
namespace {
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
using QmlDesigner::ImportId;
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
using QmlDesigner::PropertyDeclarationId;
using QmlDesigner::SourceContextId;
using QmlDesigner::SourceId;
using QmlDesigner::TypeId;
QmlDesigner: Move source cache types to their own header The namespace is now Cache for that types. Task-number: QDS-4306 Change-Id: I479f1ca534455a41de9dc1d6a1fd891e1d8973eb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 12:26:39 +02:00
using QmlDesigner::Cache::Source;
using QmlDesigner::Cache::SourceContext;
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
using QmlDesigner::Storage::TypeAccessSemantics;
namespace Storage = QmlDesigner::Storage;
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
MATCHER_P2(IsSourceContext,
id,
value,
std::string(negation ? "isn't " : "is ") + PrintToString(SourceContext{value, id}))
{
const SourceContext &sourceContext = arg;
return sourceContext.id == id && sourceContext.value == value;
}
MATCHER_P2(IsSourceNameAndSourceContextId,
name,
id,
std::string(negation ? "isn't " : "is ")
QmlDesigner: Move source cache types to their own header The namespace is now Cache for that types. Task-number: QDS-4306 Change-Id: I479f1ca534455a41de9dc1d6a1fd891e1d8973eb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 12:26:39 +02:00
+ PrintToString(QmlDesigner::Cache::SourceNameAndSourceContextId{name, id}))
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
{
QmlDesigner: Move source cache types to their own header The namespace is now Cache for that types. Task-number: QDS-4306 Change-Id: I479f1ca534455a41de9dc1d6a1fd891e1d8973eb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 12:26:39 +02:00
const QmlDesigner::Cache::SourceNameAndSourceContextId &sourceNameAndSourceContextId = arg;
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
return sourceNameAndSourceContextId.sourceName == name
&& sourceNameAndSourceContextId.sourceContextId == id;
}
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
MATCHER_P5(IsStorageType,
importId,
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
typeName,
prototype,
accessSemantics,
sourceId,
std::string(negation ? "isn't " : "is ")
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
+ PrintToString(Storage::Type{importId, typeName, prototype, accessSemantics, sourceId}))
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
{
const Storage::Type &type = arg;
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
return type.importId == importId && type.typeName == typeName
&& type.accessSemantics == accessSemantics && type.sourceId == sourceId
unittest: Fix build on macOS We are still using our own Utils::variant and corresponding functions on macOS. Amends 90cc7fed3be Change-Id: I829bdd3a4cc03f994a825ee3a962d4eb523a3bf1 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-06-15 12:05:50 +02:00
&& Utils::visit([&](auto &&v) -> bool { return v.name == prototype.name; }, type.prototype);
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
MATCHER_P4(IsStorageTypeWithInvalidSourceId,
importId,
QmlDesigner: Synchronize type A type should not removed but all it's fields should be reseted. This has the advantage that if you remove a file and add it again later the id is stable. Change-Id: I3a1f51e14195cff2fc39681acdf7072d1a2e4616 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-31 18:13:42 +02:00
typeName,
prototype,
accessSemantics,
std::string(negation ? "isn't " : "is ")
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
+ PrintToString(Storage::Type{importId, typeName, prototype, accessSemantics, SourceId{}}))
QmlDesigner: Synchronize type A type should not removed but all it's fields should be reseted. This has the advantage that if you remove a file and add it again later the id is stable. Change-Id: I3a1f51e14195cff2fc39681acdf7072d1a2e4616 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-31 18:13:42 +02:00
{
const Storage::Type &type = arg;
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
return type.importId == importId && type.typeName == typeName && type.prototype == prototype
QmlDesigner: Synchronize type A type should not removed but all it's fields should be reseted. This has the advantage that if you remove a file and add it again later the id is stable. Change-Id: I3a1f51e14195cff2fc39681acdf7072d1a2e4616 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-31 18:13:42 +02:00
&& type.accessSemantics == accessSemantics && !type.sourceId.isValid();
}
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
MATCHER_P(IsExportedType,
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
name,
std::string(negation ? "isn't " : "is ") + PrintToString(Storage::ExportedType{name}))
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
{
const Storage::ExportedType &type = arg;
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
return type.name == name;
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
MATCHER_P3(IsPropertyDeclaration,
name,
typeName,
traits,
std::string(negation ? "isn't " : "is ")
+ PrintToString(Storage::PropertyDeclaration{name, typeName, traits}))
{
const Storage::PropertyDeclaration &propertyDeclaration = arg;
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
return propertyDeclaration.name == name
unittest: Fix build on macOS We are still using our own Utils::variant and corresponding functions on macOS. Amends 90cc7fed3be Change-Id: I829bdd3a4cc03f994a825ee3a962d4eb523a3bf1 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-06-15 12:05:50 +02:00
&& Utils::visit([&](auto &&v) -> bool { return v.name == typeName.name; },
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
propertyDeclaration.typeName)
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
&& propertyDeclaration.traits == traits;
}
QmlDesigner: Add Import Synchronization Task-number: QDS-4460 Change-Id: Icd419baa7881fe882539f10d335ab6b3d36bc7b5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-01 17:46:49 +02:00
MATCHER_P2(IsBasicImport,
name,
version,
std::string(negation ? "isn't " : "is ") + PrintToString(Storage::Import{name, version}))
{
const Storage::BasicImport &import = arg;
return import.name == name && import.version == version;
}
MATCHER_P3(IsImport,
name,
version,
sourceId,
std::string(negation ? "isn't " : "is ")
+ PrintToString(Storage::Import{name, version, sourceId}))
{
const Storage::Import &import = arg;
return import.name == name && import.version == version && &import.sourceId == &sourceId;
}
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
class ProjectStorage : public testing::Test
{
public:
ProjectStorage()
{
ON_CALL(selectSourceContextIdFromSourceContextsBySourceContextPathStatement,
valueReturnsSourceContextId(A<Utils::SmallStringView>()))
.WillByDefault(Return(SourceContextId()));
ON_CALL(selectSourceContextIdFromSourceContextsBySourceContextPathStatement,
valueReturnsSourceContextId(Utils::SmallStringView("")))
.WillByDefault(Return(SourceContextId(0)));
ON_CALL(selectSourceContextIdFromSourceContextsBySourceContextPathStatement,
valueReturnsSourceContextId(Utils::SmallStringView("/path/to")))
.WillByDefault(Return(SourceContextId(5)));
ON_CALL(databaseMock, lastInsertedRowId()).WillByDefault(Return(12));
ON_CALL(selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatment,
valueReturnInt32(_, _))
.WillByDefault(Return(Utils::optional<int>()));
ON_CALL(selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatment,
valueReturnInt32(0, Utils::SmallStringView("")))
.WillByDefault(Return(Utils::optional<int>(0)));
ON_CALL(selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatment,
valueReturnInt32(5, Utils::SmallStringView("file.h")))
.WillByDefault(Return(Utils::optional<int>(42)));
QmlDesigner: Move source cache types to their own header The namespace is now Cache for that types. Task-number: QDS-4306 Change-Id: I479f1ca534455a41de9dc1d6a1fd891e1d8973eb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 12:26:39 +02:00
ON_CALL(selectAllSourcesStatement, valuesReturnCacheSources(_))
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
.WillByDefault(Return(std::vector<Source>{{"file.h", SourceContextId{1}, SourceId{1}},
{"file.cpp", SourceContextId{2}, SourceId{4}}}));
ON_CALL(selectSourceContextPathFromSourceContextsBySourceContextIdStatement,
valueReturnPathString(5))
.WillByDefault(Return(Utils::optional<Utils::PathString>("/path/to")));
ON_CALL(selectSourceNameAndSourceContextIdFromSourcesBySourceIdStatement,
QmlDesigner: Move source cache types to their own header The namespace is now Cache for that types. Task-number: QDS-4306 Change-Id: I479f1ca534455a41de9dc1d6a1fd891e1d8973eb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 12:26:39 +02:00
valueReturnCacheSourceNameAndSourceContextId(42))
.WillByDefault(Return(QmlDesigner::Cache::SourceNameAndSourceContextId{"file.cpp", 5}));
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
ON_CALL(selectSourceContextIdFromSourcesBySourceIdStatement,
valueReturnInt32(TypedEq<int>(42)))
.WillByDefault(Return(Utils::optional<int>(5)));
}
protected:
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
using ProjectStorageMock = QmlDesigner::ProjectStorage<SqliteDatabaseMock>;
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
template<int ResultCount>
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
using ReadStatement = ProjectStorageMock::ReadStatement<ResultCount>;
using WriteStatement = ProjectStorageMock::WriteStatement;
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
template<int ResultCount>
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
using ReadWriteStatement = ProjectStorageMock::ReadWriteStatement<ResultCount>;
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
NiceMock<SqliteDatabaseMock> databaseMock;
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
ProjectStorageMock storage{databaseMock, true};
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
ReadWriteStatement<1> &upsertTypeStatement = storage.upsertTypeStatement;
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
ReadStatement<1> &selectTypeIdByExportedNameStatement = storage.selectTypeIdByExportedNameStatement;
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
ReadStatement<1> &selectSourceContextIdFromSourceContextsBySourceContextPathStatement
= storage.selectSourceContextIdFromSourceContextsBySourceContextPathStatement;
ReadStatement<1> &selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatment
= storage.selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatement;
ReadStatement<1> &selectSourceContextPathFromSourceContextsBySourceContextIdStatement
= storage.selectSourceContextPathFromSourceContextsBySourceContextIdStatement;
ReadStatement<2> &selectSourceNameAndSourceContextIdFromSourcesBySourceIdStatement
= storage.selectSourceNameAndSourceContextIdFromSourcesBySourceIdStatement;
ReadStatement<2> &selectAllSourceContextsStatement = storage.selectAllSourceContextsStatement;
WriteStatement &insertIntoSourceContexts = storage.insertIntoSourceContextsStatement;
WriteStatement &insertIntoSourcesStatement = storage.insertIntoSourcesStatement;
ReadStatement<3> &selectAllSourcesStatement = storage.selectAllSourcesStatement;
ReadStatement<1> &selectSourceContextIdFromSourcesBySourceIdStatement = storage.selectSourceContextIdFromSourcesBySourceIdStatement;
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
ReadStatement<5> &selectTypeByTypeIdStatement = storage.selectTypeByTypeIdStatement;
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
ReadStatement<1> &selectExportedTypesByTypeIdStatement = storage.selectExportedTypesByTypeIdStatement;
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
ReadStatement<6> &selectTypesStatement = storage.selectTypesStatement;
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
};
TEST_F(ProjectStorage, SelectForFetchingSourceContextIdForKnownPathCalls)
{
InSequence s;
EXPECT_CALL(databaseMock, deferredBegin());
EXPECT_CALL(selectSourceContextIdFromSourceContextsBySourceContextPathStatement,
valueReturnsSourceContextId(TypedEq<Utils::SmallStringView>("/path/to")));
EXPECT_CALL(databaseMock, commit());
storage.fetchSourceContextId("/path/to");
}
TEST_F(ProjectStorage, SelectForFetchingSourceIdForKnownPathCalls)
{
InSequence s;
EXPECT_CALL(databaseMock, deferredBegin());
EXPECT_CALL(selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatment,
valueReturnsSourceId(5, Eq("file.h")));
EXPECT_CALL(databaseMock, commit());
storage.fetchSourceId(SourceContextId{5}, "file.h");
}
TEST_F(ProjectStorage, NotWriteForFetchingSourceContextIdForKnownPathCalls)
{
EXPECT_CALL(insertIntoSourceContexts, write(An<Utils::SmallStringView>())).Times(0);
storage.fetchSourceContextId("/path/to");
}
TEST_F(ProjectStorage, NotWriteForFetchingSoureIdForKnownEntryCalls)
{
EXPECT_CALL(insertIntoSourcesStatement, write(An<uint>(), An<Utils::SmallStringView>())).Times(0);
storage.fetchSourceId(SourceContextId{5}, "file.h");
}
TEST_F(ProjectStorage, SelectAndWriteForFetchingSourceContextIdForUnknownPathCalls)
{
InSequence s;
EXPECT_CALL(databaseMock, deferredBegin());
EXPECT_CALL(selectSourceContextIdFromSourceContextsBySourceContextPathStatement,
valueReturnsSourceContextId(
TypedEq<Utils::SmallStringView>("/some/not/known/path")));
EXPECT_CALL(insertIntoSourceContexts,
write(TypedEq<Utils::SmallStringView>("/some/not/known/path")));
EXPECT_CALL(databaseMock, commit());
storage.fetchSourceContextId("/some/not/known/path");
}
TEST_F(ProjectStorage, SelectAndWriteForFetchingSourceIdForUnknownEntryCalls)
{
InSequence s;
EXPECT_CALL(databaseMock, deferredBegin());
EXPECT_CALL(selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatment,
valueReturnsSourceId(5, Eq("unknownfile.h")));
EXPECT_CALL(insertIntoSourcesStatement,
write(TypedEq<int>(5), TypedEq<Utils::SmallStringView>("unknownfile.h")));
EXPECT_CALL(databaseMock, commit());
storage.fetchSourceId(SourceContextId{5}, "unknownfile.h");
}
TEST_F(ProjectStorage, ValueForFetchSourceContextForIdCalls)
{
EXPECT_CALL(databaseMock, deferredBegin());
EXPECT_CALL(selectSourceContextPathFromSourceContextsBySourceContextIdStatement,
valueReturnPathString(5));
EXPECT_CALL(databaseMock, commit());
storage.fetchSourceContextPath(SourceContextId{5});
}
TEST_F(ProjectStorage, FetchSourceContextForId)
{
auto path = storage.fetchSourceContextPath(SourceContextId{5});
ASSERT_THAT(path, Eq("/path/to"));
}
TEST_F(ProjectStorage, ThrowAsFetchingSourceContextPathForNonExistingId)
{
ASSERT_THROW(storage.fetchSourceContextPath(SourceContextId{12}),
QmlDesigner::SourceContextIdDoesNotExists);
}
TEST_F(ProjectStorage, FetchSourceContextIdForUnknownSourceId)
{
ASSERT_THROW(storage.fetchSourceContextId(SourceId{1111}), QmlDesigner::SourceIdDoesNotExists);
}
TEST_F(ProjectStorage, FetchSourceContextIdThrows)
{
ASSERT_THROW(storage.fetchSourceContextId(SourceId{41}), QmlDesigner::SourceIdDoesNotExists);
}
TEST_F(ProjectStorage, GetTheSourceContextIdBackAfterFetchingANewEntryFromSourceContextsUnguarded)
{
auto sourceContextId = storage.fetchSourceContextIdUnguarded("/some/not/known/path");
ASSERT_THAT(sourceContextId, SourceContextId{12});
}
TEST_F(ProjectStorage, GetTheSourceIdBackAfterFetchingANewEntryFromSourcesUnguarded)
{
auto sourceId = storage.fetchSourceIdUnguarded(SourceContextId{5}, "unknownfile.h");
ASSERT_THAT(sourceId, SourceId{12});
}
TEST_F(ProjectStorage, SelectForFetchingSourceContextIdForKnownPathUnguardedCalls)
{
InSequence s;
EXPECT_CALL(selectSourceContextIdFromSourceContextsBySourceContextPathStatement,
valueReturnsSourceContextId(TypedEq<Utils::SmallStringView>("/path/to")));
storage.fetchSourceContextIdUnguarded("/path/to");
}
TEST_F(ProjectStorage, SelectForFetchingSourceIdForKnownPathUnguardedCalls)
{
EXPECT_CALL(selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatment,
valueReturnsSourceId(5, Eq("file.h")));
storage.fetchSourceIdUnguarded(SourceContextId{5}, "file.h");
}
TEST_F(ProjectStorage, NotWriteForFetchingSourceContextIdForKnownPathUnguardedCalls)
{
EXPECT_CALL(insertIntoSourceContexts, write(An<Utils::SmallStringView>())).Times(0);
storage.fetchSourceContextIdUnguarded("/path/to");
}
TEST_F(ProjectStorage, NotWriteForFetchingSoureIdForKnownEntryUnguardedCalls)
{
EXPECT_CALL(insertIntoSourcesStatement, write(An<uint>(), An<Utils::SmallStringView>())).Times(0);
storage.fetchSourceIdUnguarded(SourceContextId{5}, "file.h");
}
TEST_F(ProjectStorage, SelectAndWriteForFetchingSourceContextIdForUnknownPathUnguardedCalls)
{
InSequence s;
EXPECT_CALL(selectSourceContextIdFromSourceContextsBySourceContextPathStatement,
valueReturnsSourceContextId(
TypedEq<Utils::SmallStringView>("/some/not/known/path")));
EXPECT_CALL(insertIntoSourceContexts,
write(TypedEq<Utils::SmallStringView>("/some/not/known/path")));
storage.fetchSourceContextIdUnguarded("/some/not/known/path");
}
TEST_F(ProjectStorage, SelectAndWriteForFetchingSourceIdForUnknownEntryUnguardedCalls)
{
InSequence s;
EXPECT_CALL(selectSourceIdFromSourcesBySourceContextIdAndSourceNameStatment,
valueReturnsSourceId(5, Eq("unknownfile.h")));
EXPECT_CALL(insertIntoSourcesStatement,
write(TypedEq<int>(5), TypedEq<Utils::SmallStringView>("unknownfile.h")));
storage.fetchSourceIdUnguarded(SourceContextId{5}, "unknownfile.h");
}
TEST_F(ProjectStorage,
SelectAndWriteForFetchingSourceContextIdTwoTimesIfTheIndexIsConstraintBecauseTheEntryExistsAlreadyCalls)
{
InSequence s;
EXPECT_CALL(databaseMock, deferredBegin());
EXPECT_CALL(selectSourceContextIdFromSourceContextsBySourceContextPathStatement,
valueReturnsSourceContextId(TypedEq<Utils::SmallStringView>("/other/unknow/path")));
EXPECT_CALL(insertIntoSourceContexts, write(TypedEq<Utils::SmallStringView>("/other/unknow/path")))
.WillOnce(Throw(Sqlite::ConstraintPreventsModification("busy")));
EXPECT_CALL(databaseMock, rollback());
EXPECT_CALL(databaseMock, deferredBegin());
EXPECT_CALL(selectSourceContextIdFromSourceContextsBySourceContextPathStatement,
valueReturnsSourceContextId(TypedEq<Utils::SmallStringView>("/other/unknow/path")));
EXPECT_CALL(insertIntoSourceContexts,
write(TypedEq<Utils::SmallStringView>("/other/unknow/path")));
EXPECT_CALL(databaseMock, commit());
storage.fetchSourceContextId("/other/unknow/path");
}
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
TEST_F(ProjectStorage, FetchTypeByTypeIdCalls)
{
InSequence s;
EXPECT_CALL(databaseMock, deferredBegin());
EXPECT_CALL(selectTypeByTypeIdStatement, valueReturnsStorageType(Eq(21)));
EXPECT_CALL(selectExportedTypesByTypeIdStatement, valuesReturnsStorageExportedTypes(_, Eq(21)));
EXPECT_CALL(databaseMock, commit());
storage.fetchTypeByTypeId(TypeId{21});
}
TEST_F(ProjectStorage, FetchTypesCalls)
{
InSequence s;
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Storage::Type type{ImportId{}, {}, {}, {}, SourceId{}, {}, {}, {}, {}, {}, {}, {}, TypeId{55}};
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
Storage::Types types{type};
EXPECT_CALL(databaseMock, deferredBegin());
EXPECT_CALL(selectTypesStatement, valuesReturnsStorageTypes(_)).WillOnce(Return(types));
EXPECT_CALL(selectExportedTypesByTypeIdStatement, valuesReturnsStorageExportedTypes(_, Eq(55)));
EXPECT_CALL(databaseMock, commit());
storage.fetchTypes();
}
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
class ProjectStorageSlowTest : public testing::Test
{
protected:
template<typename Range>
static auto toValues(Range &&range)
{
using Type = typename std::decay_t<Range>;
return std::vector<typename Type::value_type>{range.begin(), range.end()};
}
void addSomeDummyData()
{
auto sourceContextId1 = storage.fetchSourceContextId("/path/dummy");
auto sourceContextId2 = storage.fetchSourceContextId("/path/dummy2");
auto sourceContextId3 = storage.fetchSourceContextId("/path/");
storage.fetchSourceId(sourceContextId1, "foo");
storage.fetchSourceId(sourceContextId1, "dummy");
storage.fetchSourceId(sourceContextId2, "foo");
storage.fetchSourceId(sourceContextId2, "bar");
storage.fetchSourceId(sourceContextId3, "foo");
storage.fetchSourceId(sourceContextId3, "bar");
storage.fetchSourceId(sourceContextId1, "bar");
storage.fetchSourceId(sourceContextId3, "bar");
}
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
auto createTypes()
{
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
setUpImports();
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
sourceId1 = sourcePathCache.sourceId(path1);
sourceId2 = sourcePathCache.sourceId(path2);
sourceId3 = sourcePathCache.sourceId(path3);
sourceId4 = sourcePathCache.sourceId(path4);
QmlDesigner: Relink alias properties There are still some corner cases but this will be done in follow-up patches. The link information moved to the typenames table so only indirections are saved in the propertyDeclarations table. Otherwise the duplication would increase the database size too much. Task-number: QDS-4551 Change-Id: I4aca85dd2d803b43aa9860183e500ced2d91141f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-15 12:32:55 +02:00
storage.synchronizeDocuments({Storage::Document{sourceId1, importIds},
Storage::Document{sourceId2, importIds},
Storage::Document{sourceId3, importIds},
Storage::Document{sourceId4, importIds}});
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
return Storage::Types{
Storage::Type{
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
importId2,
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
TypeAccessSemantics::Reference,
sourceId1,
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
importIds,
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
{Storage::ExportedType{"Item"}},
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
{Storage::PropertyDeclaration{"data",
Storage::NativeType{"QObject"},
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Storage::PropertyDeclarationTraits::IsList},
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
Storage::PropertyDeclaration{"children",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::ExportedType{"Item"},
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly}},
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
{Storage::FunctionDeclaration{"execute", "", {Storage::ParameterDeclaration{"arg", ""}}},
Storage::FunctionDeclaration{
"values",
"Vector3D",
{Storage::ParameterDeclaration{"arg1", "int"},
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Storage::ParameterDeclaration{"arg2",
"QObject",
Storage::PropertyDeclarationTraits::IsPointer},
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
Storage::ParameterDeclaration{"arg3", "string"}}}},
{Storage::SignalDeclaration{"execute", {Storage::ParameterDeclaration{"arg", ""}}},
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Storage::SignalDeclaration{
"values",
{Storage::ParameterDeclaration{"arg1", "int"},
Storage::ParameterDeclaration{"arg2",
"QObject",
Storage::PropertyDeclarationTraits::IsPointer},
Storage::ParameterDeclaration{"arg3", "string"}}}},
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
{Storage::EnumerationDeclaration{"Enum",
{Storage::EnumeratorDeclaration{"Foo"},
Storage::EnumeratorDeclaration{"Bar", 32}}},
Storage::EnumerationDeclaration{"Type",
{Storage::EnumeratorDeclaration{"Foo"},
Storage::EnumeratorDeclaration{"Poo", 12}}}}},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Storage::Type{importId1,
"QObject",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{},
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
TypeAccessSemantics::Reference,
sourceId2,
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
importIds,
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
{Storage::ExportedType{"Object"}, Storage::ExportedType{"Obj"}}}};
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
auto createTypesWithAliases()
{
auto types = createTypes();
types[1].propertyDeclarations.push_back(
Storage::PropertyDeclaration{"objects",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList});
types.push_back(Storage::Type{importId2,
"QAliasItem",
QmlDesigner: Handle more corner cases for alias relinking Synchronization should always throw an exception if it gets in an inconsitent state. Task-number: QDS-4551 Change-Id: I8c55198115aa79b676a13fe0cd7ab225fb6723d5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-01 10:42:38 +02:00
Storage::ExportedType{"Item"},
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
TypeAccessSemantics::Reference,
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
sourceId3,
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
importIds,
{Storage::ExportedType{"AliasItem"}}});
types.back().propertyDeclarations.push_back(
Storage::PropertyDeclaration{"data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList});
types.back().aliasDeclarations.push_back(
QmlDesigner: Handle more corner cases for alias relinking Synchronization should always throw an exception if it gets in an inconsitent state. Task-number: QDS-4551 Change-Id: I8c55198115aa79b676a13fe0cd7ab225fb6723d5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-01 10:42:38 +02:00
Storage::AliasPropertyDeclaration{"items", Storage::ExportedType{"Item"}, "children"});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
types.back().aliasDeclarations.push_back(
QmlDesigner: Handle more corner cases for alias relinking Synchronization should always throw an exception if it gets in an inconsitent state. Task-number: QDS-4551 Change-Id: I8c55198115aa79b676a13fe0cd7ab225fb6723d5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-01 10:42:38 +02:00
Storage::AliasPropertyDeclaration{"objects", Storage::ExportedType{"Item"}, "objects"});
types.push_back(
Storage::Type{importId3,
"QObject2",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId4,
importIds,
{Storage::ExportedType{"Object2"}, Storage::ExportedType{"Obj2"}}});
types[3].propertyDeclarations.push_back(
Storage::PropertyDeclaration{"objects",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList});
return types;
}
auto createTypesWithAliases2()
{
auto types = createTypes();
types[1].propertyDeclarations.push_back(
Storage::PropertyDeclaration{"objects",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList});
types.push_back(Storage::Type{importId2,
"QAliasItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId3,
importIds,
{Storage::ExportedType{"AliasItem"}}});
types.back().propertyDeclarations.push_back(
Storage::PropertyDeclaration{"data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList});
types.back().aliasDeclarations.push_back(
Storage::AliasPropertyDeclaration{"objects", Storage::ExportedType{"Item"}, "objects"});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
types.push_back(
Storage::Type{importId3,
"QObject2",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId4,
importIds,
{Storage::ExportedType{"Object2"}, Storage::ExportedType{"Obj2"}}});
types[3].propertyDeclarations.push_back(
Storage::PropertyDeclaration{"objects",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
return types;
}
QmlDesigner: Add Import Synchronization Task-number: QDS-4460 Change-Id: Icd419baa7881fe882539f10d335ab6b3d36bc7b5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-01 17:46:49 +02:00
auto createImports()
{
importSourceId1 = sourcePathCache.sourceId(importPath1);
importSourceId2 = sourcePathCache.sourceId(importPath2);
importSourceId3 = sourcePathCache.sourceId(importPath3);
return Storage::Imports{Storage::Import{"Qml", Storage::VersionNumber{2}, importSourceId1, {}},
Storage::Import{"QtQuick",
Storage::VersionNumber{},
importSourceId2,
{Storage::Import{"Qml", Storage::VersionNumber{2}}}},
Storage::Import{"/path/to",
Storage::VersionNumber{},
SourceId{},
{Storage::Import{"QtQuick"},
Storage::Import{"Qml", Storage::VersionNumber{2}}}}};
}
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
void setUpImports()
{
auto imports = createImports();
storage.synchronizeImports(imports);
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
importIds = storage.fetchImportIds(imports);
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
importId1 = importIds[0];
importId2 = importIds[1];
importId3 = importIds[2];
}
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
protected:
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
using ProjectStorage = QmlDesigner::ProjectStorage<Sqlite::Database>;
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
Sqlite::Database database{":memory:", Sqlite::JournalMode::Memory};
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
ProjectStorage storage{database, database.isInitialized()};
QmlDesigner::SourcePathCache<ProjectStorage> sourcePathCache{storage};
QmlDesigner::SourcePathView path1{"/path1/to"};
QmlDesigner::SourcePathView path2{"/path2/to"};
QmlDesigner::SourcePathView path3{"/path3/to"};
QmlDesigner::SourcePathView path4{"/path4/to"};
SourceId sourceId1;
SourceId sourceId2;
SourceId sourceId3;
SourceId sourceId4;
QmlDesigner: Add Import Synchronization Task-number: QDS-4460 Change-Id: Icd419baa7881fe882539f10d335ab6b3d36bc7b5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-01 17:46:49 +02:00
QmlDesigner::SourcePathView importPath1{"/import/path1/to"};
QmlDesigner::SourcePathView importPath2{"/import/path2/to"};
QmlDesigner::SourcePathView importPath3{"/import/aaaa/to"};
SourceId importSourceId1;
SourceId importSourceId2;
SourceId importSourceId3;
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
ImportId importId1;
ImportId importId2;
ImportId importId3;
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
QmlDesigner::ImportIds importIds;
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
};
TEST_F(ProjectStorageSlowTest, FetchSourceContextIdReturnsAlwaysTheSameIdForTheSamePath)
{
auto sourceContextId = storage.fetchSourceContextId("/path/to");
auto newSourceContextId = storage.fetchSourceContextId("/path/to");
ASSERT_THAT(newSourceContextId, Eq(sourceContextId));
}
TEST_F(ProjectStorageSlowTest, FetchSourceContextIdReturnsNotTheSameIdForDifferentPath)
{
auto sourceContextId = storage.fetchSourceContextId("/path/to");
auto newSourceContextId = storage.fetchSourceContextId("/path/to2");
ASSERT_THAT(newSourceContextId, Ne(sourceContextId));
}
TEST_F(ProjectStorageSlowTest, FetchSourceContextPath)
{
auto sourceContextId = storage.fetchSourceContextId("/path/to");
auto path = storage.fetchSourceContextPath(sourceContextId);
ASSERT_THAT(path, Eq("/path/to"));
}
TEST_F(ProjectStorageSlowTest, FetchUnknownSourceContextPathThrows)
{
ASSERT_THROW(storage.fetchSourceContextPath(SourceContextId{323}),
QmlDesigner::SourceContextIdDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, FetchAllSourceContextsAreEmptyIfNoSourceContextsExists)
{
auto sourceContexts = storage.fetchAllSourceContexts();
ASSERT_THAT(toValues(sourceContexts), IsEmpty());
}
TEST_F(ProjectStorageSlowTest, FetchAllSourceContexts)
{
auto sourceContextId = storage.fetchSourceContextId("/path/to");
auto sourceContextId2 = storage.fetchSourceContextId("/path/to2");
auto sourceContexts = storage.fetchAllSourceContexts();
ASSERT_THAT(toValues(sourceContexts),
UnorderedElementsAre(IsSourceContext(sourceContextId, "/path/to"),
IsSourceContext(sourceContextId2, "/path/to2")));
}
TEST_F(ProjectStorageSlowTest, FetchSourceIdFirstTime)
{
addSomeDummyData();
auto sourceContextId = storage.fetchSourceContextId("/path/to");
auto sourceId = storage.fetchSourceId(sourceContextId, "foo");
ASSERT_TRUE(sourceId.isValid());
}
TEST_F(ProjectStorageSlowTest, FetchExistingSourceId)
{
addSomeDummyData();
auto sourceContextId = storage.fetchSourceContextId("/path/to");
auto createdSourceId = storage.fetchSourceId(sourceContextId, "foo");
auto sourceId = storage.fetchSourceId(sourceContextId, "foo");
ASSERT_THAT(sourceId, createdSourceId);
}
TEST_F(ProjectStorageSlowTest, FetchSourceIdWithDifferentContextIdAreNotEqual)
{
addSomeDummyData();
auto sourceContextId = storage.fetchSourceContextId("/path/to");
auto sourceContextId2 = storage.fetchSourceContextId("/path/to2");
auto sourceId2 = storage.fetchSourceId(sourceContextId2, "foo");
auto sourceId = storage.fetchSourceId(sourceContextId, "foo");
ASSERT_THAT(sourceId, Ne(sourceId2));
}
TEST_F(ProjectStorageSlowTest, FetchSourceIdWithDifferentNameAreNotEqual)
{
addSomeDummyData();
auto sourceContextId = storage.fetchSourceContextId("/path/to");
auto sourceId2 = storage.fetchSourceId(sourceContextId, "foo");
auto sourceId = storage.fetchSourceId(sourceContextId, "foo2");
ASSERT_THAT(sourceId, Ne(sourceId2));
}
TEST_F(ProjectStorageSlowTest, FetchSourceIdWithNonExistingSourceContextIdThrows)
{
ASSERT_THROW(storage.fetchSourceId(SourceContextId{42}, "foo"),
Sqlite::ConstraintPreventsModification);
}
TEST_F(ProjectStorageSlowTest, FetchSourceNameAndSourceContextIdForNonExistingSourceId)
{
ASSERT_THROW(storage.fetchSourceNameAndSourceContextId(SourceId{212}),
QmlDesigner::SourceIdDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, FetchSourceNameAndSourceContextIdForNonExistingEntry)
{
addSomeDummyData();
auto sourceContextId = storage.fetchSourceContextId("/path/to");
auto sourceId = storage.fetchSourceId(sourceContextId, "foo");
auto sourceNameAndSourceContextId = storage.fetchSourceNameAndSourceContextId(sourceId);
ASSERT_THAT(sourceNameAndSourceContextId, IsSourceNameAndSourceContextId("foo", sourceContextId));
}
TEST_F(ProjectStorageSlowTest, FetchSourceContextIdForNonExistingSourceId)
{
ASSERT_THROW(storage.fetchSourceContextId(SourceId{212}), QmlDesigner::SourceIdDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, FetchSourceContextIdForExistingSourceId)
{
addSomeDummyData();
auto originalSourceContextId = storage.fetchSourceContextId("/path/to3");
auto sourceId = storage.fetchSourceId(originalSourceContextId, "foo");
auto sourceContextId = storage.fetchSourceContextId(sourceId);
ASSERT_THAT(sourceContextId, Eq(originalSourceContextId));
}
TEST_F(ProjectStorageSlowTest, FetchAllSources)
{
auto sources = storage.fetchAllSources();
ASSERT_THAT(toValues(sources), IsEmpty());
}
TEST_F(ProjectStorageSlowTest, FetchSourceIdUnguardedFirstTime)
{
addSomeDummyData();
auto sourceContextId = storage.fetchSourceContextId("/path/to");
std::lock_guard lock{database};
auto sourceId = storage.fetchSourceIdUnguarded(sourceContextId, "foo");
ASSERT_TRUE(sourceId.isValid());
}
TEST_F(ProjectStorageSlowTest, FetchExistingSourceIdUnguarded)
{
addSomeDummyData();
auto sourceContextId = storage.fetchSourceContextId("/path/to");
std::lock_guard lock{database};
auto createdSourceId = storage.fetchSourceIdUnguarded(sourceContextId, "foo");
auto sourceId = storage.fetchSourceIdUnguarded(sourceContextId, "foo");
ASSERT_THAT(sourceId, createdSourceId);
}
TEST_F(ProjectStorageSlowTest, FetchSourceIdUnguardedWithDifferentContextIdAreNotEqual)
{
addSomeDummyData();
auto sourceContextId = storage.fetchSourceContextId("/path/to");
auto sourceContextId2 = storage.fetchSourceContextId("/path/to2");
std::lock_guard lock{database};
auto sourceId2 = storage.fetchSourceIdUnguarded(sourceContextId2, "foo");
auto sourceId = storage.fetchSourceIdUnguarded(sourceContextId, "foo");
ASSERT_THAT(sourceId, Ne(sourceId2));
}
TEST_F(ProjectStorageSlowTest, FetchSourceIdUnguardedWithDifferentNameAreNotEqual)
{
addSomeDummyData();
auto sourceContextId = storage.fetchSourceContextId("/path/to");
std::lock_guard lock{database};
auto sourceId2 = storage.fetchSourceIdUnguarded(sourceContextId, "foo");
auto sourceId = storage.fetchSourceIdUnguarded(sourceContextId, "foo2");
ASSERT_THAT(sourceId, Ne(sourceId2));
}
TEST_F(ProjectStorageSlowTest, FetchSourceIdUnguardedWithNonExistingSourceContextIdThrows)
{
std::lock_guard lock{database};
ASSERT_THROW(storage.fetchSourceIdUnguarded(SourceContextId{42}, "foo"),
Sqlite::ConstraintPreventsModification);
}
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddsNewTypes)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId2),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj")))),
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Item"))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddsNewTypesWithExportedPrototypeName)
{
Storage::Types types{createTypes()};
types[0].prototype = Storage::ExportedType{"Object"};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
ASSERT_THAT(storage.fetchTypes(),
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId2),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj")))),
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Item"))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddsNewTypesThrowsWithWrongExportedPrototypeName)
{
Storage::Types types{createTypes()};
types[0].prototype = Storage::ExportedType{"Objec"};
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId1, sourceId2}),
QmlDesigner::TypeNameDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddsNewTypesWithMissingImportAndExportedPrototypeName)
{
Storage::Types types{createTypes()};
QmlDesigner: Relink alias properties There are still some corner cases but this will be done in follow-up patches. The link information moved to the typenames table so only indirections are saved in the propertyDeclarations table. Otherwise the duplication would increase the database size too much. Task-number: QDS-4551 Change-Id: I4aca85dd2d803b43aa9860183e500ced2d91141f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-15 12:32:55 +02:00
storage.synchronizeDocuments({Storage::Document{sourceId1, {importId1}}});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
types[1].prototype = Storage::ExportedType{"Object"};
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId1, sourceId2}),
QmlDesigner::TypeNameDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddsNewTypesWithMissingImport)
{
Storage::Types types{createTypes()};
QmlDesigner: Relink alias properties There are still some corner cases but this will be done in follow-up patches. The link information moved to the typenames table so only indirections are saved in the propertyDeclarations table. Otherwise the duplication would increase the database size too much. Task-number: QDS-4551 Change-Id: I4aca85dd2d803b43aa9860183e500ced2d91141f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-15 12:32:55 +02:00
storage.synchronizeDocuments({Storage::Document{sourceId1, {importId1}}});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId1, sourceId2}),
QmlDesigner::TypeNameDoesNotExists);
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddsNewTypesReverseOrder)
{
Storage::Types types{createTypes()};
std::reverse(types.begin(), types.end());
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId2),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj")))),
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Item"))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesOverwritesTypeAccessSemantics)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
types[0].accessSemantics = TypeAccessSemantics::Value;
types[1].accessSemantics = TypeAccessSemantics::Value;
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Value,
sourceId2),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj")))),
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Value,
sourceId1),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Item"))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesOverwritesSources)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
types[0].sourceId = sourceId3;
types[1].sourceId = sourceId4;
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId4),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj")))),
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId3),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Item"))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesInsertTypeIntoPrototypeChain)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
types[0].prototype = Storage::NativeType{"QQuickObject"};
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
types.push_back(Storage::Type{importId2,
"QQuickObject",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
TypeAccessSemantics::Reference,
sourceId1,
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
importIds,
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
{Storage::ExportedType{"Object"}}});
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId2),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj")))),
AllOf(IsStorageType(importId2,
"QQuickObject",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object")))),
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QQuickObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Item"))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddExplicitPrototype)
{
Storage::Types types{createTypes()};
types[0].prototype = Storage::ExplicitExportedType{"Object", importId2};
types.push_back(Storage::Type{importId2,
"QQuickObject",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1,
importIds,
{Storage::ExportedType{"Object"}}});
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId2),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj")))),
AllOf(IsStorageType(importId2,
"QQuickObject",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object")))),
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QQuickObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Item"))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesThrowsForMissingPrototype)
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
{
QmlDesigner: Synchronize type A type should not removed but all it's fields should be reseted. This has the advantage that if you remove a file and add it again later the id is stable. Change-Id: I3a1f51e14195cff2fc39681acdf7072d1a2e4616 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-31 18:13:42 +02:00
sourceId1 = sourcePathCache.sourceId(path1);
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Storage::Types types{Storage::Type{importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1,
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
importIds,
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
{Storage::ExportedType{"Item"}}}};
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId1}), QmlDesigner::TypeNameDoesNotExists);
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
QmlDesigner: Synchronize type A type should not removed but all it's fields should be reseted. This has the advantage that if you remove a file and add it again later the id is stable. Change-Id: I3a1f51e14195cff2fc39681acdf7072d1a2e4616 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-31 18:13:42 +02:00
TEST_F(ProjectStorageSlowTest, TypeWithInvalidSourceIdThrows)
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
{
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Storage::Types types{Storage::Type{importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{""},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
SourceId{},
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
importIds,
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
{Storage::ExportedType{"Item"}}}};
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
QmlDesigner: Synchronize type A type should not removed but all it's fields should be reseted. This has the advantage that if you remove a file and add it again later the id is stable. Change-Id: I3a1f51e14195cff2fc39681acdf7072d1a2e4616 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-31 18:13:42 +02:00
ASSERT_THROW(storage.synchronizeTypes(types, {}), QmlDesigner::TypeHasInvalidSourceId);
}
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TEST_F(ProjectStorageSlowTest, DeleteTypeIfSourceIdIsSynchronized)
QmlDesigner: Synchronize type A type should not removed but all it's fields should be reseted. This has the advantage that if you remove a file and add it again later the id is stable. Change-Id: I3a1f51e14195cff2fc39681acdf7072d1a2e4616 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-31 18:13:42 +02:00
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
types.erase(types.begin());
QmlDesigner: Synchronize type A type should not removed but all it's fields should be reseted. This has the advantage that if you remove a file and add it again later the id is stable. Change-Id: I3a1f51e14195cff2fc39681acdf7072d1a2e4616 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-31 18:13:42 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId2),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj"))))));
QmlDesigner: Synchronize type A type should not removed but all it's fields should be reseted. This has the advantage that if you remove a file and add it again later the id is stable. Change-Id: I3a1f51e14195cff2fc39681acdf7072d1a2e4616 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-31 18:13:42 +02:00
}
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TEST_F(ProjectStorageSlowTest, DontDeleteTypeIfSourceIdIsNotSynchronized)
QmlDesigner: Synchronize type A type should not removed but all it's fields should be reseted. This has the advantage that if you remove a file and add it again later the id is stable. Change-Id: I3a1f51e14195cff2fc39681acdf7072d1a2e4616 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-31 18:13:42 +02:00
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
types.pop_back();
storage.synchronizeTypes(types, {sourceId1});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId2),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj")))),
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Item"))))));
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
}
QmlDesigner: Handle more corner cases for alias relinking Synchronization should always throw an exception if it gets in an inconsitent state. Task-number: QDS-4551 Change-Id: I8c55198115aa79b676a13fe0cd7ab225fb6723d5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-01 10:42:38 +02:00
TEST_F(ProjectStorageSlowTest, UpdateExportedTypesIfTypeNameChanges)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
types[0].typeName = "QQuickItem2";
storage.synchronizeTypes({types[0]}, {sourceId1});
ASSERT_THAT(storage.fetchTypes(),
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId2),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj")))),
AllOf(IsStorageType(importId2,
"QQuickItem2",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Item"))))));
}
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TEST_F(ProjectStorageSlowTest, BreakingPrototypeChainByDeletingBaseComponentThrows)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
types.pop_back();
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId1, sourceId2}),
Sqlite::ConstraintPreventsModification);
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddPropertyDeclarations)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Contains(
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration(
"children",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly))))));
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
}
TEST_F(ProjectStorageSlowTest,
SynchronizeTypesAddPropertyDeclarationsWithMissingImportIdsForNativeTypes)
{
Storage::Types types{createTypes()};
QmlDesigner: Relink alias properties There are still some corner cases but this will be done in follow-up patches. The link information moved to the typenames table so only indirections are saved in the propertyDeclarations table. Otherwise the duplication would increase the database size too much. Task-number: QDS-4551 Change-Id: I4aca85dd2d803b43aa9860183e500ced2d91141f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-15 12:32:55 +02:00
storage.synchronizeDocuments({Storage::Document{sourceId1, {importId2}}});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
types[0].propertyDeclarations.pop_back();
ASSERT_THROW(storage.synchronizeTypes(types, {}), QmlDesigner::TypeNameDoesNotExists);
}
TEST_F(ProjectStorageSlowTest,
SynchronizeTypesAddPropertyDeclarationsWithMissingImportIdsForExportedTypes)
{
Storage::Types types{createTypes()};
QmlDesigner: Relink alias properties There are still some corner cases but this will be done in follow-up patches. The link information moved to the typenames table so only indirections are saved in the propertyDeclarations table. Otherwise the duplication would increase the database size too much. Task-number: QDS-4551 Change-Id: I4aca85dd2d803b43aa9860183e500ced2d91141f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-15 12:32:55 +02:00
storage.synchronizeDocuments({Storage::Document{sourceId1, {importId1}}});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
types[0].propertyDeclarations[0].typeName = Storage::ExportedType{"Obj"};
ASSERT_THROW(storage.synchronizeTypes(types, {}), QmlDesigner::TypeNameDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddPropertyDeclarationExplicitType)
{
Storage::Types types{createTypes()};
types[0].propertyDeclarations[0].typeName = Storage::ExplicitExportedType{"Object", importId2};
types.push_back(Storage::Type{importId2,
"QQuickObject",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1,
importIds,
{Storage::ExportedType{"Object"}}});
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Contains(
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("data",
Storage::NativeType{"QQuickObject"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration(
"children",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesPropertyDeclarationType)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
types[0].propertyDeclarations[0].typeName = Storage::NativeType{"QQuickItem"};
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
storage.synchronizeTypes(types, {});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Contains(
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("data",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration(
"children",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesDeclarationTraits)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
types[0].propertyDeclarations[0].traits = Storage::PropertyDeclarationTraits::IsPointer;
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
storage.synchronizeTypes(types, {});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Contains(
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsPointer),
IsPropertyDeclaration(
"children",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesDeclarationTraitsAndType)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
types[0].propertyDeclarations[0].traits = Storage::PropertyDeclarationTraits::IsPointer;
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
types[0].propertyDeclarations[0].typeName = Storage::NativeType{"QQuickItem"};
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
storage.synchronizeTypes(types, {});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Contains(
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("data",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsPointer),
IsPropertyDeclaration(
"children",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesRemovesAPropertyDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].propertyDeclarations.pop_back();
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::propertyDeclarations,
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
UnorderedElementsAre(IsPropertyDeclaration(
"data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddsAPropertyDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].propertyDeclarations.push_back(
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::PropertyDeclaration{"object",
Storage::NativeType{"QObject"},
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Storage::PropertyDeclarationTraits::IsPointer});
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
storage.synchronizeTypes(types, {});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
ASSERT_THAT(
storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("object",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsPointer),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration("children",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesRenameAPropertyDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].propertyDeclarations[1].name = "objects";
storage.synchronizeTypes(types, {});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Contains(
AllOf(IsStorageType(importId2,
"QQuickItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration(
"objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly))))));
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
}
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
TEST_F(ProjectStorageSlowTest, UsingNonExistingNativePropertyTypeThrows)
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
{
Storage::Types types{createTypes()};
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
types[0].propertyDeclarations[0].typeName = Storage::NativeType{"QObject2"};
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
types.pop_back();
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId1, sourceId2}),
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
QmlDesigner::TypeNameDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, UsingNonExistingExportedPropertyTypeThrows)
{
Storage::Types types{createTypes()};
types[0].propertyDeclarations[0].typeName = Storage::ExportedType{"QObject2"};
types.pop_back();
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId1, sourceId2}),
QmlDesigner::TypeNameDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, UsingNonExistingExplicitExportedPropertyTypeWithWrongNAMEThrows)
{
Storage::Types types{createTypes()};
types[0].propertyDeclarations[0].typeName = Storage::ExplicitExportedType{"QObject2", importId1};
types.pop_back();
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId1, sourceId2}),
QmlDesigner::TypeNameDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, UsingNonExistingExplicitExportedPropertyTypeWithWrongImportThrows)
{
Storage::Types types{createTypes()};
types[0].propertyDeclarations[0].typeName = Storage::ExplicitExportedType{"QObject", importId2};
types.pop_back();
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId1, sourceId2}),
QmlDesigner::TypeNameDoesNotExists);
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
}
TEST_F(ProjectStorageSlowTest, BreakingPropertyDeclarationTypeDependencyByDeletingTypeThrows)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
types[0].prototype = Storage::NativeType{};
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
types.pop_back();
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId1, sourceId2}),
QmlDesigner: Relink alias properties There are still some corner cases but this will be done in follow-up patches. The link information moved to the typenames table so only indirections are saved in the propertyDeclarations table. Otherwise the duplication would increase the database size too much. Task-number: QDS-4551 Change-Id: I4aca85dd2d803b43aa9860183e500ced2d91141f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-15 12:32:55 +02:00
QmlDesigner::TypeNameDoesNotExists);
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddFunctionDeclarations)
{
Storage::Types types{createTypes()};
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2});
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::functionDeclarations,
UnorderedElementsAre(Eq(types[0].functionDeclarations[0]),
Eq(types[0].functionDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesFunctionDeclarationReturnType)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].functionDeclarations[1].returnTypeName = "item";
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::functionDeclarations,
UnorderedElementsAre(Eq(types[0].functionDeclarations[0]),
Eq(types[0].functionDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesFunctionDeclarationName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].functionDeclarations[1].name = "name";
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::functionDeclarations,
UnorderedElementsAre(Eq(types[0].functionDeclarations[0]),
Eq(types[0].functionDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesFunctionDeclarationPopParameters)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].functionDeclarations[1].parameters.pop_back();
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::functionDeclarations,
UnorderedElementsAre(Eq(types[0].functionDeclarations[0]),
Eq(types[0].functionDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesFunctionDeclarationAppendParameters)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].functionDeclarations[1].parameters.push_back(Storage::ParameterDeclaration{"arg4", "int"});
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::functionDeclarations,
UnorderedElementsAre(Eq(types[0].functionDeclarations[0]),
Eq(types[0].functionDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesFunctionDeclarationChangeParameterName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].functionDeclarations[1].parameters[0].name = "other";
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::functionDeclarations,
UnorderedElementsAre(Eq(types[0].functionDeclarations[0]),
Eq(types[0].functionDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesFunctionDeclarationChangeParameterTypeName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].functionDeclarations[1].parameters[0].name = "long long";
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::functionDeclarations,
UnorderedElementsAre(Eq(types[0].functionDeclarations[0]),
Eq(types[0].functionDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesFunctionDeclarationChangeParameterTraits)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
types[0].functionDeclarations[1].parameters[0].traits = QmlDesigner::Storage::PropertyDeclarationTraits::IsList;
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::functionDeclarations,
UnorderedElementsAre(Eq(types[0].functionDeclarations[0]),
Eq(types[0].functionDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesRemovesFunctionDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].functionDeclarations.pop_back();
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::functionDeclarations,
UnorderedElementsAre(Eq(types[0].functionDeclarations[0]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddFunctionDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].functionDeclarations.push_back(
Storage::FunctionDeclaration{"name", "string", {Storage::ParameterDeclaration{"arg", "int"}}});
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::functionDeclarations,
UnorderedElementsAre(Eq(types[0].functionDeclarations[0]),
Eq(types[0].functionDeclarations[1]),
Eq(types[0].functionDeclarations[2]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddSignalDeclarations)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(types[0].signalDeclarations[0]),
Eq(types[0].signalDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesSignalDeclarationName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].signalDeclarations[1].name = "name";
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(types[0].signalDeclarations[0]),
Eq(types[0].signalDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesSignalDeclarationPopParameters)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].signalDeclarations[1].parameters.pop_back();
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(types[0].signalDeclarations[0]),
Eq(types[0].signalDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesSignalDeclarationAppendParameters)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].signalDeclarations[1].parameters.push_back(Storage::ParameterDeclaration{"arg4", "int"});
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(types[0].signalDeclarations[0]),
Eq(types[0].signalDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesSignalDeclarationChangeParameterName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].signalDeclarations[1].parameters[0].name = "other";
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(types[0].signalDeclarations[0]),
Eq(types[0].signalDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesSignalDeclarationChangeParameterTypeName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].signalDeclarations[1].parameters[0].typeName = "long long";
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(types[0].signalDeclarations[0]),
Eq(types[0].signalDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesSignalDeclarationChangeParameterTraits)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
types[0].signalDeclarations[1].parameters[0].traits = QmlDesigner::Storage::PropertyDeclarationTraits::IsList;
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(types[0].signalDeclarations[0]),
Eq(types[0].signalDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesRemovesSignalDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].signalDeclarations.pop_back();
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(types[0].signalDeclarations[0]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddSignalDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].signalDeclarations.push_back(
Storage::SignalDeclaration{"name", {Storage::ParameterDeclaration{"arg", "int"}}});
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::signalDeclarations,
UnorderedElementsAre(Eq(types[0].signalDeclarations[0]),
Eq(types[0].signalDeclarations[1]),
Eq(types[0].signalDeclarations[2]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddEnumerationDeclarations)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::enumerationDeclarations,
UnorderedElementsAre(Eq(types[0].enumerationDeclarations[0]),
Eq(types[0].enumerationDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesEnumerationDeclarationName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].enumerationDeclarations[1].name = "Name";
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::enumerationDeclarations,
UnorderedElementsAre(Eq(types[0].enumerationDeclarations[0]),
Eq(types[0].enumerationDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesEnumerationDeclarationPopEnumeratorDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].enumerationDeclarations[1].enumeratorDeclarations.pop_back();
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::enumerationDeclarations,
UnorderedElementsAre(Eq(types[0].enumerationDeclarations[0]),
Eq(types[0].enumerationDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangesEnumerationDeclarationAppendEnumeratorDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].enumerationDeclarations[1].enumeratorDeclarations.push_back(
Storage::EnumeratorDeclaration{"Haa", 54});
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::enumerationDeclarations,
UnorderedElementsAre(Eq(types[0].enumerationDeclarations[0]),
Eq(types[0].enumerationDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest,
SynchronizeTypesChangesEnumerationDeclarationChangeEnumeratorDeclarationName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].enumerationDeclarations[1].enumeratorDeclarations[0].name = "Hoo";
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::enumerationDeclarations,
UnorderedElementsAre(Eq(types[0].enumerationDeclarations[0]),
Eq(types[0].enumerationDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest,
SynchronizeTypesChangesEnumerationDeclarationChangeEnumeratorDeclarationValue)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].enumerationDeclarations[1].enumeratorDeclarations[1].value = 11;
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::enumerationDeclarations,
UnorderedElementsAre(Eq(types[0].enumerationDeclarations[0]),
Eq(types[0].enumerationDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest,
SynchronizeTypesChangesEnumerationDeclarationAddThatEnumeratorDeclarationHasValue)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].enumerationDeclarations[1].enumeratorDeclarations[0].value = 11;
types[0].enumerationDeclarations[1].enumeratorDeclarations[0].hasValue = true;
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::enumerationDeclarations,
UnorderedElementsAre(Eq(types[0].enumerationDeclarations[0]),
Eq(types[0].enumerationDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest,
SynchronizeTypesChangesEnumerationDeclarationRemoveThatEnumeratorDeclarationHasValue)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].enumerationDeclarations[1].enumeratorDeclarations[0].hasValue = false;
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::enumerationDeclarations,
UnorderedElementsAre(Eq(types[0].enumerationDeclarations[0]),
Eq(types[0].enumerationDeclarations[1]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesRemovesEnumerationDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].enumerationDeclarations.pop_back();
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::enumerationDeclarations,
UnorderedElementsAre(Eq(types[0].enumerationDeclarations[0]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddEnumerationDeclaration)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {});
types[0].enumerationDeclarations.push_back(
Storage::EnumerationDeclaration{"name", {Storage::EnumeratorDeclaration{"Foo", 98, true}}});
storage.synchronizeTypes(types, {});
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
Contains(AllOf(IsStorageType(importId2,
"QQuickItem",
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TypeAccessSemantics::Reference,
sourceId1),
Field(&Storage::Type::enumerationDeclarations,
UnorderedElementsAre(Eq(types[0].enumerationDeclarations[0]),
Eq(types[0].enumerationDeclarations[1]),
Eq(types[0].enumerationDeclarations[2]))))));
QmlDesigner: Sync project storage Task-number: QDS-4423 Change-Id: Ia99df711effff2909b0a57ecebfb386ca51165f8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 15:52:20 +02:00
}
QmlDesigner: Add Import Synchronization Task-number: QDS-4460 Change-Id: Icd419baa7881fe882539f10d335ab6b3d36bc7b5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-01 17:46:49 +02:00
TEST_F(ProjectStorageSlowTest, SynchronizeImportsAddImports)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
ASSERT_THAT(storage.fetchAllImports(),
UnorderedElementsAre(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
IsImport("/path/to", Storage::VersionNumber{}, SourceId{})));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsAddImportsAgain)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
storage.synchronizeImports(imports);
ASSERT_THAT(storage.fetchAllImports(),
UnorderedElementsAre(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
IsImport("/path/to", Storage::VersionNumber{}, SourceId{})));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsAddMoreImports)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
imports.push_back(Storage::Import{"QtQuick.Foo", Storage::VersionNumber{1}, importSourceId3});
storage.synchronizeImports(imports);
ASSERT_THAT(storage.fetchAllImports(),
UnorderedElementsAre(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
IsImport("/path/to", Storage::VersionNumber{}, SourceId{}),
IsImport("QtQuick.Foo", Storage::VersionNumber{1}, importSourceId3)));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsAddSameImportNameButDifferentVersion)
{
Storage::Imports imports{createImports()};
imports.push_back(Storage::Import{"Qml", Storage::VersionNumber{4}, importSourceId3});
storage.synchronizeImports(imports);
imports.pop_back();
imports.push_back(Storage::Import{"Qml", Storage::VersionNumber{3}, importSourceId3});
storage.synchronizeImports(imports);
ASSERT_THAT(storage.fetchAllImports(),
UnorderedElementsAre(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
IsImport("Qml", Storage::VersionNumber{3}, importSourceId3),
IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
IsImport("/path/to", Storage::VersionNumber{}, SourceId{})));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsRemoveImport)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
imports.pop_back();
storage.synchronizeImports(imports);
ASSERT_THAT(storage.fetchAllImports(),
UnorderedElementsAre(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2)));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsUpdateImport)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
imports[1].sourceId = importSourceId3;
storage.synchronizeImports(imports);
ASSERT_THAT(storage.fetchAllImports(),
UnorderedElementsAre(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
IsImport("QtQuick", Storage::VersionNumber{}, importSourceId3),
IsImport("/path/to", Storage::VersionNumber{}, SourceId{})));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsAddImportDependecies)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
ASSERT_THAT(storage.fetchAllImports(),
UnorderedElementsAre(
AllOf(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
Field(&Storage::Import::importDependencies,
ElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2})))),
AllOf(IsImport("/path/to", Storage::VersionNumber{}, SourceId{}),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2}),
IsBasicImport("QtQuick",
Storage::VersionNumber{}))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsAddImportDependeciesWhichDoesNotExitsThrows)
{
Storage::Imports imports{createImports()};
imports[1].importDependencies.push_back(Storage::Import{"QmlBase", Storage::VersionNumber{2}});
ASSERT_THROW(storage.synchronizeImports(imports), QmlDesigner::ImportDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsRemovesDependeciesForRemovedImports)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
auto last = imports.back();
imports.pop_back();
storage.synchronizeImports(imports);
last.importDependencies.pop_back();
imports.push_back(last);
storage.synchronizeImports(imports);
ASSERT_THAT(storage.fetchAllImports(),
UnorderedElementsAre(
AllOf(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
Field(&Storage::Import::importDependencies,
ElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2})))),
AllOf(IsImport("/path/to", Storage::VersionNumber{}, SourceId{}),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(
IsBasicImport("QtQuick", Storage::VersionNumber{}))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsAddMoreImportDependecies)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
imports.push_back(Storage::Import{"QmlBase", Storage::VersionNumber{2}, importSourceId1, {}});
imports[1].importDependencies.push_back(Storage::Import{"QmlBase", Storage::VersionNumber{2}});
storage.synchronizeImports(imports);
ASSERT_THAT(
storage.fetchAllImports(),
UnorderedElementsAre(
AllOf(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("QmlBase", Storage::VersionNumber{2}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2}),
IsBasicImport("QmlBase", Storage::VersionNumber{2})))),
AllOf(IsImport("/path/to", Storage::VersionNumber{}, SourceId{}),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2}),
IsBasicImport("QtQuick", Storage::VersionNumber{}))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsAddMoreImportDependeciesWithDifferentVersionNumber)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
imports.push_back(Storage::Import{"Qml", Storage::VersionNumber{3}, importSourceId1, {}});
imports[1].importDependencies.push_back(Storage::Import{"Qml", Storage::VersionNumber{3}});
storage.synchronizeImports(imports);
ASSERT_THAT(
storage.fetchAllImports(),
UnorderedElementsAre(
AllOf(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("Qml", Storage::VersionNumber{3}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2}),
IsBasicImport("Qml", Storage::VersionNumber{3})))),
AllOf(IsImport("/path/to", Storage::VersionNumber{}, SourceId{}),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2}),
IsBasicImport("QtQuick", Storage::VersionNumber{}))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsDependencyGetsHighestVersionIfNoVersionIsSupplied)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
imports.push_back(Storage::Import{"Qml", Storage::VersionNumber{3}, importSourceId1, {}});
imports[1].importDependencies.push_back(Storage::Import{"Qml"});
storage.synchronizeImports(imports);
ASSERT_THAT(
storage.fetchAllImports(),
UnorderedElementsAre(
AllOf(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("Qml", Storage::VersionNumber{3}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2}),
IsBasicImport("Qml", Storage::VersionNumber{3})))),
AllOf(IsImport("/path/to", Storage::VersionNumber{}, SourceId{}),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2}),
IsBasicImport("QtQuick", Storage::VersionNumber{}))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsDependencyGetsOnlyTheHighestDependency)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
imports.push_back(Storage::Import{"Qml", Storage::VersionNumber{1}, importSourceId1, {}});
imports[1].importDependencies.push_back(Storage::Import{"Qml"});
storage.synchronizeImports(imports);
ASSERT_THAT(
storage.fetchAllImports(),
UnorderedElementsAre(
AllOf(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("Qml", Storage::VersionNumber{1}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2})))),
AllOf(IsImport("/path/to", Storage::VersionNumber{}, SourceId{}),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2}),
IsBasicImport("QtQuick", Storage::VersionNumber{}))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeImportsDependencyRemoveDuplicateDependencies)
{
Storage::Imports imports{createImports()};
storage.synchronizeImports(imports);
imports.push_back(Storage::Import{"Qml", Storage::VersionNumber{3}, importSourceId1, {}});
imports[2].importDependencies.push_back(Storage::Import{"Qml", Storage::VersionNumber{3}});
imports[2].importDependencies.push_back(Storage::Import{"Qml", Storage::VersionNumber{2}});
imports[2].importDependencies.push_back(Storage::Import{"Qml", Storage::VersionNumber{3}});
imports[2].importDependencies.push_back(Storage::Import{"Qml", Storage::VersionNumber{2}});
storage.synchronizeImports(imports);
ASSERT_THAT(
storage.fetchAllImports(),
UnorderedElementsAre(
AllOf(IsImport("Qml", Storage::VersionNumber{2}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("Qml", Storage::VersionNumber{3}, importSourceId1),
Field(&Storage::Import::importDependencies, IsEmpty())),
AllOf(IsImport("QtQuick", Storage::VersionNumber{}, importSourceId2),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2})))),
AllOf(IsImport("/path/to", Storage::VersionNumber{}, SourceId{}),
Field(&Storage::Import::importDependencies,
UnorderedElementsAre(IsBasicImport("Qml", Storage::VersionNumber{2}),
IsBasicImport("Qml", Storage::VersionNumber{3}),
IsBasicImport("QtQuick", Storage::VersionNumber{}))))));
}
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
TEST_F(ProjectStorageSlowTest, RemovingImportRemovesDependentTypesToo)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
Storage::Imports imports{createImports()};
imports.pop_back();
imports.pop_back();
storage.synchronizeImports(imports);
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
ASSERT_THAT(storage.fetchTypes(),
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
UnorderedElementsAre(AllOf(IsStorageType(importId1,
"QObject",
Storage::NativeType{},
TypeAccessSemantics::Reference,
sourceId2),
Field(&Storage::Type::exportedTypes,
UnorderedElementsAre(IsExportedType("Object"),
IsExportedType("Obj"))))));
QmlDesigner: Use import in exported types We can remove the version from exported types because the are implicit by the import. Task-number: QDS-4458 Change-Id: I4a259dff5e59537b72a57d7df95256a38d036e7b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-07 10:51:25 +02:00
}
TEST_F(ProjectStorageSlowTest, FetchTypeIdByImportIdAndName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
auto typeId = storage.fetchTypeIdByName(importId1, "QObject");
ASSERT_THAT(storage.fetchTypeIdByExportedName("Object"), Eq(typeId));
}
TEST_F(ProjectStorageSlowTest, FetchTypeIdByExportedName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
auto typeId = storage.fetchTypeIdByExportedName("Object");
ASSERT_THAT(storage.fetchTypeIdByName(importId1, "QObject"), Eq(typeId));
}
TEST_F(ProjectStorageSlowTest, FetchTypeIdByImporIdsAndExportedName)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
auto typeId = storage.fetchTypeIdByImportIdsAndExportedName({importId1, importId2}, "Object");
ASSERT_THAT(storage.fetchTypeIdByName(importId1, "QObject"), Eq(typeId));
}
TEST_F(ProjectStorageSlowTest, FetchInvalidTypeIdByImporIdsAndExportedNameIfImportIdsAreEmpty)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
auto typeId = storage.fetchTypeIdByImportIdsAndExportedName({}, "Object");
ASSERT_FALSE(typeId.isValid());
}
TEST_F(ProjectStorageSlowTest, FetchInvalidTypeIdByImporIdsAndExportedNameIfImportIdsAreInvalid)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
auto typeId = storage.fetchTypeIdByImportIdsAndExportedName({ImportId{}}, "Object");
ASSERT_FALSE(typeId.isValid());
}
TEST_F(ProjectStorageSlowTest, FetchInvalidTypeIdByImporIdsAndExportedNameIfNotInImport)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
auto typeId = storage.fetchTypeIdByImportIdsAndExportedName({importId2, importId3}, "Object");
ASSERT_FALSE(typeId.isValid());
QmlDesigner: Add importId to types If we now try to synchrize to an inconsistent type model we get an exception. Task-number: QDS-4458 Change-Id: I86f7ce90d14b18227a66314fb341f5b528bdfb95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-03 13:06:23 +02:00
}
QmlDesigner: Handle implicit and explicit type names Types are now handled by their import. Impicitly by an import list or explicit for exported type. Task-number: QDS-4496 Change-Id: I63f40df32760389e25b73597b4363f95ee304592 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-07 16:16:24 +02:00
TEST_F(ProjectStorageSlowTest, FetchImportDepencencyIds)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
auto importIds = storage.fetchImportDependencyIds({importId3});
ASSERT_THAT(importIds, UnorderedElementsAre(importId1, importId2, importId3));
}
TEST_F(ProjectStorageSlowTest, FetchImportDepencencyIdsForRootDepencency)
{
Storage::Types types{createTypes()};
storage.synchronizeTypes(types, {sourceId1, sourceId2});
auto importIds = storage.fetchImportDependencyIds({importId1});
ASSERT_THAT(importIds, ElementsAre(importId1));
}
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddAliasDeclarations)
{
Storage::Types types{createTypesWithAliases()};
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
sourceId3),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddAliasDeclarationsAgain)
{
Storage::Types types{createTypesWithAliases()};
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
sourceId3),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesRemoveAliasDeclarations)
{
Storage::Types types{createTypesWithAliases()};
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
types[2].aliasDeclarations.pop_back();
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes({types[2]}, {sourceId3});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
sourceId3),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddAliasDeclarationsThrowsForWrongTypeName)
{
Storage::Types types{createTypesWithAliases()};
types[2].aliasDeclarations[0].aliasTypeName = Storage::NativeType{"QQuickItemWrong"};
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
ASSERT_THROW(storage.synchronizeTypes({types[2]}, {sourceId4}),
QmlDesigner::TypeNameDoesNotExists);
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesAddAliasDeclarationsThrowsForWrongPropertyName)
{
Storage::Types types{createTypesWithAliases()};
types[2].aliasDeclarations[0].aliasPropertyName = "childrenWrong";
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
ASSERT_THROW(storage.synchronizeTypes(types, {sourceId4}), QmlDesigner::PropertyNameDoesNotExists);
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangeAliasDeclarationsTypeName)
{
Storage::Types types{createTypesWithAliases()};
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
types[2].aliasDeclarations[1].aliasTypeName = Storage::ExportedType{"Obj2"};
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes({types[2]}, {sourceId3});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
sourceId3),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
Storage::NativeType{"QObject"},
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangeAliasDeclarationsPropertyName)
{
Storage::Types types{createTypesWithAliases()};
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
types[2].aliasDeclarations[1].aliasPropertyName = "children";
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes({types[2]}, {sourceId3});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
ASSERT_THAT(
storage.fetchTypes(),
Contains(
AllOf(IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
sourceId3),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangeAliasDeclarationsToPropertyDeclaration)
{
Storage::Types types{createTypesWithAliases()};
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
types[2].aliasDeclarations.pop_back();
types[2].propertyDeclarations.push_back(
Storage::PropertyDeclaration{"objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly});
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes({types[2]}, {sourceId3});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
ASSERT_THAT(
storage.fetchTypes(),
Contains(
AllOf(IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
sourceId3),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangePropertyDeclarationsToAliasDeclaration)
{
Storage::Types types{createTypesWithAliases()};
auto typesChanged = types;
typesChanged[2].aliasDeclarations.pop_back();
typesChanged[2].propertyDeclarations.push_back(
Storage::PropertyDeclaration{"objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly});
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes(typesChanged, {sourceId1, sourceId2, sourceId3, sourceId4});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
sourceId3),
QmlDesigner: Synchronize alias properties Alias property declarations are handled like normal property declarations except that the have an value for the target property declaration id. So they are distinguishable by the alias id. If it is not set it is a normal property declaration. If it is set it is alias property declaration. Alias property declaration are always synchronized after all normal property declaration are synchronized. This synchronization is not checking if the target property declaration changed. This update has to be executed by the target property declaration. Task-number: QDS-4524 Change-Id: I483840c821e12c93f1be67bf5ed6da396f8b45a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-09 17:56:34 +02:00
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangeAliasTargetPropertyDeclarationTraits)
{
Storage::Types types{createTypesWithAliases()};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types[1].propertyDeclarations[0].traits = Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly;
storage.synchronizeTypes({types[1]}, {sourceId2});
ASSERT_THAT(
storage.fetchTypes(),
Contains(
AllOf(IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
sourceId3),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesChangeAliasTargetPropertyDeclarationTypeName)
{
Storage::Types types{createTypesWithAliases()};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types[1].propertyDeclarations[0].typeName = Storage::ExportedType{"Item"};
storage.synchronizeTypes({types[1]}, {sourceId2});
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
sourceId3),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesRemovePropertyDeclarationWithAnAliasThrows)
{
Storage::Types types{createTypesWithAliases()};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types[1].propertyDeclarations.pop_back();
ASSERT_THROW(storage.synchronizeTypes({types[1]}, {sourceId2}),
Sqlite::ConstraintPreventsModification);
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesRemovePropertyDeclarationAndAlias)
{
Storage::Types types{createTypesWithAliases()};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types[1].propertyDeclarations.pop_back();
types[2].aliasDeclarations.pop_back();
storage.synchronizeTypes({types[1], types[2]}, {sourceId2, sourceId3});
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
sourceId3),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesRemoveTypeWithAliasTargetPropertyDeclarationThrows)
{
Storage::Types types{createTypesWithAliases()};
types[2].aliasDeclarations[1].aliasTypeName = Storage::ExportedType{"Object2"};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
QmlDesigner: Handle more corner cases for alias relinking Synchronization should always throw an exception if it gets in an inconsitent state. Task-number: QDS-4551 Change-Id: I8c55198115aa79b676a13fe0cd7ab225fb6723d5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-01 10:42:38 +02:00
ASSERT_THROW(storage.synchronizeTypes({}, {sourceId4}), QmlDesigner::TypeNameDoesNotExists);
QmlDesigner: Update alias property declarations Alias property declaration removal is now done before the normal property declarations are synchronized. Task-number: QDS-4525 Change-Id: Icddf5e041b672e4abfab89540906bbfdcc1a10ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-10 16:39:29 +02:00
}
TEST_F(ProjectStorageSlowTest, SynchronizeTypesRemoveTypeAndAliasPropertyDeclaration)
{
Storage::Types types{createTypesWithAliases()};
types[2].aliasDeclarations[1].aliasTypeName = Storage::ExportedType{"Object2"};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types[2].aliasDeclarations.pop_back();
storage.synchronizeTypes({types[0], types[2]}, {sourceId1, sourceId3});
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
sourceId3),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
QmlDesigner: Relink alias properties There are still some corner cases but this will be done in follow-up patches. The link information moved to the typenames table so only indirections are saved in the propertyDeclarations table. Otherwise the duplication would increase the database size too much. Task-number: QDS-4551 Change-Id: I4aca85dd2d803b43aa9860183e500ced2d91141f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-15 12:32:55 +02:00
TEST_F(ProjectStorageSlowTest, UpdateAliasPropertyIfPropertyIsOverloaded)
{
Storage::Types types{createTypesWithAliases()};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types[0].propertyDeclarations.push_back(
Storage::PropertyDeclaration{"objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly});
storage.synchronizeTypes({types[0]}, {sourceId1});
ASSERT_THAT(
storage.fetchTypes(),
Contains(
AllOf(IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
sourceId3),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, AliasPropertyIsOverloaded)
{
Storage::Types types{createTypesWithAliases()};
types[0].propertyDeclarations.push_back(
Storage::PropertyDeclaration{"objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly});
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
ASSERT_THAT(
storage.fetchTypes(),
Contains(
AllOf(IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
sourceId3),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, UpdateAliasPropertyIfOverloadedPropertyIsRemoved)
{
Storage::Types types{createTypesWithAliases()};
types[0].propertyDeclarations.push_back(
Storage::PropertyDeclaration{"objects",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly});
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types[0].propertyDeclarations.pop_back();
storage.synchronizeTypes({types[0]}, {sourceId1});
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
sourceId3),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, RelinkAliasProperty)
{
Storage::Types types{createTypesWithAliases()};
types[1].propertyDeclarations[0].typeName = Storage::NativeType{"QObject2"};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types[3].importId = importId2;
storage.synchronizeTypes({types[3]}, {sourceId4});
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
sourceId3),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QObject2"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
QmlDesigner: Handle more corner cases for alias relinking Synchronization should always throw an exception if it gets in an inconsitent state. Task-number: QDS-4551 Change-Id: I8c55198115aa79b676a13fe0cd7ab225fb6723d5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-01 10:42:38 +02:00
TEST_F(ProjectStorageSlowTest, RelinkAliasPropertyReactToTypeNameChange)
{
Storage::Types types{createTypesWithAliases2()};
types[2].aliasDeclarations.push_back(
Storage::AliasPropertyDeclaration{"items", Storage::ExportedType{"Item"}, "children"});
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types[0].typeName = "QQuickItem2";
storage.synchronizeTypes({types[0]}, {sourceId1});
ASSERT_THAT(storage.fetchTypes(),
Contains(AllOf(
IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QObject"},
TypeAccessSemantics::Reference,
sourceId3),
Field(&Storage::Type::propertyDeclarations,
UnorderedElementsAre(
IsPropertyDeclaration("items",
Storage::NativeType{"QQuickItem2"},
Storage::PropertyDeclarationTraits::IsList
| Storage::PropertyDeclarationTraits::IsReadOnly),
IsPropertyDeclaration("objects",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList),
IsPropertyDeclaration("data",
Storage::NativeType{"QObject"},
Storage::PropertyDeclarationTraits::IsList))))));
}
TEST_F(ProjectStorageSlowTest, DoNotRelinkAliasPropertyForDeletedType)
{
Storage::Types types{createTypesWithAliases()};
types[1].propertyDeclarations[0].typeName = Storage::NativeType{"QObject2"};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types.erase(std::next(types.begin(), 2));
types[2].importId = importId2;
storage.synchronizeTypes({types[2]}, {sourceId3, sourceId4});
ASSERT_THAT(storage.fetchTypes(),
Not(Contains(AllOf(IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
sourceId3)))));
}
TEST_F(ProjectStorageSlowTest, DoNotRelinkAliasPropertyForDeletedTypeAndPropertyType)
{
Storage::Types types{createTypesWithAliases()};
types[1].propertyDeclarations[0].typeName = Storage::NativeType{"QObject2"};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types.pop_back();
types.pop_back();
types[1].propertyDeclarations[0].typeName = Storage::NativeType{"QObject"};
storage.synchronizeTypes({types[1]}, {sourceId2, sourceId3, sourceId4});
ASSERT_THAT(storage.fetchTypes(), SizeIs(2));
}
TEST_F(ProjectStorageSlowTest, DoNotRelinkAliasPropertyForDeletedTypeAndPropertyTypeNameChange)
{
Storage::Types types{createTypesWithAliases()};
types[1].propertyDeclarations[0].typeName = Storage::NativeType{"QObject2"};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types.erase(std::next(types.begin(), 2));
types[2].importId = importId2;
types[1].propertyDeclarations[0].typeName = Storage::NativeType{"QObject"};
storage.synchronizeTypes({types[2]}, {sourceId3, sourceId4});
ASSERT_THAT(storage.fetchTypes(),
Not(Contains(AllOf(IsStorageType(importId2,
"QAliasItem",
Storage::NativeType{"QQuickItem"},
TypeAccessSemantics::Reference,
sourceId3)))));
}
TEST_F(ProjectStorageSlowTest, DoNotRelinkPropertyTypeDoesNotExists)
{
Storage::Types types{createTypesWithAliases()};
types[1].propertyDeclarations[0].typeName = Storage::NativeType{"QObject2"};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types.pop_back();
ASSERT_THROW(storage.synchronizeTypes({}, {sourceId4}), QmlDesigner::TypeNameDoesNotExists);
}
TEST_F(ProjectStorageSlowTest, DoNotRelinkAliasPropertyTypeDoesNotExists)
{
Storage::Types types{createTypesWithAliases2()};
types[1].propertyDeclarations[0].typeName = Storage::NativeType{"QObject2"};
storage.synchronizeTypes(types, {sourceId1, sourceId2, sourceId3, sourceId4});
types.erase(types.begin());
ASSERT_THROW(storage.synchronizeTypes({}, {sourceId1}), QmlDesigner::TypeNameDoesNotExists);
}
QmlDesigner: Add project storage Task-number: QDS-4252 Change-Id: Ic74e027b20bc41f3712e3ae155cddc64f8972cb0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-28 16:18:59 +02:00
} // namespace
Copy Permalink