From e9bdf5c88a84efbea3d53ef08252f390354caa16 Mon Sep 17 00:00:00 2001 From: Alex Plate Date: Thu, 27 Apr 2023 18:50:26 +0300 Subject: [PATCH] [Workspace Model] Perform tests cleanup and update package names, according to the new guide GitOrigin-RevId: 821983cb1888c285e36f417c0a90c01df725d30f --- .../ide/EntitiesOrphanageTest.kt | 2 +- .../ide/EntityWithCollectionTest.kt | 6 +- .../ide/ImlReplaceBySourceTest.kt | 2 +- .../ide/ImlSerializationTest.kt | 12 +- .../workspaceModel/ide/WorkspaceCacheTest.kt | 3 +- .../JpsProjectEntitiesLoaderTest.kt | 2 +- .../entities}/AssertConsistencyEntityImpl.kt | 4 +- .../entities}/AttachedEntityImpl.kt | 3 +- .../entities}/AttachedEntityListImpl.kt | 3 +- .../entities}/AttachedEntityParentListImpl.kt | 3 +- .../AttachedEntityToNullableParentImpl.kt | 3 +- .../entities}/AttachedEntityToParentImpl.kt | 3 +- .../entities}/BooleanEntityImpl.kt | 4 +- .../entities}/ChainedEntityImpl.kt | 2 +- .../entities}/ChainedParentEntityImpl.kt | 2 +- .../testEntities/entities}/ChildEntityImpl.kt | 4 +- .../entities}/ChildFirstEntityImpl.kt | 3 +- .../entities}/ChildMultipleEntityImpl.kt | 3 +- .../entities}/ChildNullableEntityImpl.kt | 3 +- .../entities}/ChildSampleEntityImpl.kt | 4 +- .../entities}/ChildSecondEntityImpl.kt | 3 +- .../entities}/ChildSingleFirstEntityImpl.kt | 4 +- .../entities}/ChildSingleSecondEntityImpl.kt | 4 +- .../entities}/ChildSourceEntityImpl.kt | 4 +- .../entities}/ChildSubEntityImpl.kt | 4 +- .../entities}/ChildSubSubEntityImpl.kt | 4 +- .../entities}/ChildWithNullsImpl.kt | 4 +- .../entities}/ChildWithNullsMultipleImpl.kt | 5 +- .../ChildWithNullsOppositeMultipleImpl.kt | 4 +- .../entities}/ChildWpidSampleEntityImpl.kt | 4 +- .../entities}/CollectionFieldEntityImpl.kt | 4 +- .../entities}/ComposedIdSoftRefEntityImpl.kt | 3 +- .../entities}/ComposedLinkEntityImpl.kt | 3 +- .../CompositeChildAbstractEntityImpl.kt | 4 +- .../entities}/ContentRootTestEntityImpl.kt | 4 +- .../entities}/DefaultValueEntityImpl.kt | 4 +- .../entities}/EntityWithSoftLinksImpl.kt | 23 +-- .../entities}/FacetTestEntityImpl.kt | 4 +- .../entities}/FinalFieldsEntityImpl.kt | 5 +- .../entities}/FirstEntityWithPIdImpl.kt | 3 +- .../entities}/HeadAbstractionEntityImpl.kt | 6 +- .../testEntities/entities}/IntEntityImpl.kt | 4 +- .../testEntities/entities}/KeyChildImpl.kt | 4 +- .../testEntities/entities}/KeyParentImpl.kt | 4 +- .../testEntities/entities}/LeftEntityImpl.kt | 6 +- .../entities}/LinkedListEntityImpl.kt | 3 +- .../testEntities/entities}/ListEntityImpl.kt | 4 +- .../entities}/ListVFUEntityImpl.kt | 4 +- .../testEntities/entities}/MainEntityImpl.kt | 3 +- .../entities}/MainEntityListImpl.kt | 3 +- .../entities}/MainEntityParentListImpl.kt | 3 +- .../entities}/MainEntityToParentImpl.kt | 3 +- .../entities}/MiddleEntityImpl.kt | 6 +- .../entities}/ModuleTestEntityImpl.kt | 4 +- .../entities}/NamedChildEntityImpl.kt | 3 +- .../testEntities/entities}/NamedEntityImpl.kt | 3 +- .../entities}/NullableVFUEntityImpl.kt | 4 +- .../entities}/OneEntityWithSymbolicIdImpl.kt | 3 +- .../entities}/OoChildAlsoWithPidEntityImpl.kt | 3 +- .../entities}/OoChildEntityImpl.kt | 3 +- .../OoChildForParentWithPidEntityImpl.kt | 3 +- .../OoChildWithNullableParentEntityImpl.kt | 3 +- .../entities}/OoChildWithPidEntityImpl.kt | 3 +- .../entities}/OoParentEntityImpl.kt | 3 +- .../entities}/OoParentWithPidEntityImpl.kt | 3 +- .../entities}/OoParentWithoutPidEntityImpl.kt | 3 +- .../entities}/OptionalIntEntityImpl.kt | 4 +- .../OptionalOneToOneChildEntityImpl.kt | 5 +- .../OptionalOneToOneParentEntityImpl.kt | 5 +- .../entities}/OptionalStringEntityImpl.kt | 4 +- .../entities}/ParentAbEntityImpl.kt | 3 +- .../entities}/ParentChainEntityImpl.kt | 4 +- .../entities}/ParentEntityImpl.kt | 4 +- .../entities}/ParentMultipleEntityImpl.kt | 3 +- .../entities}/ParentNullableEntityImpl.kt | 3 +- .../entities}/ParentSingleAbEntityImpl.kt | 4 +- .../entities}/ParentSubEntityImpl.kt | 4 +- .../entities}/ParentWithNullsImpl.kt | 4 +- .../entities}/ParentWithNullsMultipleImpl.kt | 5 +- .../ParentWithNullsOppositeMultipleImpl.kt | 4 +- .../entities}/ProjectModelTestEntityImpl.kt | 4 +- .../testEntities/entities}/RightEntityImpl.kt | 6 +- .../entities}/SampleEntity2Impl.kt | 3 +- .../entities}/SampleEntityImpl.kt | 4 +- .../SampleWithSymbolicIdEntityImpl.kt | 4 +- .../entities}/SecondEntityWithPIdImpl.kt | 3 +- .../entities}/SecondSampleEntityImpl.kt | 4 +- .../entities}/SelfLinkedEntityImpl.kt | 4 +- .../entities}/SetVFUEntityImpl.kt | 4 +- .../SimpleChildAbstractEntityImpl.kt | 4 +- .../entities}/SoftLinkReferencedChildImpl.kt | 3 +- .../entities}/SourceEntityImpl.kt | 4 +- .../entities}/SourceRootTestEntityImpl.kt | 4 +- .../SourceRootTestOrderEntityImpl.kt | 4 +- .../entities}/StringEntityImpl.kt | 4 +- .../entities}/SymbolicIdEntityImpl.kt | 4 +- .../testEntities/entities}/TreeEntityImpl.kt | 4 +- .../TreeMultiparentLeafEntityImpl.kt | 4 +- .../TreeMultiparentRootEntityImpl.kt | 4 +- .../entities}/UnknownFieldEntityImpl.kt | 2 +- .../testEntities/entities}/VFUEntity2Impl.kt | 3 +- .../testEntities/entities}/VFUEntityImpl.kt | 4 +- .../VFUWithTwoPropertiesEntityImpl.kt | 4 +- .../entities}/WithListSoftLinksEntityImpl.kt | 3 +- .../entities}/WithSoftLinkEntityImpl.kt | 3 +- .../entities}/XChildChildEntityImpl.kt | 3 +- .../entities}/XChildEntityImpl.kt | 3 +- .../XChildWithOptionalParentEntityImpl.kt | 3 +- .../entities}/XParentEntityImpl.kt | 3 +- .../testEntities/entities}/Abstraction.kt | 6 +- .../testEntities/entities}/ChainAbstract.kt | 4 +- .../testEntities/entities}/ChainedEntity.kt | 2 +- .../entities}/CollectionEntity.kt | 4 +- .../entities}/DefaultValueEntity.kt | 4 +- .../entities}/EntititesWithPersistentId.kt | 3 +- .../testEntities/entities}/EntitySources.kt | 3 +- .../entities}/ExtensionFieldEntity.kt | 3 +- .../entities}/ExtensionFieldEntityList.kt | 3 +- .../ExtensionFieldEntityParentList.kt | 3 +- .../entities}/ExtensionFieldEntityToParent.kt | 3 +- .../entities}/FinalFieldsEntity.kt | 5 +- .../storage/testEntities/entities}/JpsLike.kt | 4 +- .../entities}/KeyFieldEntities.kt | 4 +- .../entities}/LinkedListEntity.kt | 3 +- .../entities}/MultipleAbstract.kt | 3 +- .../testEntities/entities}/OneToOne.kt | 3 +- .../entities}/OptionalOneToOne.kt | 5 +- .../storage/testEntities/entities}/Parent.kt | 3 +- .../testEntities/entities}/ParentAndChild.kt | 4 +- .../entities}/ParentAndChildWithNulls.kt | 4 +- .../entities}/ParentAndMultipleChildren.kt | 3 +- .../entities}/ParentAndNullableChild.kt | 3 +- .../entities}/RiderTestEntities.kt | 4 +- .../testEntities/entities}/SampleEntity.kt | 4 +- .../entities}/SampleWithSymbolicIdEntity.kt | 4 +- .../testEntities/entities}/SecondEntities.kt | 3 +- .../entities}/SelfLinkedEntity.kt | 4 +- .../testEntities/entities}/SingleAbstract.kt | 4 +- .../testEntities/entities}/SubChildren.kt | 4 +- .../testEntities/entities}/TreeEntity.kt | 4 +- .../entities}/TreeMultiparentEntity.kt | 4 +- .../entities}/UnknownFieldEntity.kt | 3 +- .../entities}/WithAssertConsistency.kt | 4 +- .../entities}/WithNullsMultiple.kt | 15 +- .../entities}/WithNullsMultipleOpposite.kt | 14 +- .../entities}/WithPersistentId.kt | 3 +- .../entities}/WithSoftLinkEntityData.kt | 3 +- .../entities}/primitiveEntities.kt | 4 +- .../storage/testEntities/entities}/vfu.kt | 4 +- .../testEntities}/testEntitySources.kt | 0 .../storage/entities/test/TestEntities.kt | 79 ---------- ...orage.impl.ConsistencyCheckingModeProvider | 2 +- .../storage/tests}/AbstractEntitiesTest.kt | 5 +- .../storage/tests}/AbstractTest.kt | 13 +- .../storage/tests}/AddChildrenTest.kt | 6 +- .../storage/tests}/AssertConsistencyTest.kt | 4 +- .../CircularDependencyProhibitedTest.kt | 5 +- .../storage/tests}/ClassToIntConverterTest.kt | 2 +- .../tests}/CollectChangesInBuilderTest.kt | 7 +- .../storage/tests}/ContentRootEqualityTest.kt | 6 +- .../storage/tests}/DefaultValueTest.kt | 8 +- .../storage/tests}/DiffBuilderTest.kt | 8 +- .../storage/tests}/EntityReferenceTest.kt | 7 +- .../storage/tests/EntitySourceIndexTest.kt | 136 ++++++++++++++++++ .../tests}/EntityStorageSerializationTest.kt | 5 +- .../storage/tests}/EntityWithNullsTest.kt | 6 +- .../EntityWithSymbolicIdInPStorageTest.kt | 4 +- .../storage/tests}/ExtensionListTest.kt | 10 +- .../storage/tests}/ExtensionParentTest.kt | 4 +- .../storage/tests}/ExtensionTest.kt | 12 +- .../tests}/ExternalEntityMappingTest.kt | 26 ++-- .../tests}/FinalAndDefaultFieldsTest.kt | 11 +- .../tests}/GeneratedCodeVersionsTest.kt | 3 +- .../storage/tests}/KeyEntitiesTest.kt | 10 +- .../tests}/MoveEntitiesBetweenStoragesTest.kt | 4 +- .../tests}/MutableEntityCollectionTest.kt | 4 +- .../storage/tests}/MutableStorageTest.kt | 6 +- .../storage/tests}/OptionalOneToOne.kt | 8 +- .../storage/tests}/PackedEntityIdTest.kt | 2 +- .../storage/tests}/ParentAndChildTest.kt | 12 +- .../tests}/ParentAndMultipleChildrenTest.kt | 5 +- .../tests}/ParentAndNullableChildTest.kt | 9 +- .../tests}/ParentChildReferenceTest.kt | 7 +- .../storage/tests}/ReferencesInStorageTest.kt | 5 +- .../storage/tests}/ReplaceBySourceTest.kt | 8 +- .../storage/tests}/RiderEntitiesTest.kt | 11 +- .../storage/tests}/SampleTest.kt | 9 +- .../storage/tests}/SelfLinkedEntityTest.kt | 8 +- .../storage/tests}/SerializationTest.kt | 5 +- .../tests}/SimplePropertiesInStorageTest.kt | 5 +- .../storage/tests}/SingleAbstractTest.kt | 9 +- .../storage/tests}/SoftLinksTest.kt | 5 +- .../storage/tests}/StorageIndexiesTest.kt | 5 +- .../storage/tests}/SubChildrenTest.kt | 11 +- .../storage/tests}/SymbolicIdIndexTest.kt | 10 +- .../storage/tests}/TreeEntityTest.kt | 6 +- .../storage/tests}/UnknownFieldTest.kt | 6 +- .../storage/tests}/VirtualFileIndexTest.kt | 4 +- .../tests}/VirtualFileNameStoreTest.kt | 2 +- .../tests}/VirtualFileUrlManagerTest.kt | 2 +- .../tests}/WithNullsEntityMultipleTest.kt | 5 +- .../storage/tests}/WithNullsEntityTest.kt | 5 +- .../storage/tests}/WithNullsOppositeTest.kt | 5 +- .../tests}/WorkspaceEntityEqualityTest.kt | 11 +- .../tests}/containers/BidirectionalMapTest.kt | 2 +- .../containers/IntIntUniqueBiMapTest.kt | 2 +- .../NonNegativeIntIntBiMapPropertyTest.kt | 2 +- .../containers/NonNegativeIntIntBiMapTest.kt | 2 +- .../NonNegativeIntIntMultiMapPropertyTest.kt | 2 +- .../TestNonNegativeIntIntMultiMap.kt | 2 +- .../impl/ExternalEntityMappingImplTest.kt | 10 +- .../impl/WorkspaceBuilderChangeLogTest.kt | 13 +- ...ConsistencyCheckingModeProviderForTests.kt | 5 +- .../BidirectionalMapPropertyTest.kt | 2 +- .../propertyBased/EntityManipulations.kt | 4 +- .../tests}/propertyBased/Generators.kt | 10 +- .../tests}/propertyBased/PropertyTest.kt | 12 +- .../propertyBased/VirtualFileIndexTest.kt | 2 +- .../storage/tests}/storageTestUtils.kt | 4 +- .../storage/tests}/testUtils.kt | 7 +- .../storage/EntitySourceIndexTest.kt | 136 ------------------ .../AllIntellijEntitiesGenerationTest.kt | 6 +- 222 files changed, 698 insertions(+), 689 deletions(-) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/AssertConsistencyEntityImpl.kt (96%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/AttachedEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/AttachedEntityListImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/AttachedEntityParentListImpl.kt (96%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/AttachedEntityToNullableParentImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/AttachedEntityToParentImpl.kt (96%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/BooleanEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChainedEntityImpl.kt (99%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChainedParentEntityImpl.kt (99%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildFirstEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildMultipleEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildNullableEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildSampleEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildSecondEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildSingleFirstEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildSingleSecondEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildSourceEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildSubEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildSubSubEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildWithNullsImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildWithNullsMultipleImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildWithNullsOppositeMultipleImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChildWpidSampleEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/CollectionFieldEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ComposedIdSoftRefEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ComposedLinkEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/CompositeChildAbstractEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ContentRootTestEntityImpl.kt (99%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/DefaultValueEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/EntityWithSoftLinksImpl.kt (99%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/FacetTestEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/FinalFieldsEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/FirstEntityWithPIdImpl.kt (96%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/HeadAbstractionEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/IntEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/KeyChildImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/KeyParentImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/LeftEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/LinkedListEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ListEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ListVFUEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/MainEntityImpl.kt (96%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/MainEntityListImpl.kt (96%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/MainEntityParentListImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/MainEntityToParentImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/MiddleEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ModuleTestEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/NamedChildEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/NamedEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/NullableVFUEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OneEntityWithSymbolicIdImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OoChildAlsoWithPidEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OoChildEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OoChildForParentWithPidEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OoChildWithNullableParentEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OoChildWithPidEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OoParentEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OoParentWithPidEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OoParentWithoutPidEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OptionalIntEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OptionalOneToOneChildEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OptionalOneToOneParentEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OptionalStringEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentAbEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentChainEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentMultipleEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentNullableEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentSingleAbEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentSubEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentWithNullsImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentWithNullsMultipleImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentWithNullsOppositeMultipleImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ProjectModelTestEntityImpl.kt (99%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/RightEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SampleEntity2Impl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SampleEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SampleWithSymbolicIdEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SecondEntityWithPIdImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SecondSampleEntityImpl.kt (96%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SelfLinkedEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SetVFUEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SimpleChildAbstractEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SoftLinkReferencedChildImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SourceEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SourceRootTestEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SourceRootTestOrderEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/StringEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SymbolicIdEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/TreeEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/TreeMultiparentLeafEntityImpl.kt (99%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/TreeMultiparentRootEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/UnknownFieldEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/VFUEntity2Impl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/VFUEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/VFUWithTwoPropertiesEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/WithListSoftLinksEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/WithSoftLinkEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/XChildChildEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/XChildEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/XChildWithOptionalParentEntityImpl.kt (97%) rename platform/workspaceModel/storage/testEntities/gen/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/XParentEntityImpl.kt (98%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/Abstraction.kt (97%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChainAbstract.kt (96%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ChainedEntity.kt (97%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/CollectionEntity.kt (93%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/DefaultValueEntity.kt (92%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/EntititesWithPersistentId.kt (93%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/EntitySources.kt (70%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ExtensionFieldEntity.kt (92%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ExtensionFieldEntityList.kt (92%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ExtensionFieldEntityParentList.kt (93%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ExtensionFieldEntityToParent.kt (95%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/FinalFieldsEntity.kt (93%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/JpsLike.kt (98%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/KeyFieldEntities.kt (94%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/LinkedListEntity.kt (91%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/MultipleAbstract.kt (96%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OneToOne.kt (98%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/OptionalOneToOne.kt (94%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/Parent.kt (96%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentAndChild.kt (92%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentAndChildWithNulls.kt (95%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentAndMultipleChildren.kt (93%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/ParentAndNullableChild.kt (93%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/RiderTestEntities.kt (95%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SampleEntity.kt (97%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SampleWithSymbolicIdEntity.kt (95%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SecondEntities.kt (94%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SelfLinkedEntity.kt (92%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SingleAbstract.kt (96%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/SubChildren.kt (94%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/TreeEntity.kt (91%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/TreeMultiparentEntity.kt (96%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/UnknownFieldEntity.kt (93%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/WithAssertConsistency.kt (90%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/WithNullsMultiple.kt (91%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/WithNullsMultipleOpposite.kt (93%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/WithPersistentId.kt (97%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/WithSoftLinkEntityData.kt (98%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/primitiveEntities.kt (97%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities/test/api => platform/workspaceModel/storage/testEntities/entities}/vfu.kt (97%) rename platform/workspaceModel/storage/testEntities/testSrc/com/intellij/{workspaceModel/storage/entities => platform/workspaceModel/storage/testEntities}/testEntitySources.kt (100%) delete mode 100644 platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/TestEntities.kt rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/AbstractEntitiesTest.kt (97%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/AbstractTest.kt (90%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/AddChildrenTest.kt (94%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/AssertConsistencyTest.kt (82%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/CircularDependencyProhibitedTest.kt (93%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ClassToIntConverterTest.kt (97%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/CollectChangesInBuilderTest.kt (96%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ContentRootEqualityTest.kt (88%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/DefaultValueTest.kt (78%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/DiffBuilderTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/EntityReferenceTest.kt (94%) create mode 100644 platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntitySourceIndexTest.kt rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/EntityStorageSerializationTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/EntityWithNullsTest.kt (66%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/EntityWithSymbolicIdInPStorageTest.kt (97%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ExtensionListTest.kt (92%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ExtensionParentTest.kt (96%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ExtensionTest.kt (84%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ExternalEntityMappingTest.kt (97%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/FinalAndDefaultFieldsTest.kt (81%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/GeneratedCodeVersionsTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/KeyEntitiesTest.kt (72%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/MoveEntitiesBetweenStoragesTest.kt (94%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/MutableEntityCollectionTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/MutableStorageTest.kt (96%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/OptionalOneToOne.kt (72%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/PackedEntityIdTest.kt (93%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ParentAndChildTest.kt (90%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ParentAndMultipleChildrenTest.kt (97%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ParentAndNullableChildTest.kt (90%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ParentChildReferenceTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ReferencesInStorageTest.kt (97%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/ReplaceBySourceTest.kt (99%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/RiderEntitiesTest.kt (90%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/SampleTest.kt (81%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/SelfLinkedEntityTest.kt (69%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/SerializationTest.kt (97%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/SimplePropertiesInStorageTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/SingleAbstractTest.kt (85%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/SoftLinksTest.kt (97%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/StorageIndexiesTest.kt (94%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/SubChildrenTest.kt (78%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/SymbolicIdIndexTest.kt (92%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/TreeEntityTest.kt (84%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/UnknownFieldTest.kt (67%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/VirtualFileIndexTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/VirtualFileNameStoreTest.kt (95%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/VirtualFileUrlManagerTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/WithNullsEntityMultipleTest.kt (83%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/WithNullsEntityTest.kt (83%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/WithNullsOppositeTest.kt (76%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/WorkspaceEntityEqualityTest.kt (92%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/containers/BidirectionalMapTest.kt (97%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/containers/IntIntUniqueBiMapTest.kt (94%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/containers/NonNegativeIntIntBiMapPropertyTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/containers/NonNegativeIntIntBiMapTest.kt (94%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/containers/NonNegativeIntIntMultiMapPropertyTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/containers/TestNonNegativeIntIntMultiMap.kt (95%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/impl/ExternalEntityMappingImplTest.kt (77%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/impl/WorkspaceBuilderChangeLogTest.kt (97%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/impl/WorkspaceStorageConsistencyCheckingModeProviderForTests.kt (61%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/propertyBased/BidirectionalMapPropertyTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/propertyBased/EntityManipulations.kt (99%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/propertyBased/Generators.kt (89%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/propertyBased/PropertyTest.kt (91%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/propertyBased/VirtualFileIndexTest.kt (98%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/storageTestUtils.kt (85%) rename platform/workspaceModel/storage/tests/testSrc/com/intellij/{workspaceModel/storage => platform/workspaceModel/storage/tests}/testUtils.kt (95%) delete mode 100644 platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntitySourceIndexTest.kt diff --git a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/EntitiesOrphanageTest.kt b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/EntitiesOrphanageTest.kt index 4beacba06a17..77f329cb9881 100644 --- a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/EntitiesOrphanageTest.kt +++ b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/EntitiesOrphanageTest.kt @@ -3,6 +3,7 @@ package com.intellij.workspaceModel.ide import com.intellij.openapi.application.runWriteAction import com.intellij.platform.workspaceModel.jps.OrphanageWorkerEntitySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource import com.intellij.testFramework.PlatformTestUtil import com.intellij.testFramework.junit5.RunInEdt import com.intellij.testFramework.junit5.TestApplication @@ -12,7 +13,6 @@ import com.intellij.workspaceModel.storage.bridgeEntities.ContentRootEntity import com.intellij.workspaceModel.storage.bridgeEntities.ExcludeUrlEntity import com.intellij.workspaceModel.storage.bridgeEntities.ModuleEntity import com.intellij.workspaceModel.storage.bridgeEntities.SourceRootEntity -import com.intellij.workspaceModel.storage.entities.test.api.MySource import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager import org.junit.jupiter.api.Assumptions import org.junit.jupiter.api.BeforeEach diff --git a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/EntityWithCollectionTest.kt b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/EntityWithCollectionTest.kt index a724cf3e8fc5..1998620488a7 100644 --- a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/EntityWithCollectionTest.kt +++ b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/EntityWithCollectionTest.kt @@ -2,14 +2,14 @@ package com.intellij.workspaceModel.ide import com.intellij.openapi.application.runWriteActionAndWait +import com.intellij.platform.workspaceModel.storage.testEntities.entities.CollectionFieldEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.modifyEntity import com.intellij.testFramework.ApplicationRule import com.intellij.testFramework.rules.ProjectModelRule import com.intellij.testFramework.workspaceModel.updateProjectModel import com.intellij.workspaceModel.storage.EntityChange import com.intellij.workspaceModel.storage.VersionedStorageChange -import com.intellij.workspaceModel.storage.entities.test.api.CollectionFieldEntity -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.modifyEntity import org.assertj.core.api.Assertions.assertThat import org.junit.ClassRule import org.junit.Rule diff --git a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/ImlReplaceBySourceTest.kt b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/ImlReplaceBySourceTest.kt index e7d7de1c580b..aba14d8ce7ab 100644 --- a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/ImlReplaceBySourceTest.kt +++ b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/ImlReplaceBySourceTest.kt @@ -4,6 +4,7 @@ package com.intellij.workspaceModel.ide import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.platform.workspaceModel.jps.JpsProjectConfigLocation import com.intellij.platform.workspaceModel.jps.JpsProjectFileEntitySource +import com.intellij.platform.workspaceModel.storage.tests.checkConsistency import com.intellij.testFramework.ApplicationRule import com.intellij.testFramework.rules.ProjectModelRule import com.intellij.testFramework.rules.TempDirectory @@ -15,7 +16,6 @@ import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.bridgeEntities.JavaSourceRootPropertiesEntity import com.intellij.workspaceModel.storage.bridgeEntities.ModuleEntity import com.intellij.workspaceModel.storage.bridgeEntities.SourceRootEntity -import com.intellij.workspaceModel.storage.checkConsistency import com.intellij.workspaceModel.storage.impl.url.toVirtualFileUrl import com.intellij.workspaceModel.storage.toBuilder import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager diff --git a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/ImlSerializationTest.kt b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/ImlSerializationTest.kt index 9e8615d82c1b..4ee9dcd79b2e 100644 --- a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/ImlSerializationTest.kt +++ b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/ImlSerializationTest.kt @@ -2,23 +2,23 @@ package com.intellij.workspaceModel.ide import com.intellij.openapi.application.ex.PathManagerEx +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntity2 +import com.intellij.platform.workspaceModel.storage.tests.SerializationRoundTripChecker import com.intellij.testFramework.ApplicationRule import com.intellij.testFramework.rules.ProjectModelRule import com.intellij.workspaceModel.ide.impl.jps.serialization.asConfigLocation import com.intellij.workspaceModel.ide.impl.jps.serialization.loadProject import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.MutableEntityStorage -import com.intellij.workspaceModel.storage.SerializationRoundTripChecker -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntity2 import com.intellij.workspaceModel.storage.impl.EntityStorageSerializerImpl import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager -import junit.framework.Assert.assertTrue import org.junit.Before import org.junit.ClassRule import org.junit.Rule import org.junit.Test import java.io.File import kotlin.system.measureTimeMillis +import kotlin.test.assertTrue class ImlSerializationTest { @Rule @@ -46,8 +46,8 @@ class ImlSerializationTest { checkSerializationSize(bytes, expectedSize, 2_000) - assertTrue("This assertion is a reminder. Have you updated the serializer? Update the serializer version!", - "v48" == EntityStorageSerializerImpl.SERIALIZER_VERSION) + assertTrue("v48" == EntityStorageSerializerImpl.SERIALIZER_VERSION, + "This assertion is a reminder. Have you updated the serializer? Update the serializer version!") } @Test @@ -74,7 +74,7 @@ class ImlSerializationTest { // Maybe you've added a new field to the entity store structure. Recheck if you really want this field to be included. val leftBound = expectedSize - precision val rightBound = expectedSize + precision - assertTrue("Expected size: $expectedSize, precision: $precision, real size: ${bytes.size}", bytes.size in leftBound..rightBound) + assertTrue(bytes.size in leftBound..rightBound, "Expected size: $expectedSize, precision: $precision, real size: ${bytes.size}") } private fun loadProjectAndCheck(projectFile: File): ByteArray { diff --git a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/WorkspaceCacheTest.kt b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/WorkspaceCacheTest.kt index f3ddb8d147a5..a8f12c59ba44 100644 --- a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/WorkspaceCacheTest.kt +++ b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/WorkspaceCacheTest.kt @@ -8,6 +8,7 @@ import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project import com.intellij.openapi.util.Disposer +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource import com.intellij.testFramework.ApplicationRule import com.intellij.testFramework.DisposableRule import com.intellij.testFramework.ExtensionTestUtil @@ -145,8 +146,6 @@ class WorkspaceCacheTest { assertFalse(modules.any { it.name == "MyTestModule" }) } - object MySource: EntitySource - private fun prepareProject(): LoadedProjectData { val projectFile = projectFile("moduleAdded/after") val projectData = copyAndLoadProject(projectFile, virtualFileManager) diff --git a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsProjectEntitiesLoaderTest.kt b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsProjectEntitiesLoaderTest.kt index 492e688d1f68..ecb7871eb229 100644 --- a/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsProjectEntitiesLoaderTest.kt +++ b/platform/workspaceModel/jps/tests/testSrc/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsProjectEntitiesLoaderTest.kt @@ -8,6 +8,7 @@ import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ModuleSourceOrderEntry +import com.intellij.platform.workspaceModel.storage.tests.checkConsistency import com.intellij.project.stateStore import com.intellij.testFramework.HeavyPlatformTestCase import com.intellij.util.io.write @@ -15,7 +16,6 @@ import com.intellij.workspaceModel.ide.getInstance import com.intellij.workspaceModel.storage.EntityStorage import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.bridgeEntities.* -import com.intellij.workspaceModel.storage.checkConsistency import com.intellij.workspaceModel.storage.impl.url.toVirtualFileUrl import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager import org.jetbrains.jps.model.serialization.module.JpsModuleRootModelSerializer diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AssertConsistencyEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AssertConsistencyEntityImpl.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AssertConsistencyEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AssertConsistencyEntityImpl.kt index 10855a2217e4..dbc68d578352 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AssertConsistencyEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AssertConsistencyEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityImpl.kt index 200fde9bb2ba..adac8c25f026 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityListImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityListImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityListImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityListImpl.kt index 37403cc069f4..425f0102c631 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityListImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityListImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityParentListImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityParentListImpl.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityParentListImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityParentListImpl.kt index fb0089ebde8e..731552f5f069 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityParentListImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityParentListImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityToNullableParentImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityToNullableParentImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityToNullableParentImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityToNullableParentImpl.kt index 0d585426f72f..758d59a34889 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityToNullableParentImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityToNullableParentImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityToParentImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityToParentImpl.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityToParentImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityToParentImpl.kt index 1719a70fab70..81e2b4a06728 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/AttachedEntityToParentImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/AttachedEntityToParentImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/BooleanEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/BooleanEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/BooleanEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/BooleanEntityImpl.kt index 01a4686910c8..1761ad26601f 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/BooleanEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/BooleanEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChainedEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainedEntityImpl.kt similarity index 99% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChainedEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainedEntityImpl.kt index 506aa93fddfc..cb19d68830df 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChainedEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainedEntityImpl.kt @@ -1,5 +1,5 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChainedParentEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainedParentEntityImpl.kt similarity index 99% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChainedParentEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainedParentEntityImpl.kt index fc935bf4ab53..e4455f94fd6c 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChainedParentEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainedParentEntityImpl.kt @@ -1,5 +1,5 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildEntityImpl.kt index d3baa8b5ff6f..42e6a87ed600 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildFirstEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildFirstEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildFirstEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildFirstEntityImpl.kt index 5188232a12f6..794eb6ac588f 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildFirstEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildFirstEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildMultipleEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildMultipleEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildMultipleEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildMultipleEntityImpl.kt index 504287092f89..df278df4fb53 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildMultipleEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildMultipleEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildNullableEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildNullableEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildNullableEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildNullableEntityImpl.kt index ab1468334cf7..0f233cf41f75 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildNullableEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildNullableEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSampleEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSampleEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSampleEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSampleEntityImpl.kt index 6f151fae30db..657e072e2a62 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSampleEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSampleEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -18,7 +19,6 @@ import com.intellij.workspaceModel.storage.impl.containers.toMutableWorkspaceLis import com.intellij.workspaceModel.storage.impl.extractOneToManyParent import com.intellij.workspaceModel.storage.impl.updateOneToManyParentOfChild import com.intellij.workspaceModel.storage.url.VirtualFileUrl -import java.util.* import java.util.UUID import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSecondEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSecondEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSecondEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSecondEntityImpl.kt index d4c280109865..89f4cf51ad5b 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSecondEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSecondEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSingleFirstEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSingleFirstEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSingleFirstEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSingleFirstEntityImpl.kt index 1dd9cc96e126..81035757dccf 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSingleFirstEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSingleFirstEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSingleSecondEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSingleSecondEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSingleSecondEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSingleSecondEntityImpl.kt index e66cc5dd8b21..c36bfeef8bfb 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSingleSecondEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSingleSecondEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSourceEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSourceEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSourceEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSourceEntityImpl.kt index 9c80709ef8ec..bdad8a8cc80f 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSourceEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSourceEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -18,7 +19,6 @@ import com.intellij.workspaceModel.storage.impl.containers.toMutableWorkspaceLis import com.intellij.workspaceModel.storage.impl.extractOneToManyParent import com.intellij.workspaceModel.storage.impl.updateOneToManyParentOfChild import com.intellij.workspaceModel.storage.url.VirtualFileUrl -import java.util.* import java.util.UUID import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSubEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSubEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSubEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSubEntityImpl.kt index 76af3949e70e..d351d7c39ed1 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSubEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSubEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSubSubEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSubSubEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSubSubEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSubSubEntityImpl.kt index 393736fbd7ed..ec801c3977ac 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildSubSubEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildSubSubEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWithNullsImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWithNullsImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWithNullsImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWithNullsImpl.kt index 1a5606e77992..1e1e15bd47ae 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWithNullsImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWithNullsImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWithNullsMultipleImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWithNullsMultipleImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWithNullsMultipleImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWithNullsMultipleImpl.kt index 27b0537151cf..7cabaeb52f9e 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWithNullsMultipleImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWithNullsMultipleImpl.kt @@ -1,7 +1,6 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWithNullsOppositeMultipleImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWithNullsOppositeMultipleImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWithNullsOppositeMultipleImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWithNullsOppositeMultipleImpl.kt index 91cbd342ed73..2b99172dbef2 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWithNullsOppositeMultipleImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWithNullsOppositeMultipleImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWpidSampleEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWpidSampleEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWpidSampleEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWpidSampleEntityImpl.kt index a0c17e454501..497f8ab559de 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ChildWpidSampleEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChildWpidSampleEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -18,7 +19,6 @@ import com.intellij.workspaceModel.storage.impl.containers.toMutableWorkspaceLis import com.intellij.workspaceModel.storage.impl.extractOneToManyParent import com.intellij.workspaceModel.storage.impl.updateOneToManyParentOfChild import com.intellij.workspaceModel.storage.url.VirtualFileUrl -import java.util.* import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads import kotlin.jvm.JvmStatic diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/CollectionFieldEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/CollectionFieldEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/CollectionFieldEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/CollectionFieldEntityImpl.kt index d48cc88259ee..b2fa6c2939db 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/CollectionFieldEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/CollectionFieldEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ComposedIdSoftRefEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ComposedIdSoftRefEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ComposedIdSoftRefEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ComposedIdSoftRefEntityImpl.kt index 6aef9d898217..f2050a299dfd 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ComposedIdSoftRefEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ComposedIdSoftRefEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ComposedLinkEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ComposedLinkEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ComposedLinkEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ComposedLinkEntityImpl.kt index 0679a3a9c84e..9027b3ee0ef7 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ComposedLinkEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ComposedLinkEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/CompositeChildAbstractEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/CompositeChildAbstractEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/CompositeChildAbstractEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/CompositeChildAbstractEntityImpl.kt index 51b5169d997f..7459599dca00 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/CompositeChildAbstractEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/CompositeChildAbstractEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ContentRootTestEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ContentRootTestEntityImpl.kt similarity index 99% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ContentRootTestEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ContentRootTestEntityImpl.kt index f6dadb20a924..cbed78feb577 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ContentRootTestEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ContentRootTestEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/DefaultValueEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/DefaultValueEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/DefaultValueEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/DefaultValueEntityImpl.kt index 438837f36bf6..74286b327931 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/DefaultValueEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/DefaultValueEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.deft.api.annotations.Default import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/EntityWithSoftLinksImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/EntityWithSoftLinksImpl.kt similarity index 99% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/EntityWithSoftLinksImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/EntityWithSoftLinksImpl.kt index 1a790565b10b..18ccb57438ee 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/EntityWithSoftLinksImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/EntityWithSoftLinksImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -1228,19 +1229,19 @@ class EntityWithSoftLinksData : WorkspaceEntityData(), Soft } override fun collectClassUsagesData(collector: UsedClassesCollector) { - collector.add(DeepSealedOne::class.java) - collector.add(DeepSealedOne.DeepSealedTwo.DeepSealedThree::class.java) - collector.add(DeepSealedOne.DeepSealedTwo.DeepSealedThree.DeepSealedFour::class.java) - collector.add(TooDeepContainer::class.java) - collector.add(SealedContainer.ContainerContainer::class.java) - collector.add(Container::class.java) - collector.add(SealedContainer::class.java) collector.add(SealedContainer.BigContainer::class.java) + collector.add(DeepSealedOne.DeepSealedTwo.DeepSealedThree::class.java) + collector.add(Container::class.java) + collector.add(DeepSealedOne.DeepSealedTwo.DeepSealedThree.DeepSealedFour::class.java) + collector.add(SealedContainer.EmptyContainer::class.java) + collector.add(SealedContainer.SmallContainer::class.java) + collector.add(DeepSealedOne.DeepSealedTwo::class.java) collector.add(OneSymbolicId::class.java) collector.add(DeepContainer::class.java) - collector.add(SealedContainer.EmptyContainer::class.java) - collector.add(DeepSealedOne.DeepSealedTwo::class.java) - collector.add(SealedContainer.SmallContainer::class.java) + collector.add(DeepSealedOne::class.java) + collector.add(TooDeepContainer::class.java) + collector.add(SealedContainer.ContainerContainer::class.java) + collector.add(SealedContainer::class.java) this.inContainerList?.let { collector.add(it::class.java) } this.sealedContainer?.let { collector.add(it::class.java) } this.justListProperty?.let { collector.add(it::class.java) } diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/FacetTestEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/FacetTestEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/FacetTestEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/FacetTestEntityImpl.kt index 9e7685f33828..b68ad2d10b64 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/FacetTestEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/FacetTestEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/FinalFieldsEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/FinalFieldsEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/FinalFieldsEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/FinalFieldsEntityImpl.kt index ec351351af73..47105d5c059b 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/FinalFieldsEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/FinalFieldsEntityImpl.kt @@ -1,8 +1,7 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.deft.api.annotations.Default -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/FirstEntityWithPIdImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/FirstEntityWithPIdImpl.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/FirstEntityWithPIdImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/FirstEntityWithPIdImpl.kt index a39f5dd276d8..4b14befd6669 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/FirstEntityWithPIdImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/FirstEntityWithPIdImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/HeadAbstractionEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/HeadAbstractionEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/HeadAbstractionEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/HeadAbstractionEntityImpl.kt index e4ecc6b673fd..5b98d6eb13cf 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/HeadAbstractionEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/HeadAbstractionEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -17,9 +18,6 @@ import com.intellij.workspaceModel.storage.impl.WorkspaceEntityBase import com.intellij.workspaceModel.storage.impl.WorkspaceEntityData import com.intellij.workspaceModel.storage.impl.extractOneToAbstractOneChild import com.intellij.workspaceModel.storage.impl.updateOneToAbstractOneChildOfParent -import kotlin.jvm.JvmName -import kotlin.jvm.JvmOverloads -import kotlin.jvm.JvmStatic import org.jetbrains.deft.ObjBuilder import org.jetbrains.deft.Type import org.jetbrains.deft.annotations.Abstract diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/IntEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/IntEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/IntEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/IntEntityImpl.kt index 208b9a5285c8..02c13dcfb5ff 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/IntEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/IntEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/KeyChildImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/KeyChildImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/KeyChildImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/KeyChildImpl.kt index 54851fffbfef..5c856263c9fc 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/KeyChildImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/KeyChildImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/KeyParentImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/KeyParentImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/KeyParentImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/KeyParentImpl.kt index 03b32291a8fe..c5469f85f899 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/KeyParentImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/KeyParentImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/LeftEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/LeftEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/LeftEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/LeftEntityImpl.kt index 83e10c741c8a..17df32a0e796 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/LeftEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/LeftEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -21,9 +22,6 @@ import com.intellij.workspaceModel.storage.impl.extractOneToManyChildren import com.intellij.workspaceModel.storage.impl.updateOneToAbstractManyChildrenOfParent import com.intellij.workspaceModel.storage.impl.updateOneToAbstractManyParentOfChild import com.intellij.workspaceModel.storage.impl.updateOneToAbstractOneParentOfChild -import kotlin.jvm.JvmName -import kotlin.jvm.JvmOverloads -import kotlin.jvm.JvmStatic import org.jetbrains.deft.ObjBuilder import org.jetbrains.deft.Type import org.jetbrains.deft.annotations.Abstract diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/LinkedListEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/LinkedListEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/LinkedListEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/LinkedListEntityImpl.kt index 9b808e3e1082..ac77e21a2dd5 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/LinkedListEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/LinkedListEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ListEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ListEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ListEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ListEntityImpl.kt index f9174423f6ba..8309a61927c6 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ListEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ListEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ListVFUEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ListVFUEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ListVFUEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ListVFUEntityImpl.kt index 3f3a255eb37a..9b83fbd75963 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ListVFUEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ListVFUEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityImpl.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityImpl.kt index 15b957c7f294..54b6f5b86032 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityListImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityListImpl.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityListImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityListImpl.kt index 7de5ed97bbff..3bb401965176 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityListImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityListImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityParentListImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityParentListImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityParentListImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityParentListImpl.kt index 06b856e93456..b8c50d9e9288 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityParentListImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityParentListImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityToParentImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityToParentImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityToParentImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityToParentImpl.kt index b694f2363926..76583662b8ea 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MainEntityToParentImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MainEntityToParentImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MiddleEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MiddleEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MiddleEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MiddleEntityImpl.kt index 247f59122a5b..27c08b494004 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/MiddleEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/MiddleEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -16,9 +17,6 @@ import com.intellij.workspaceModel.storage.impl.WorkspaceEntityBase import com.intellij.workspaceModel.storage.impl.WorkspaceEntityData import com.intellij.workspaceModel.storage.impl.extractOneToAbstractManyParent import com.intellij.workspaceModel.storage.impl.updateOneToAbstractManyParentOfChild -import kotlin.jvm.JvmName -import kotlin.jvm.JvmOverloads -import kotlin.jvm.JvmStatic import org.jetbrains.deft.ObjBuilder import org.jetbrains.deft.Type import org.jetbrains.deft.annotations.Abstract diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ModuleTestEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ModuleTestEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ModuleTestEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ModuleTestEntityImpl.kt index 37be7893715a..886d1ddc19cc 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ModuleTestEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ModuleTestEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/NamedChildEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/NamedChildEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/NamedChildEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/NamedChildEntityImpl.kt index 97e1145cf3bf..f12f13ead5a4 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/NamedChildEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/NamedChildEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/NamedEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/NamedEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/NamedEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/NamedEntityImpl.kt index 4065aadb6e0e..3bc50751dcd6 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/NamedEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/NamedEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/NullableVFUEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/NullableVFUEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/NullableVFUEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/NullableVFUEntityImpl.kt index a53f4573ec77..5f5c036c1971 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/NullableVFUEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/NullableVFUEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OneEntityWithSymbolicIdImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OneEntityWithSymbolicIdImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OneEntityWithSymbolicIdImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OneEntityWithSymbolicIdImpl.kt index c60c695f31f8..402e92d840b2 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OneEntityWithSymbolicIdImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OneEntityWithSymbolicIdImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildAlsoWithPidEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildAlsoWithPidEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildAlsoWithPidEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildAlsoWithPidEntityImpl.kt index b645394a828d..f53ae5feff8c 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildAlsoWithPidEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildAlsoWithPidEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildEntityImpl.kt index 89a8c5ffc20e..d26df96a4614 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildForParentWithPidEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildForParentWithPidEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildForParentWithPidEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildForParentWithPidEntityImpl.kt index 5cb01c5442f0..d8ccf1d4167a 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildForParentWithPidEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildForParentWithPidEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildWithNullableParentEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildWithNullableParentEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildWithNullableParentEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildWithNullableParentEntityImpl.kt index 38f9a5ea8921..f85d5c229261 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildWithNullableParentEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildWithNullableParentEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildWithPidEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildWithPidEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildWithPidEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildWithPidEntityImpl.kt index e30ee7629dee..e9a36d180703 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoChildWithPidEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoChildWithPidEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoParentEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoParentEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoParentEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoParentEntityImpl.kt index 0ece8f7dd4eb..751b115312eb 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoParentEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoParentEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoParentWithPidEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoParentWithPidEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoParentWithPidEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoParentWithPidEntityImpl.kt index 4134ffecd1f6..fbfaac2eae01 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoParentWithPidEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoParentWithPidEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoParentWithoutPidEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoParentWithoutPidEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoParentWithoutPidEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoParentWithoutPidEntityImpl.kt index 3fbc14230cb1..ff20257014ad 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OoParentWithoutPidEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OoParentWithoutPidEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalIntEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalIntEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalIntEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalIntEntityImpl.kt index 39dd50e53cfa..ba5737bd55c4 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalIntEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalIntEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalOneToOneChildEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalOneToOneChildEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalOneToOneChildEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalOneToOneChildEntityImpl.kt index b9ef7458f6d4..ae189b7a8484 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalOneToOneChildEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalOneToOneChildEntityImpl.kt @@ -1,7 +1,6 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalOneToOneParentEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalOneToOneParentEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalOneToOneParentEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalOneToOneParentEntityImpl.kt index de6f69927f87..4993059e92e7 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalOneToOneParentEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalOneToOneParentEntityImpl.kt @@ -1,7 +1,6 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalStringEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalStringEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalStringEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalStringEntityImpl.kt index c412e879910a..8ee5a4117e73 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/OptionalStringEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalStringEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentAbEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAbEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentAbEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAbEntityImpl.kt index e9d58c29f859..6a09fbc15667 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentAbEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAbEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentChainEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentChainEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentChainEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentChainEntityImpl.kt index da93f5add39a..9b7be2b50498 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentChainEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentChainEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentEntityImpl.kt index c6db7e7cddf5..6de7310bdb82 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentMultipleEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentMultipleEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentMultipleEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentMultipleEntityImpl.kt index 30b910852b01..986d60d85565 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentMultipleEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentMultipleEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentNullableEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentNullableEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentNullableEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentNullableEntityImpl.kt index 1a587725c966..710960230c41 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentNullableEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentNullableEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentSingleAbEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentSingleAbEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentSingleAbEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentSingleAbEntityImpl.kt index 686c6ff12498..2b08d4569ce9 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentSingleAbEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentSingleAbEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentSubEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentSubEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentSubEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentSubEntityImpl.kt index b8d9420c4002..b00948fd0943 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentSubEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentSubEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentWithNullsImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentWithNullsImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentWithNullsImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentWithNullsImpl.kt index 8a76529877c7..13fe6ab97225 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentWithNullsImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentWithNullsImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentWithNullsMultipleImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentWithNullsMultipleImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentWithNullsMultipleImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentWithNullsMultipleImpl.kt index 86023e02f9fe..7d7cd4ed91ab 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentWithNullsMultipleImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentWithNullsMultipleImpl.kt @@ -1,7 +1,6 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentWithNullsOppositeMultipleImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentWithNullsOppositeMultipleImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentWithNullsOppositeMultipleImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentWithNullsOppositeMultipleImpl.kt index 269064cf95c2..16c065f0880c 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ParentWithNullsOppositeMultipleImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentWithNullsOppositeMultipleImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ProjectModelTestEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ProjectModelTestEntityImpl.kt similarity index 99% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ProjectModelTestEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ProjectModelTestEntityImpl.kt index cb210af6d6c9..c749106cc492 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/ProjectModelTestEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/ProjectModelTestEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/RightEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/RightEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/RightEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/RightEntityImpl.kt index 357bbe25b2ab..60e16b40fa9e 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/RightEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/RightEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -21,9 +22,6 @@ import com.intellij.workspaceModel.storage.impl.extractOneToManyChildren import com.intellij.workspaceModel.storage.impl.updateOneToAbstractManyChildrenOfParent import com.intellij.workspaceModel.storage.impl.updateOneToAbstractManyParentOfChild import com.intellij.workspaceModel.storage.impl.updateOneToAbstractOneParentOfChild -import kotlin.jvm.JvmName -import kotlin.jvm.JvmOverloads -import kotlin.jvm.JvmStatic import org.jetbrains.deft.ObjBuilder import org.jetbrains.deft.Type import org.jetbrains.deft.annotations.Abstract diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SampleEntity2Impl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleEntity2Impl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SampleEntity2Impl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleEntity2Impl.kt index 7bce4f45e05f..e8a7b80d712f 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SampleEntity2Impl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleEntity2Impl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SampleEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SampleEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleEntityImpl.kt index 73ef63fe079e..5d79ea1b69b7 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SampleEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -19,7 +20,6 @@ import com.intellij.workspaceModel.storage.impl.containers.toMutableWorkspaceLis import com.intellij.workspaceModel.storage.impl.extractOneToManyChildren import com.intellij.workspaceModel.storage.impl.updateOneToManyChildrenOfParent import com.intellij.workspaceModel.storage.url.VirtualFileUrl -import java.util.* import java.util.UUID import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SampleWithSymbolicIdEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleWithSymbolicIdEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SampleWithSymbolicIdEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleWithSymbolicIdEntityImpl.kt index c4ed67192349..e6df97789534 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SampleWithSymbolicIdEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleWithSymbolicIdEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -20,7 +21,6 @@ import com.intellij.workspaceModel.storage.impl.containers.toMutableWorkspaceLis import com.intellij.workspaceModel.storage.impl.extractOneToManyChildren import com.intellij.workspaceModel.storage.impl.updateOneToManyChildrenOfParent import com.intellij.workspaceModel.storage.url.VirtualFileUrl -import java.util.* import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads import kotlin.jvm.JvmStatic diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SecondEntityWithPIdImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SecondEntityWithPIdImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SecondEntityWithPIdImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SecondEntityWithPIdImpl.kt index 57e9fa13f810..8b1cf3d281e7 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SecondEntityWithPIdImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SecondEntityWithPIdImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SecondSampleEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SecondSampleEntityImpl.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SecondSampleEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SecondSampleEntityImpl.kt index bc04e35d3bf2..fd01ed849e2b 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SecondSampleEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SecondSampleEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -15,7 +16,6 @@ import com.intellij.workspaceModel.storage.impl.WorkspaceEntityBase import com.intellij.workspaceModel.storage.impl.WorkspaceEntityData import com.intellij.workspaceModel.storage.impl.containers.toMutableWorkspaceList import com.intellij.workspaceModel.storage.url.VirtualFileUrl -import java.util.* import java.util.UUID import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SelfLinkedEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SelfLinkedEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SelfLinkedEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SelfLinkedEntityImpl.kt index 4f77a60d9946..877193048837 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SelfLinkedEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SelfLinkedEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SetVFUEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SetVFUEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SetVFUEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SetVFUEntityImpl.kt index 648ade3ddc35..f11e0ac323b2 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SetVFUEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SetVFUEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SimpleChildAbstractEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SimpleChildAbstractEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SimpleChildAbstractEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SimpleChildAbstractEntityImpl.kt index 528625c697ba..509b72ae6b57 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SimpleChildAbstractEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SimpleChildAbstractEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SoftLinkReferencedChildImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SoftLinkReferencedChildImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SoftLinkReferencedChildImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SoftLinkReferencedChildImpl.kt index b3725bae5ac5..4068736e1022 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SoftLinkReferencedChildImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SoftLinkReferencedChildImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SourceEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SourceEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SourceEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SourceEntityImpl.kt index eebd7347e1f4..94e21286fc1b 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SourceEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SourceEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -18,7 +19,6 @@ import com.intellij.workspaceModel.storage.impl.containers.toMutableWorkspaceLis import com.intellij.workspaceModel.storage.impl.extractOneToManyChildren import com.intellij.workspaceModel.storage.impl.updateOneToManyChildrenOfParent import com.intellij.workspaceModel.storage.url.VirtualFileUrl -import java.util.* import java.util.UUID import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SourceRootTestEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SourceRootTestEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SourceRootTestEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SourceRootTestEntityImpl.kt index 76b5da8bfd20..2c9de4350cfb 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SourceRootTestEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SourceRootTestEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SourceRootTestOrderEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SourceRootTestOrderEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SourceRootTestOrderEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SourceRootTestOrderEntityImpl.kt index 04ac0e26f9d4..25dc91cd4089 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SourceRootTestOrderEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SourceRootTestOrderEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/StringEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/StringEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/StringEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/StringEntityImpl.kt index 69201eb3d6d6..4eca14e6b3d8 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/StringEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/StringEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SymbolicIdEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SymbolicIdEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SymbolicIdEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SymbolicIdEntityImpl.kt index ad3fe124e512..76d70b18e23c 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/SymbolicIdEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/SymbolicIdEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation @@ -16,7 +17,6 @@ import com.intellij.workspaceModel.storage.impl.WorkspaceEntityBase import com.intellij.workspaceModel.storage.impl.WorkspaceEntityData import com.intellij.workspaceModel.storage.impl.containers.toMutableWorkspaceList import com.intellij.workspaceModel.storage.url.VirtualFileUrl -import java.util.* import java.util.UUID import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/TreeEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/TreeEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeEntityImpl.kt index eab9673e3702..a919a38f16e3 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/TreeEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/TreeMultiparentLeafEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeMultiparentLeafEntityImpl.kt similarity index 99% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/TreeMultiparentLeafEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeMultiparentLeafEntityImpl.kt index 3d64c20359ee..4da5055a6f81 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/TreeMultiparentLeafEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeMultiparentLeafEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/TreeMultiparentRootEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeMultiparentRootEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/TreeMultiparentRootEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeMultiparentRootEntityImpl.kt index 2e9630190299..6186641a54a9 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/TreeMultiparentRootEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeMultiparentRootEntityImpl.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/UnknownFieldEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/UnknownFieldEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/UnknownFieldEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/UnknownFieldEntityImpl.kt index 86d147afdec8..587b6bf9e82a 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/UnknownFieldEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/UnknownFieldEntityImpl.kt @@ -1,5 +1,5 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/VFUEntity2Impl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/VFUEntity2Impl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/VFUEntity2Impl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/VFUEntity2Impl.kt index 0383b1a455a1..4da816b4411b 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/VFUEntity2Impl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/VFUEntity2Impl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/VFUEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/VFUEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/VFUEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/VFUEntityImpl.kt index 94e2ec557269..df29c3b8f2a5 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/VFUEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/VFUEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/VFUWithTwoPropertiesEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/VFUWithTwoPropertiesEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/VFUWithTwoPropertiesEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/VFUWithTwoPropertiesEntityImpl.kt index ba5b641fa89c..a8fed9876cd0 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/VFUWithTwoPropertiesEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/VFUWithTwoPropertiesEntityImpl.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.EntityStorage diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/WithListSoftLinksEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithListSoftLinksEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/WithListSoftLinksEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithListSoftLinksEntityImpl.kt index 6ccaf8a1f49e..a139381dfa4f 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/WithListSoftLinksEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithListSoftLinksEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/WithSoftLinkEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithSoftLinkEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/WithSoftLinkEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithSoftLinkEntityImpl.kt index 4a5f82e7ab93..285586e8b650 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/WithSoftLinkEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithSoftLinkEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XChildChildEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XChildChildEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XChildChildEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XChildChildEntityImpl.kt index 48e154d6735d..f491fd930b2d 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XChildChildEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XChildChildEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XChildEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XChildEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XChildEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XChildEntityImpl.kt index 9e62cce9f4fc..bfab93d52981 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XChildEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XChildEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XChildWithOptionalParentEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XChildWithOptionalParentEntityImpl.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XChildWithOptionalParentEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XChildWithOptionalParentEntityImpl.kt index bfa35f2aa3da..40c1f799e270 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XChildWithOptionalParentEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XChildWithOptionalParentEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XParentEntityImpl.kt b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XParentEntityImpl.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XParentEntityImpl.kt rename to platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XParentEntityImpl.kt index f9d580a94508..33419bf8b8e4 100644 --- a/platform/workspaceModel/storage/testEntities/gen/com/intellij/workspaceModel/storage/entities/test/api/XParentEntityImpl.kt +++ b/platform/workspaceModel/storage/testEntities/gen/com/intellij/platform/workspaceModel/storage/testEntities/entities/XParentEntityImpl.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntityInformation diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/Abstraction.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/Abstraction.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/Abstraction.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/Abstraction.kt index 88bae7fc8f12..124ed7950e57 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/Abstraction.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/Abstraction.kt @@ -1,13 +1,11 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.WorkspaceEntity -import kotlin.jvm.JvmName -import kotlin.jvm.JvmOverloads -import kotlin.jvm.JvmStatic import org.jetbrains.deft.ObjBuilder import org.jetbrains.deft.Type import org.jetbrains.deft.annotations.Abstract diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ChainAbstract.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainAbstract.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ChainAbstract.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainAbstract.kt index 7f595da268e8..66919065afbd 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ChainAbstract.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainAbstract.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion import com.intellij.workspaceModel.storage.MutableEntityStorage diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ChainedEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainedEntity.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ChainedEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainedEntity.kt index 85f741ad024f..31e95985914b 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ChainedEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ChainedEntity.kt @@ -1,5 +1,5 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/CollectionEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/CollectionEntity.kt similarity index 93% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/CollectionEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/CollectionEntity.kt index 9a27e9a6f7e4..4501856af8c4 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/CollectionEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/CollectionEntity.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.WorkspaceEntity import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/DefaultValueEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/DefaultValueEntity.kt similarity index 92% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/DefaultValueEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/DefaultValueEntity.kt index 8717ebe1d5b7..3bf1a2b34d5d 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/DefaultValueEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/DefaultValueEntity.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.deft.api.annotations.Default import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/EntititesWithPersistentId.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/EntititesWithPersistentId.kt similarity index 93% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/EntititesWithPersistentId.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/EntititesWithPersistentId.kt index d8694ed81135..422429d00b46 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/EntititesWithPersistentId.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/EntititesWithPersistentId.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.WorkspaceEntity diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/EntitySources.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/EntitySources.kt similarity index 70% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/EntitySources.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/EntitySources.kt index 0c9517697420..807442272871 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/EntitySources.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/EntitySources.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.DummyParentEntitySource import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntity.kt similarity index 92% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntity.kt index 436ac03ef018..829bedd29a5e 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntity.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntityList.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntityList.kt similarity index 92% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntityList.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntityList.kt index 07c96efc8972..5e06370be138 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntityList.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntityList.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntityParentList.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntityParentList.kt similarity index 93% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntityParentList.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntityParentList.kt index cf6ef63cffe4..6f4e59f24d73 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntityParentList.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntityParentList.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntityToParent.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntityToParent.kt similarity index 95% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntityToParent.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntityToParent.kt index 242aef613e5b..ac9a6eb54d67 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ExtensionFieldEntityToParent.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ExtensionFieldEntityToParent.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/FinalFieldsEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/FinalFieldsEntity.kt similarity index 93% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/FinalFieldsEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/FinalFieldsEntity.kt index c3b9083ad9d6..469b8c06efe7 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/FinalFieldsEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/FinalFieldsEntity.kt @@ -1,8 +1,7 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.deft.api.annotations.Default -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.WorkspaceEntity import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/JpsLike.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/JpsLike.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/JpsLike.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/JpsLike.kt index 09e40dbca2c5..367e835390e1 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/JpsLike.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/JpsLike.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/KeyFieldEntities.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/KeyFieldEntities.kt similarity index 94% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/KeyFieldEntities.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/KeyFieldEntities.kt index 1e7fffd3e8ef..9065bd0b10f4 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/KeyFieldEntities.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/KeyFieldEntities.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/LinkedListEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/LinkedListEntity.kt similarity index 91% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/LinkedListEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/LinkedListEntity.kt index b43399777cf2..ce88510ab19e 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/LinkedListEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/LinkedListEntity.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.WorkspaceEntity diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/MultipleAbstract.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/MultipleAbstract.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/MultipleAbstract.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/MultipleAbstract.kt index 3360c18c5990..2e8c5906c4f5 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/MultipleAbstract.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/MultipleAbstract.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/OneToOne.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/OneToOne.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/OneToOne.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/OneToOne.kt index 49bc563c39e4..77149d7de4e5 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/OneToOne.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/OneToOne.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.WorkspaceEntity diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/OptionalOneToOne.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalOneToOne.kt similarity index 94% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/OptionalOneToOne.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalOneToOne.kt index 30c426950596..5b4572c79cca 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/OptionalOneToOne.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/OptionalOneToOne.kt @@ -1,7 +1,6 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion import com.intellij.workspaceModel.storage.MutableEntityStorage diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/Parent.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/Parent.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/Parent.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/Parent.kt index 75602c733cd1..81fe6fa2ae01 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/Parent.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/Parent.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.WorkspaceEntity diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndChild.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndChild.kt similarity index 92% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndChild.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndChild.kt index c97dd78dfcde..e63e56bfc526 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndChild.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndChild.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndChildWithNulls.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndChildWithNulls.kt similarity index 95% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndChildWithNulls.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndChildWithNulls.kt index 7d3a3986513a..da36905ac95f 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndChildWithNulls.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndChildWithNulls.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndMultipleChildren.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndMultipleChildren.kt similarity index 93% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndMultipleChildren.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndMultipleChildren.kt index 6b04c17413ea..4443bd5d1b34 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndMultipleChildren.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndMultipleChildren.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndNullableChild.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndNullableChild.kt similarity index 93% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndNullableChild.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndNullableChild.kt index 8e7918990ab6..ae63569ac40d 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/ParentAndNullableChild.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/ParentAndNullableChild.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/RiderTestEntities.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/RiderTestEntities.kt similarity index 95% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/RiderTestEntities.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/RiderTestEntities.kt index 2ab139993fb3..a670fadbfaf2 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/RiderTestEntities.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/RiderTestEntities.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SampleEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleEntity.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SampleEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleEntity.kt index faa1ea441976..a4ca76038781 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SampleEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleEntity.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.WorkspaceEntity @@ -15,7 +16,6 @@ import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion import com.intellij.workspaceModel.storage.MutableEntityStorage -import java.util.* interface SampleEntity : WorkspaceEntity { diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SampleWithSymbolicIdEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleWithSymbolicIdEntity.kt similarity index 95% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SampleWithSymbolicIdEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleWithSymbolicIdEntity.kt index ca9ba63c6b0c..de8d4dface18 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SampleWithSymbolicIdEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SampleWithSymbolicIdEntity.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.WorkspaceEntity @@ -14,7 +15,6 @@ import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion import com.intellij.workspaceModel.storage.MutableEntityStorage -import java.util.* interface SampleWithSymbolicIdEntity : WorkspaceEntityWithSymbolicId { diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SecondEntities.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SecondEntities.kt similarity index 94% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SecondEntities.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SecondEntities.kt index cc259abbfc80..481bc3340828 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SecondEntities.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SecondEntities.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SelfLinkedEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SelfLinkedEntity.kt similarity index 92% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SelfLinkedEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SelfLinkedEntity.kt index df0959281598..1e783a8c26ed 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SelfLinkedEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SelfLinkedEntity.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SingleAbstract.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SingleAbstract.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SingleAbstract.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SingleAbstract.kt index 681b4c3ad3f0..8d7e538591f4 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SingleAbstract.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SingleAbstract.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SubChildren.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SubChildren.kt similarity index 94% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SubChildren.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SubChildren.kt index ae64f2508c26..514718821be0 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/SubChildren.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/SubChildren.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/TreeEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeEntity.kt similarity index 91% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/TreeEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeEntity.kt index 10eb64422e07..bb9ea51f4631 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/TreeEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeEntity.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.WorkspaceEntity import kotlin.jvm.JvmName diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/TreeMultiparentEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeMultiparentEntity.kt similarity index 96% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/TreeMultiparentEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeMultiparentEntity.kt index 59ad196bbc8b..a569496e451d 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/TreeMultiparentEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/TreeMultiparentEntity.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/UnknownFieldEntity.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/UnknownFieldEntity.kt similarity index 93% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/UnknownFieldEntity.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/UnknownFieldEntity.kt index 7cc63f3dffb1..add5a1411a1c 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/UnknownFieldEntity.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/UnknownFieldEntity.kt @@ -1,10 +1,11 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.WorkspaceEntity +import java.util.Date import org.jetbrains.deft.ObjBuilder import org.jetbrains.deft.Type import java.util.* diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithAssertConsistency.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithAssertConsistency.kt similarity index 90% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithAssertConsistency.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithAssertConsistency.kt index 48de13f567a1..910d750fec49 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithAssertConsistency.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithAssertConsistency.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.WorkspaceEntity import kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithNullsMultiple.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithNullsMultiple.kt similarity index 91% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithNullsMultiple.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithNullsMultiple.kt index 3bb5f9ede296..e126697472bd 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithNullsMultiple.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithNullsMultiple.kt @@ -1,18 +1,13 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* +import com.intellij.workspaceModel.storage.EntitySource +import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion +import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.WorkspaceEntity -import kotlin.jvm.JvmName -import kotlin.jvm.JvmOverloads -import kotlin.jvm.JvmStatic import org.jetbrains.deft.ObjBuilder import org.jetbrains.deft.Type import org.jetbrains.deft.annotations.Child -import com.intellij.workspaceModel.storage.EntitySource -import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion - -import com.intellij.workspaceModel.storage.MutableEntityStorage diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithNullsMultipleOpposite.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithNullsMultipleOpposite.kt similarity index 93% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithNullsMultipleOpposite.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithNullsMultipleOpposite.kt index f376da913d18..7b216a2a9601 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithNullsMultipleOpposite.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithNullsMultipleOpposite.kt @@ -1,17 +1,13 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import kotlin.jvm.JvmName -import kotlin.jvm.JvmOverloads -import kotlin.jvm.JvmStatic -import org.jetbrains.deft.annotations.Child -import org.jetbrains.deft.ObjBuilder -import org.jetbrains.deft.Type import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.GeneratedCodeApiVersion - import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.WorkspaceEntity +import org.jetbrains.deft.ObjBuilder +import org.jetbrains.deft.Type +import org.jetbrains.deft.annotations.Child diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithPersistentId.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithPersistentId.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithPersistentId.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithPersistentId.kt index 39005a4a4c44..4e5f707f3aab 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithPersistentId.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithPersistentId.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithSoftLinkEntityData.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithSoftLinkEntityData.kt similarity index 98% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithSoftLinkEntityData.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithSoftLinkEntityData.kt index 58e05a2a74b6..fc885fc3ffe9 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/WithSoftLinkEntityData.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/WithSoftLinkEntityData.kt @@ -1,4 +1,5 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.WorkspaceEntity diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/primitiveEntities.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/primitiveEntities.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/primitiveEntities.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/primitiveEntities.kt index c8704efe3b1a..eb1aa1c6660a 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/primitiveEntities.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/primitiveEntities.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities import com.intellij.workspaceModel.storage.WorkspaceEntity import com.intellij.workspaceModel.storage.EntitySource diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/vfu.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/vfu.kt similarity index 97% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/vfu.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/vfu.kt index 9e44159c3567..f52fbea0c83e 100644 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/api/vfu.kt +++ b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/entities/vfu.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage.entities.test.api +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.workspaceModel.storage.testEntities.entities -import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.WorkspaceEntity import com.intellij.workspaceModel.storage.url.VirtualFileUrl import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/testEntitySources.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/testEntitySources.kt similarity index 100% rename from platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/testEntitySources.kt rename to platform/workspaceModel/storage/testEntities/testSrc/com/intellij/platform/workspaceModel/storage/testEntities/testEntitySources.kt diff --git a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/TestEntities.kt b/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/TestEntities.kt deleted file mode 100644 index 208fcde45169..000000000000 --- a/platform/workspaceModel/storage/testEntities/testSrc/com/intellij/workspaceModel/storage/entities/test/TestEntities.kt +++ /dev/null @@ -1,79 +0,0 @@ -package org.jetbrains.deft.TestEntities - -import com.intellij.workspaceModel.storage.MutableEntityStorage -import com.intellij.workspaceModel.storage.entities.test.api.* - - -fun MutableEntityStorage.modifyEntity(entity: AssertConsistencyEntity, modification: AssertConsistencyEntity.Builder.() -> Unit) = modifyEntity(AssertConsistencyEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: AttachedEntity, modification: AttachedEntity.Builder.() -> Unit) = modifyEntity(AttachedEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: AttachedEntityList, modification: AttachedEntityList.Builder.() -> Unit) = modifyEntity(AttachedEntityList.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: AttachedEntityParentList, modification: AttachedEntityParentList.Builder.() -> Unit) = modifyEntity(AttachedEntityParentList.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: AttachedEntityToParent, modification: AttachedEntityToParent.Builder.() -> Unit) = modifyEntity(AttachedEntityToParent.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: BooleanEntity, modification: BooleanEntity.Builder.() -> Unit) = modifyEntity(BooleanEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildEntity, modification: ChildEntity.Builder.() -> Unit) = modifyEntity(ChildEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildFirstEntity, modification: ChildFirstEntity.Builder.() -> Unit) = modifyEntity(ChildFirstEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildMultipleEntity, modification: ChildMultipleEntity.Builder.() -> Unit) = modifyEntity(ChildMultipleEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildNullableEntity, modification: ChildNullableEntity.Builder.() -> Unit) = modifyEntity(ChildNullableEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildSampleEntity, modification: ChildSampleEntity.Builder.() -> Unit) = modifyEntity(ChildSampleEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildSecondEntity, modification: ChildSecondEntity.Builder.() -> Unit) = modifyEntity(ChildSecondEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildSingleFirstEntity, modification: ChildSingleFirstEntity.Builder.() -> Unit) = modifyEntity(ChildSingleFirstEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildSingleSecondEntity, modification: ChildSingleSecondEntity.Builder.() -> Unit) = modifyEntity(ChildSingleSecondEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildSourceEntity, modification: ChildSourceEntity.Builder.() -> Unit) = modifyEntity(ChildSourceEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildSubEntity, modification: ChildSubEntity.Builder.() -> Unit) = modifyEntity(ChildSubEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ChildSubSubEntity, modification: ChildSubSubEntity.Builder.() -> Unit) = modifyEntity(ChildSubSubEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ComposedIdSoftRefEntity, modification: ComposedIdSoftRefEntity.Builder.() -> Unit) = modifyEntity(ComposedIdSoftRefEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ComposedLinkEntity, modification: ComposedLinkEntity.Builder.() -> Unit) = modifyEntity(ComposedLinkEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: CompositeChildAbstractEntity, modification: CompositeChildAbstractEntity.Builder.() -> Unit) = modifyEntity(CompositeChildAbstractEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: EntityWithSoftLinks, modification: EntityWithSoftLinks.Builder.() -> Unit) = modifyEntity(EntityWithSoftLinks.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: FirstEntityWithPId, modification: FirstEntityWithPId.Builder.() -> Unit) = modifyEntity(FirstEntityWithPId.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: IntEntity, modification: IntEntity.Builder.() -> Unit) = modifyEntity(IntEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: LeftEntity, modification: LeftEntity.Builder.() -> Unit) = modifyEntity(LeftEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: LinkedListEntity, modification: LinkedListEntity.Builder.() -> Unit) = modifyEntity(LinkedListEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ListEntity, modification: ListEntity.Builder.() -> Unit) = modifyEntity(ListEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ListVFUEntity, modification: ListVFUEntity.Builder.() -> Unit) = modifyEntity(ListVFUEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: MainEntity, modification: MainEntity.Builder.() -> Unit) = modifyEntity(MainEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: MainEntityList, modification: MainEntityList.Builder.() -> Unit) = modifyEntity(MainEntityList.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: MainEntityParentList, modification: MainEntityParentList.Builder.() -> Unit) = modifyEntity(MainEntityParentList.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: MainEntityToParent, modification: MainEntityToParent.Builder.() -> Unit) = modifyEntity(MainEntityToParent.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: MiddleEntity, modification: MiddleEntity.Builder.() -> Unit) = modifyEntity(MiddleEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: NamedChildEntity, modification: NamedChildEntity.Builder.() -> Unit) = modifyEntity(NamedChildEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: NamedEntity, modification: NamedEntity.Builder.() -> Unit) = modifyEntity(NamedEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: NullableVFUEntity, modification: NullableVFUEntity.Builder.() -> Unit) = modifyEntity(NullableVFUEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OneEntityWithSymbolicId, modification: OneEntityWithSymbolicId.Builder.() -> Unit) = modifyEntity(OneEntityWithSymbolicId.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OoChildAlsoWithPidEntity, modification: OoChildAlsoWithPidEntity.Builder.() -> Unit) = modifyEntity(OoChildAlsoWithPidEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OoChildEntity, modification: OoChildEntity.Builder.() -> Unit) = modifyEntity(OoChildEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OoChildForParentWithPidEntity, modification: OoChildForParentWithPidEntity.Builder.() -> Unit) = modifyEntity(OoChildForParentWithPidEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OoChildWithNullableParentEntity, modification: OoChildWithNullableParentEntity.Builder.() -> Unit) = modifyEntity(OoChildWithNullableParentEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OoChildWithPidEntity, modification: OoChildWithPidEntity.Builder.() -> Unit) = modifyEntity(OoChildWithPidEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OoParentEntity, modification: OoParentEntity.Builder.() -> Unit) = modifyEntity(OoParentEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OoParentWithPidEntity, modification: OoParentWithPidEntity.Builder.() -> Unit) = modifyEntity(OoParentWithPidEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OoParentWithoutPidEntity, modification: OoParentWithoutPidEntity.Builder.() -> Unit) = modifyEntity(OoParentWithoutPidEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OptionalIntEntity, modification: OptionalIntEntity.Builder.() -> Unit) = modifyEntity(OptionalIntEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: OptionalStringEntity, modification: OptionalStringEntity.Builder.() -> Unit) = modifyEntity(OptionalStringEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ParentAbEntity, modification: ParentAbEntity.Builder.() -> Unit) = modifyEntity(ParentAbEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ParentChainEntity, modification: ParentChainEntity.Builder.() -> Unit) = modifyEntity(ParentChainEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ParentEntity, modification: ParentEntity.Builder.() -> Unit) = modifyEntity(ParentEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ParentMultipleEntity, modification: ParentMultipleEntity.Builder.() -> Unit) = modifyEntity(ParentMultipleEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ParentNullableEntity, modification: ParentNullableEntity.Builder.() -> Unit) = modifyEntity(ParentNullableEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ParentSingleAbEntity, modification: ParentSingleAbEntity.Builder.() -> Unit) = modifyEntity(ParentSingleAbEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: ParentSubEntity, modification: ParentSubEntity.Builder.() -> Unit) = modifyEntity(ParentSubEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: SymbolicIdEntity, modification: SymbolicIdEntity.Builder.() -> Unit) = modifyEntity(SymbolicIdEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: RightEntity, modification: RightEntity.Builder.() -> Unit) = modifyEntity(RightEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: SampleEntity, modification: SampleEntity.Builder.() -> Unit) = modifyEntity(SampleEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: SampleEntity2, modification: SampleEntity2.Builder.() -> Unit) = modifyEntity(SampleEntity2.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: SecondEntityWithPId, modification: SecondEntityWithPId.Builder.() -> Unit) = modifyEntity(SecondEntityWithPId.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: SecondSampleEntity, modification: SecondSampleEntity.Builder.() -> Unit) = modifyEntity(SecondSampleEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: SelfLinkedEntity, modification: SelfLinkedEntity.Builder.() -> Unit) = modifyEntity(SelfLinkedEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: SimpleChildAbstractEntity, modification: SimpleChildAbstractEntity.Builder.() -> Unit) = modifyEntity(SimpleChildAbstractEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: SoftLinkReferencedChild, modification: SoftLinkReferencedChild.Builder.() -> Unit) = modifyEntity(SoftLinkReferencedChild.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: SourceEntity, modification: SourceEntity.Builder.() -> Unit) = modifyEntity(SourceEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: StringEntity, modification: StringEntity.Builder.() -> Unit) = modifyEntity(StringEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: VFUEntity, modification: VFUEntity.Builder.() -> Unit) = modifyEntity(VFUEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: VFUEntity2, modification: VFUEntity2.Builder.() -> Unit) = modifyEntity(VFUEntity2.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: VFUWithTwoPropertiesEntity, modification: VFUWithTwoPropertiesEntity.Builder.() -> Unit) = modifyEntity(VFUWithTwoPropertiesEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: WithListSoftLinksEntity, modification: WithListSoftLinksEntity.Builder.() -> Unit) = modifyEntity(WithListSoftLinksEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: WithSoftLinkEntity, modification: WithSoftLinkEntity.Builder.() -> Unit) = modifyEntity(WithSoftLinkEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: XChildChildEntity, modification: XChildChildEntity.Builder.() -> Unit) = modifyEntity(XChildChildEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: XChildEntity, modification: XChildEntity.Builder.() -> Unit) = modifyEntity(XChildEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: XChildWithOptionalParentEntity, modification: XChildWithOptionalParentEntity.Builder.() -> Unit) = modifyEntity(XChildWithOptionalParentEntity.Builder::class.java, entity, modification) -fun MutableEntityStorage.modifyEntity(entity: XParentEntity, modification: XParentEntity.Builder.() -> Unit) = modifyEntity(XParentEntity.Builder::class.java, entity, modification) diff --git a/platform/workspaceModel/storage/tests/resources/META-INF/services/com.intellij.workspaceModel.storage.impl.ConsistencyCheckingModeProvider b/platform/workspaceModel/storage/tests/resources/META-INF/services/com.intellij.workspaceModel.storage.impl.ConsistencyCheckingModeProvider index f76359ddd578..db2a37c561dc 100644 --- a/platform/workspaceModel/storage/tests/resources/META-INF/services/com.intellij.workspaceModel.storage.impl.ConsistencyCheckingModeProvider +++ b/platform/workspaceModel/storage/tests/resources/META-INF/services/com.intellij.workspaceModel.storage.impl.ConsistencyCheckingModeProvider @@ -1,2 +1,2 @@ # Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -com.intellij.workspaceModel.storage.impl.WorkspaceStorageConsistencyCheckingModeProviderForTests \ No newline at end of file +com.intellij.platform.workspaceModel.storage.tests.impl.WorkspaceStorageConsistencyCheckingModeProviderForTests \ No newline at end of file diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AbstractEntitiesTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AbstractEntitiesTest.kt similarity index 97% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AbstractEntitiesTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AbstractEntitiesTest.kt index 5be522e058ea..119a2c9f9231 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AbstractEntitiesTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AbstractEntitiesTest.kt @@ -1,8 +1,9 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* import com.intellij.testFramework.UsefulTestCase.assertOneElement -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.impl.ModifiableWorkspaceEntityBase import com.intellij.workspaceModel.storage.impl.assertConsistency import junit.framework.TestCase diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AbstractTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AbstractTest.kt similarity index 90% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AbstractTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AbstractTest.kt index f3bb12baa59b..3e1e4248788a 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AbstractTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AbstractTest.kt @@ -1,14 +1,15 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.ChildFirstEntity -import com.intellij.workspaceModel.storage.entities.test.api.ChildSecondEntity -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.ParentAbEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ChildFirstEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ChildSecondEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ParentAbEntity +import com.intellij.workspaceModel.storage.MutableEntityStorage import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertTrue import org.junit.Test -import org.junit.jupiter.api.assertDoesNotThrow +import org.junit.jupiter.api.Assertions.assertDoesNotThrow class AbstractTest { @Test diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AddChildrenTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AddChildrenTest.kt similarity index 94% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AddChildrenTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AddChildrenTest.kt index 23484391aa4f..72e405d5d30c 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AddChildrenTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AddChildrenTest.kt @@ -1,9 +1,11 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.MutableEntityStorage import junit.framework.TestCase.* +import kotlinx.coroutines.NonCancellable.children import org.junit.Test class AddChildrenTest { diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AssertConsistencyTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AssertConsistencyTest.kt similarity index 82% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AssertConsistencyTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AssertConsistencyTest.kt index 6281d2b6773e..4e115a4688f3 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/AssertConsistencyTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/AssertConsistencyTest.kt @@ -1,7 +1,7 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.addAssertConsistencyEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.addAssertConsistencyEntity import com.intellij.workspaceModel.storage.impl.AbstractEntityStorage import com.intellij.workspaceModel.storage.impl.assertConsistency import org.junit.Test diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/CircularDependencyProhibitedTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/CircularDependencyProhibitedTest.kt similarity index 93% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/CircularDependencyProhibitedTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/CircularDependencyProhibitedTest.kt index 896ef12599c9..b238ca6f6428 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/CircularDependencyProhibitedTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/CircularDependencyProhibitedTest.kt @@ -1,7 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.MutableEntityStorage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ClassToIntConverterTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ClassToIntConverterTest.kt similarity index 97% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ClassToIntConverterTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ClassToIntConverterTest.kt index 82e3b27b114c..319e1e0abbd9 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ClassToIntConverterTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ClassToIntConverterTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests import com.intellij.util.ConcurrencyUtil import com.intellij.util.concurrency.AppExecutorUtil diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/CollectChangesInBuilderTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/CollectChangesInBuilderTest.kt similarity index 96% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/CollectChangesInBuilderTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/CollectChangesInBuilderTest.kt index 5eaee1462401..1facf448c150 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/CollectChangesInBuilderTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/CollectChangesInBuilderTest.kt @@ -1,7 +1,10 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.EntityChange +import com.intellij.workspaceModel.storage.EntityStorageSnapshot +import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl import org.junit.Assert.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ContentRootEqualityTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ContentRootEqualityTest.kt similarity index 88% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ContentRootEqualityTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ContentRootEqualityTest.kt index 79a20fa6277c..37e8dc5b2968 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ContentRootEqualityTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ContentRootEqualityTest.kt @@ -1,12 +1,12 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests +import com.intellij.platform.workspaceModel.storage.testEntities.entities.AnotherSource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource import com.intellij.workspaceModel.storage.bridgeEntities.ContentRootEntity import com.intellij.workspaceModel.storage.bridgeEntities.ExcludeUrlEntity import com.intellij.workspaceModel.storage.bridgeEntities.ModuleEntity import com.intellij.workspaceModel.storage.bridgeEntities.SourceRootEntity -import com.intellij.workspaceModel.storage.entities.test.api.AnotherSource -import com.intellij.workspaceModel.storage.entities.test.api.MySource import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager import org.junit.Before diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/DefaultValueTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/DefaultValueTest.kt similarity index 78% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/DefaultValueTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/DefaultValueTest.kt index eadccf8d43e0..6e96bc30f992 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/DefaultValueTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/DefaultValueTest.kt @@ -1,9 +1,9 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.DefaultValueEntity -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntitySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.DefaultValueEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntitySource import org.junit.Test import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/DiffBuilderTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/DiffBuilderTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/DiffBuilderTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/DiffBuilderTest.kt index 6ca0bd555e8d..b7d4fc2822f3 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/DiffBuilderTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/DiffBuilderTest.kt @@ -1,15 +1,17 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* import com.intellij.testFramework.UsefulTestCase.assertOneElement -import com.intellij.workspaceModel.storage.entities.test.* -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.workspaceModel.storage.EntityStorage +import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.impl.EntityStorageSnapshotImpl import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.assertConsistency import com.intellij.workspaceModel.storage.impl.exceptions.AddDiffException import com.intellij.workspaceModel.storage.impl.external.ExternalEntityMappingImpl import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl +import com.intellij.workspaceModel.storage.toBuilder import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager import org.junit.jupiter.api.* import org.junit.jupiter.api.Assertions.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityReferenceTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityReferenceTest.kt similarity index 94% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityReferenceTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityReferenceTest.kt index c8e67d00bcd2..f591a289ebc8 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityReferenceTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityReferenceTest.kt @@ -1,10 +1,11 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntity -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntitySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntitySource import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl +import com.intellij.workspaceModel.storage.toBuilder import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.BeforeEach diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntitySourceIndexTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntitySourceIndexTest.kt new file mode 100644 index 000000000000..055604390c30 --- /dev/null +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntitySourceIndexTest.kt @@ -0,0 +1,136 @@ +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +package com.intellij.platform.workspaceModel.storage.tests + +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.impl.ClassToIntConverter +import com.intellij.workspaceModel.storage.impl.assertConsistency +import com.intellij.workspaceModel.storage.impl.createEntityId +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class EntitySourceIndexTest { +@Test +fun `base index test`() { + val oldSource = SampleEntitySource("oldSource") + val newSource = SampleEntitySource("newSource") + val builder = createEmptyBuilder() + val entity = builder addEntity SourceEntity("hello", oldSource) + assertEquals((entity as SourceEntityImpl.Builder).id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) + + builder.modifyEntity(entity) { + this.entitySource = newSource + } + assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)) + assertEquals(entity.id, builder.indexes.entitySourceIndex.getIdsByEntry(newSource)?.single()) + + builder.removeEntity(entity) + assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)) + assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(newSource)) +} + +@Test +fun `base index with diff test`() { + val oldSource = SampleEntitySource("oldSource") + val newSource = SampleEntitySource("newSource") + val builder = createEmptyBuilder() + val firstEntity = builder addEntity SourceEntity("one", oldSource) + assertEquals((firstEntity as SourceEntityImpl.Builder).id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) + + val diff = createBuilderFrom(builder.toSnapshot()) + assertEquals(firstEntity.id, diff.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) + assertNull(diff.indexes.entitySourceIndex.getIdsByEntry(newSource)) + + val secondEntity = diff addEntity SourceEntity("two", newSource) + assertEquals((secondEntity as SourceEntityImpl.Builder).id, diff.indexes.entitySourceIndex.getIdsByEntry(newSource)?.single()) + assertEquals(firstEntity.id, diff.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) + assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(newSource)) + + builder.addDiff(diff) + assertEquals(secondEntity.id, builder.indexes.entitySourceIndex.getIdsByEntry(newSource)?.single()) + assertEquals(firstEntity.id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) +} + +@Test +fun `remove from diff test`() { + val oldSource = SampleEntitySource("oldSource") + val builder = createEmptyBuilder() + val firstEntity = builder addEntity SourceEntity("one", oldSource) + assertEquals((firstEntity as SourceEntityImpl.Builder).id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) + + val diff = createBuilderFrom(builder.toSnapshot()) + assertEquals(firstEntity.id, diff.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) + + diff.removeEntity(firstEntity.from(diff)) + assertEquals(firstEntity.id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) + assertNull(diff.indexes.entitySourceIndex.getIdsByEntry(oldSource)) + + builder.addDiff(diff) + assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)) +} + +@Test +fun `change source in diff test`() { + val oldSource = SampleEntitySource("oldSource") + val newSource = SampleEntitySource("newSource") + val builder = createEmptyBuilder() + val firstEntity = builder addEntity SourceEntity("one", oldSource) + assertEquals((firstEntity as SourceEntityImpl.Builder).id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) + + val diff = createBuilderFrom(builder.toSnapshot()) + assertEquals(firstEntity.id, diff.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) + assertNull(diff.indexes.entitySourceIndex.getIdsByEntry(newSource)) + + diff.modifyEntity(firstEntity.from(diff)) { + this.entitySource = newSource + } + assertEquals(firstEntity.id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) + assertEquals(firstEntity.id, diff.indexes.entitySourceIndex.getIdsByEntry(newSource)?.single()) + assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(newSource)) + + builder.addDiff(diff) + assertEquals(firstEntity.id, builder.indexes.entitySourceIndex.getIdsByEntry(newSource)?.single()) + assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)) +} + +@Test +fun `remove entity with child`() { + val entitySource = SampleEntitySource("oldSource") + val builder = createEmptyBuilder() + val firstEntity = builder addEntity SourceEntity("one", entitySource) + val entity = ChildSourceEntity("firstChild", entitySource) { + this.parentEntity = firstEntity + } + builder.addEntity(entity) + + var entities = builder.indexes.entitySourceIndex.getIdsByEntry(entitySource) + assertEquals(2, entities?.size) + + builder.removeEntity(firstEntity) + + entities = builder.indexes.entitySourceIndex.getIdsByEntry(entitySource) + assertNull(entities) +} + +@Test(expected = AssertionError::class) +fun `test incorrect index`() { + val oldSource = SampleEntitySource("oldSource") + val builder = createEmptyBuilder() + builder addEntity SourceEntity("hello", oldSource) + + builder.indexes.entitySourceIndex.index(createEntityId(1, ClassToIntConverter.INSTANCE.getInt(SourceEntity::class.java)), oldSource) + + builder.assertConsistency() +} + +@Test +fun `add and change source`() { + val oldSource = SampleEntitySource("oldSource") + val builder = createEmptyBuilder() + val entity = builder addEntity SourceEntity("one", oldSource) + builder.modifyEntity(entity) { + this.entitySource = SampleEntitySource("newSource") + } + builder.assertConsistency() +} +} \ No newline at end of file diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityStorageSerializationTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityStorageSerializationTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityStorageSerializationTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityStorageSerializationTest.kt index 229e181ed237..89b8629f421b 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityStorageSerializationTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityStorageSerializationTest.kt @@ -1,9 +1,10 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.SerializationResult import com.intellij.workspaceModel.storage.bridgeEntities.LibraryTableId import com.intellij.workspaceModel.storage.bridgeEntities.addLibraryEntity -import com.intellij.workspaceModel.storage.entities.test.api.* import com.intellij.workspaceModel.storage.impl.EntityStorageSerializerImpl import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityWithNullsTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityWithNullsTest.kt similarity index 66% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityWithNullsTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityWithNullsTest.kt index df845211c2bf..4613adce9327 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityWithNullsTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityWithNullsTest.kt @@ -1,8 +1,8 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.OptionalIntEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.OptionalIntEntity import org.junit.jupiter.api.Test import kotlin.test.assertNull diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityWithSymbolicIdInPStorageTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityWithSymbolicIdInPStorageTest.kt similarity index 97% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityWithSymbolicIdInPStorageTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityWithSymbolicIdInPStorageTest.kt index 83f68c44fd6f..fd3f6da4621f 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntityWithSymbolicIdInPStorageTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/EntityWithSymbolicIdInPStorageTest.kt @@ -1,9 +1,9 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests import com.intellij.testFramework.UsefulTestCase.assertEmpty import com.intellij.testFramework.UsefulTestCase.assertOneElement -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.assertConsistency import com.intellij.workspaceModel.storage.impl.exceptions.SymbolicIdAlreadyExistsException diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExtensionListTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExtensionListTest.kt similarity index 92% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExtensionListTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExtensionListTest.kt index 56d32880d599..4a435e7eb8d7 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExtensionListTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExtensionListTest.kt @@ -1,10 +1,10 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.AttachedEntityList -import com.intellij.workspaceModel.storage.entities.test.api.MainEntityList -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.child +import com.intellij.platform.workspaceModel.storage.testEntities.entities.AttachedEntityList +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MainEntityList +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.child import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExtensionParentTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExtensionParentTest.kt similarity index 96% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExtensionParentTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExtensionParentTest.kt index a6cc1cab4a55..b94e57412ee2 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExtensionParentTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExtensionParentTest.kt @@ -1,6 +1,6 @@ -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExtensionTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExtensionTest.kt similarity index 84% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExtensionTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExtensionTest.kt index f7a665ba5616..9345aa39f95a 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExtensionTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExtensionTest.kt @@ -1,11 +1,11 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.AttachedEntity -import com.intellij.workspaceModel.storage.entities.test.api.MainEntity -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.child -import com.intellij.workspaceModel.storage.entities.test.api.modifyEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.AttachedEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MainEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.child +import com.intellij.platform.workspaceModel.storage.testEntities.entities.modifyEntity import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExternalEntityMappingTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExternalEntityMappingTest.kt similarity index 97% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExternalEntityMappingTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExternalEntityMappingTest.kt index 19f651aca0b9..6608001c2847 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ExternalEntityMappingTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ExternalEntityMappingTest.kt @@ -1,11 +1,13 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests import com.intellij.testFramework.UsefulTestCase.assertEmpty -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntity -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntitySource -import com.intellij.workspaceModel.storage.entities.test.api.SourceEntity -import com.intellij.workspaceModel.storage.entities.test.api.modifyEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntitySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SourceEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.modifyEntity +import com.intellij.workspaceModel.storage.EntityStorage +import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.impl.external.ExternalEntityMappingImpl import com.intellij.workspaceModel.storage.impl.external.MutableExternalEntityMappingImpl import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl @@ -23,7 +25,7 @@ class ExternalEntityMappingTest { val builder = createEmptyBuilder() val mapping = builder.getMutableExternalMapping(INDEX_ID) - val entity = builder addEntity SourceEntity("hello", SampleEntitySource("source")) + val entity = builder addEntity SourceEntity("hello", SampleEntitySource("source")) mapping.addMapping(entity, 1) mapping.addMapping(entity, 2) assertEquals(2, mapping.getDataByEntity(entity)) @@ -47,7 +49,7 @@ class ExternalEntityMappingTest { val builder = createEmptyBuilder() val mapping = builder.getMutableExternalMapping(INDEX_ID) - val entity = builder addEntity SourceEntity("hello", SampleEntitySource("source")) + val entity = builder addEntity SourceEntity("hello", SampleEntitySource("source")) mapping.addMapping(entity, 1) assertEquals(1, mapping.getDataByEntity(entity)) @@ -178,10 +180,10 @@ class ExternalEntityMappingTest { fun `remove mapping if entity is removed`() { val initialBuilder = createEmptyBuilder() val entity1 = initialBuilder addEntity SampleEntity(false, "1", ArrayList(), HashMap(), - VirtualFileUrlManagerImpl().fromUrl("file:///tmp"), SampleEntitySource("test")) + VirtualFileUrlManagerImpl().fromUrl("file:///tmp"), SampleEntitySource("test")) initialBuilder.getMutableExternalMapping(INDEX_ID).addMapping(entity1, 1) val entity2 = initialBuilder addEntity SampleEntity(false, "2", ArrayList(), HashMap(), - VirtualFileUrlManagerImpl().fromUrl("file:///tmp"), SampleEntitySource("test")) + VirtualFileUrlManagerImpl().fromUrl("file:///tmp"), SampleEntitySource("test")) initialBuilder.getMutableExternalMapping(INDEX_ID).addMapping(entity2, 2) val storage = initialBuilder.toSnapshot() assertEquals(1, storage.getExternalMapping(INDEX_ID).getDataByEntity(entity1)) @@ -189,7 +191,7 @@ class ExternalEntityMappingTest { val builder = createBuilderFrom(storage) val entity3 = builder addEntity SampleEntity(false, "3", ArrayList(), HashMap(), VirtualFileUrlManagerImpl().fromUrl("file:///tmp"), - SampleEntitySource("test")) + SampleEntitySource("test")) builder.getMutableExternalMapping(INDEX_ID).addMapping(entity3, 3) builder.removeEntity(entity1.from(builder)) val diff = MutableEntityStorage.from(storage) @@ -214,10 +216,10 @@ class ExternalEntityMappingTest { fun `keep mapping if entity is modified`() { val initialBuilder = createEmptyBuilder() val entity1 = initialBuilder addEntity SampleEntity(false, "1", ArrayList(), HashMap(), - VirtualFileUrlManagerImpl().fromUrl("file:///tmp"), SampleEntitySource("test")) + VirtualFileUrlManagerImpl().fromUrl("file:///tmp"), SampleEntitySource("test")) initialBuilder.getMutableExternalMapping(INDEX_ID).addMapping(entity1, 1) val entity2 = initialBuilder addEntity SampleEntity(false, "2", ArrayList(), HashMap(), - VirtualFileUrlManagerImpl().fromUrl("file:///tmp"), SampleEntitySource("test")) + VirtualFileUrlManagerImpl().fromUrl("file:///tmp"), SampleEntitySource("test")) initialBuilder.getMutableExternalMapping(INDEX_ID).addMapping(entity2, 2) val storage = initialBuilder.toSnapshot() assertEquals(1, storage.getExternalMapping(INDEX_ID).getDataByEntity(entity1)) diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/FinalAndDefaultFieldsTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/FinalAndDefaultFieldsTest.kt similarity index 81% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/FinalAndDefaultFieldsTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/FinalAndDefaultFieldsTest.kt index 8e9d00f42bb4..0bf5598fd621 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/FinalAndDefaultFieldsTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/FinalAndDefaultFieldsTest.kt @@ -1,10 +1,11 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.AnotherDataClass -import com.intellij.workspaceModel.storage.entities.test.api.FinalFieldsEntity -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.modifyEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.AnotherDataClass +import com.intellij.platform.workspaceModel.storage.testEntities.entities.FinalFieldsEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.modifyEntity +import com.intellij.workspaceModel.storage.toBuilder import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/GeneratedCodeVersionsTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/GeneratedCodeVersionsTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/GeneratedCodeVersionsTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/GeneratedCodeVersionsTest.kt index 3581663e0810..add8f33d8f3b 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/GeneratedCodeVersionsTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/GeneratedCodeVersionsTest.kt @@ -1,6 +1,7 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests +import com.intellij.workspaceModel.storage.* import com.intellij.workspaceModel.storage.impl.ConnectionId import com.intellij.workspaceModel.storage.impl.ModifiableWorkspaceEntityBase import com.intellij.workspaceModel.storage.impl.WorkspaceEntityBase diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/KeyEntitiesTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/KeyEntitiesTest.kt similarity index 72% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/KeyEntitiesTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/KeyEntitiesTest.kt index a325de7185c8..04556f2fd2cd 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/KeyEntitiesTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/KeyEntitiesTest.kt @@ -1,10 +1,10 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.AnotherSource -import com.intellij.workspaceModel.storage.entities.test.api.KeyChild -import com.intellij.workspaceModel.storage.entities.test.api.KeyParent -import com.intellij.workspaceModel.storage.entities.test.api.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.AnotherSource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.KeyChild +import com.intellij.platform.workspaceModel.storage.testEntities.entities.KeyParent +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource import com.intellij.workspaceModel.storage.impl.ChangeEntry import com.intellij.workspaceModel.storage.impl.assertConsistency import org.junit.Test diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/MoveEntitiesBetweenStoragesTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/MoveEntitiesBetweenStoragesTest.kt similarity index 94% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/MoveEntitiesBetweenStoragesTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/MoveEntitiesBetweenStoragesTest.kt index 08b0b9a69b88..fa1a6ddfea9e 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/MoveEntitiesBetweenStoragesTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/MoveEntitiesBetweenStoragesTest.kt @@ -1,7 +1,7 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/MutableEntityCollectionTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/MutableEntityCollectionTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/MutableEntityCollectionTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/MutableEntityCollectionTest.kt index 5813c9bca276..87df5fc0a775 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/MutableEntityCollectionTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/MutableEntityCollectionTest.kt @@ -1,8 +1,8 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* import com.intellij.testFramework.ApplicationRule -import com.intellij.workspaceModel.storage.entities.test.api.* import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.WorkspaceEntityBase import com.intellij.workspaceModel.storage.impl.containers.MutableWorkspaceSet diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/MutableStorageTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/MutableStorageTest.kt similarity index 96% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/MutableStorageTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/MutableStorageTest.kt index 946f8498b1d8..deacb3d558df 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/MutableStorageTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/MutableStorageTest.kt @@ -1,7 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.MutableEntityStorage +import com.intellij.workspaceModel.storage.toBuilder import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/OptionalOneToOne.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/OptionalOneToOne.kt similarity index 72% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/OptionalOneToOne.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/OptionalOneToOne.kt index 52b207efbd99..5c4fcca17634 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/OptionalOneToOne.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/OptionalOneToOne.kt @@ -1,9 +1,9 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.OptionalOneToOneChildEntity -import com.intellij.workspaceModel.storage.entities.test.api.OptionalOneToOneParentEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.OptionalOneToOneChildEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.OptionalOneToOneParentEntity import com.intellij.workspaceModel.storage.impl.assertConsistency import org.junit.Test import kotlin.test.assertNotNull diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/PackedEntityIdTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/PackedEntityIdTest.kt similarity index 93% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/PackedEntityIdTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/PackedEntityIdTest.kt index a5fbe6e9dd0e..b89449d2ec75 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/PackedEntityIdTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/PackedEntityIdTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests import com.intellij.workspaceModel.storage.impl.arrayId import com.intellij.workspaceModel.storage.impl.clazz diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentAndChildTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentAndChildTest.kt similarity index 90% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentAndChildTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentAndChildTest.kt index 0b30b225569b..e4cfea3023ec 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentAndChildTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentAndChildTest.kt @@ -1,12 +1,14 @@ -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.ChildEntity -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.ParentEntity -import com.intellij.workspaceModel.storage.entities.test.api.modifyEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ChildEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ParentEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.modifyEntity +import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.impl.EntityStorageSnapshotImpl import com.intellij.workspaceModel.storage.impl.ModifiableWorkspaceEntityBase import com.intellij.workspaceModel.storage.impl.assertConsistency +import com.intellij.workspaceModel.storage.toBuilder import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentAndMultipleChildrenTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentAndMultipleChildrenTest.kt similarity index 97% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentAndMultipleChildrenTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentAndMultipleChildrenTest.kt index 76e8927956fe..a231b64fc948 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentAndMultipleChildrenTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentAndMultipleChildrenTest.kt @@ -1,7 +1,8 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.MutableEntityStorage import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentAndNullableChildTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentAndNullableChildTest.kt similarity index 90% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentAndNullableChildTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentAndNullableChildTest.kt index 771e794c31d4..51335947826f 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentAndNullableChildTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentAndNullableChildTest.kt @@ -1,9 +1,10 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.ChildNullableEntity -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.ParentNullableEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ChildNullableEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ParentNullableEntity +import com.intellij.workspaceModel.storage.MutableEntityStorage import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentChildReferenceTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentChildReferenceTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentChildReferenceTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentChildReferenceTest.kt index 89a4ec4064b9..b8383bcdc2b2 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ParentChildReferenceTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ParentChildReferenceTest.kt @@ -1,8 +1,9 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* import com.intellij.testFramework.UsefulTestCase.assertEmpty -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.impl.ConnectionId import com.intellij.workspaceModel.storage.impl.EntityLink import org.junit.jupiter.api.Test @@ -14,7 +15,7 @@ class ParentChildReferenceTest { private val CHILD_CONNECTION_ID: ConnectionId = ConnectionId.create(ParentEntity::class.java, ChildEntity::class.java, ConnectionId.ConnectionType.ONE_TO_ONE, false) private val CHILDREN_CONNECTION_ID: ConnectionId = ConnectionId.create(ParentMultipleEntity::class.java, ChildMultipleEntity::class.java, ConnectionId.ConnectionType.ONE_TO_MANY, false) } - + @Test fun `check parent and child both set at field while they are not in the store case one`() { val parentEntity = ParentEntity("ParentData", MySource) { diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ReferencesInStorageTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ReferencesInStorageTest.kt similarity index 97% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ReferencesInStorageTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ReferencesInStorageTest.kt index d5a5baa6026d..43fc7b7712de 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ReferencesInStorageTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ReferencesInStorageTest.kt @@ -1,7 +1,8 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.EntityStorage import com.intellij.workspaceModel.storage.impl.assertConsistency import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ReplaceBySourceTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ReplaceBySourceTest.kt similarity index 99% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ReplaceBySourceTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ReplaceBySourceTest.kt index 3d22a536780d..9c2b27e83770 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/ReplaceBySourceTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/ReplaceBySourceTest.kt @@ -1,13 +1,17 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests import com.intellij.testFramework.UsefulTestCase.assertEmpty import com.intellij.testFramework.UsefulTestCase.assertOneElement import com.intellij.workspaceModel.storage.bridgeEntities.ContentRootEntity import com.intellij.workspaceModel.storage.bridgeEntities.ModuleEntity -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.EntityChange +import com.intellij.workspaceModel.storage.MutableEntityStorage +import com.intellij.workspaceModel.storage.WorkspaceEntity import com.intellij.workspaceModel.storage.impl.* import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl +import com.intellij.workspaceModel.storage.toBuilder import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.RepeatedTest import org.junit.jupiter.api.RepetitionInfo diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/RiderEntitiesTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/RiderEntitiesTest.kt similarity index 90% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/RiderEntitiesTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/RiderEntitiesTest.kt index 2cd41508bc7c..79c84b1ed620 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/RiderEntitiesTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/RiderEntitiesTest.kt @@ -1,13 +1,14 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests +import com.intellij.platform.workspaceModel.storage.testEntities.entities.DescriptorInstance +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ProjectModelTestEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.modifyEntity import com.intellij.workspaceModel.storage.bridgeEntities.ContentRootEntity import com.intellij.workspaceModel.storage.bridgeEntities.ModuleEntity -import com.intellij.workspaceModel.storage.entities.test.api.DescriptorInstance -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.ProjectModelTestEntity -import com.intellij.workspaceModel.storage.entities.test.api.modifyEntity import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl +import com.intellij.workspaceModel.storage.toBuilder import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import kotlin.test.assertNotNull diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SampleTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SampleTest.kt similarity index 81% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SampleTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SampleTest.kt index bd8a28869c38..06840c614fb6 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SampleTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SampleTest.kt @@ -1,9 +1,10 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntity2 -import com.intellij.workspaceModel.storage.entities.test.api.modifyEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntity2 +import com.intellij.platform.workspaceModel.storage.testEntities.entities.modifyEntity +import com.intellij.workspaceModel.storage.MutableEntityStorage import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SelfLinkedEntityTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SelfLinkedEntityTest.kt similarity index 69% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SelfLinkedEntityTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SelfLinkedEntityTest.kt index 865e6c869c5b..b2ef3ecfb0df 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SelfLinkedEntityTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SelfLinkedEntityTest.kt @@ -1,9 +1,9 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.SelfLinkedEntity -import com.intellij.workspaceModel.storage.entities.test.api.children +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SelfLinkedEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.children import junit.framework.TestCase.assertEquals import org.junit.Test diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SerializationTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SerializationTest.kt similarity index 97% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SerializationTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SerializationTest.kt index 2d4014c45441..9369741e49b3 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SerializationTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SerializationTest.kt @@ -1,7 +1,8 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.EntityInformation import org.junit.Ignore import org.junit.Test import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SimplePropertiesInStorageTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SimplePropertiesInStorageTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SimplePropertiesInStorageTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SimplePropertiesInStorageTest.kt index aa4877f47bad..7a59990a04b2 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SimplePropertiesInStorageTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SimplePropertiesInStorageTest.kt @@ -1,7 +1,8 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.EntityStorage import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager import org.junit.Assert.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SingleAbstractTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SingleAbstractTest.kt similarity index 85% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SingleAbstractTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SingleAbstractTest.kt index 476fc621329d..37d1e455e00b 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SingleAbstractTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SingleAbstractTest.kt @@ -1,10 +1,11 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.ChildSingleFirstEntity -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.ParentSingleAbEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ChildSingleFirstEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ParentSingleAbEntity +import com.intellij.workspaceModel.storage.MutableEntityStorage import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SoftLinksTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SoftLinksTest.kt similarity index 97% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SoftLinksTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SoftLinksTest.kt index aab8f01a0901..1ad58821b723 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SoftLinksTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SoftLinksTest.kt @@ -1,8 +1,9 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests import com.intellij.testFramework.UsefulTestCase.assertOneElement -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.impl.assertConsistency import junit.framework.Assert.assertEquals import junit.framework.Assert.assertNotNull diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/StorageIndexiesTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/StorageIndexiesTest.kt similarity index 94% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/StorageIndexiesTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/StorageIndexiesTest.kt index 2b458b82fe0f..8548b6a481a5 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/StorageIndexiesTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/StorageIndexiesTest.kt @@ -1,10 +1,11 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage.impl +package com.intellij.platform.workspaceModel.storage.tests.impl import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.MutableEntityStorage +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl -import com.intellij.workspaceModel.storage.entities.test.api.* import com.intellij.workspaceModel.storage.url.VirtualFileUrl import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SubChildrenTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SubChildrenTest.kt similarity index 78% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SubChildrenTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SubChildrenTest.kt index ed5e708fe1a7..bf3e6ff2f004 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SubChildrenTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SubChildrenTest.kt @@ -1,10 +1,11 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.ChildSubEntity -import com.intellij.workspaceModel.storage.entities.test.api.ChildSubSubEntity -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.ParentSubEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ChildSubEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ChildSubSubEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.ParentSubEntity +import com.intellij.workspaceModel.storage.MutableEntityStorage import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SymbolicIdIndexTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SymbolicIdIndexTest.kt similarity index 92% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SymbolicIdIndexTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SymbolicIdIndexTest.kt index 3865421ec3c6..25d6acbfbae2 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/SymbolicIdIndexTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/SymbolicIdIndexTest.kt @@ -1,10 +1,10 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntitySource -import com.intellij.workspaceModel.storage.entities.test.api.SymbolicIdEntity -import com.intellij.workspaceModel.storage.entities.test.api.SymbolicIdEntityImpl -import com.intellij.workspaceModel.storage.entities.test.api.modifyEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntitySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SymbolicIdEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SymbolicIdEntityImpl +import com.intellij.platform.workspaceModel.storage.testEntities.entities.modifyEntity import org.junit.Assert import org.junit.Test diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/TreeEntityTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/TreeEntityTest.kt similarity index 84% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/TreeEntityTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/TreeEntityTest.kt index 374fa70ffb24..01cfd82cd92e 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/TreeEntityTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/TreeEntityTest.kt @@ -1,8 +1,8 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.TreeEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.TreeEntity import junit.framework.TestCase.assertEquals import org.junit.Test diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/UnknownFieldTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/UnknownFieldTest.kt similarity index 67% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/UnknownFieldTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/UnknownFieldTest.kt index dc0df08cce40..00eae524e0cb 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/UnknownFieldTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/UnknownFieldTest.kt @@ -1,8 +1,8 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.UnknownFieldEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.UnknownFieldEntity import org.junit.Test import java.util.* import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/VirtualFileIndexTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/VirtualFileIndexTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/VirtualFileIndexTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/VirtualFileIndexTest.kt index 0b76349ed30a..8caf0cc6a677 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/VirtualFileIndexTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/VirtualFileIndexTest.kt @@ -1,10 +1,10 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.registry.Registry +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* import com.intellij.testFramework.ApplicationRule -import com.intellij.workspaceModel.storage.entities.test.api.* import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.WorkspaceEntityBase import com.intellij.workspaceModel.storage.impl.assertConsistency diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/VirtualFileNameStoreTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/VirtualFileNameStoreTest.kt similarity index 95% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/VirtualFileNameStoreTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/VirtualFileNameStoreTest.kt index 460eff63e19e..24e7743d3412 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/VirtualFileNameStoreTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/VirtualFileNameStoreTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests import com.intellij.workspaceModel.storage.impl.VirtualFileNameStore import org.junit.Assert diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/VirtualFileUrlManagerTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/VirtualFileUrlManagerTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/VirtualFileUrlManagerTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/VirtualFileUrlManagerTest.kt index 2651d1ad05e7..51c1113fe6d2 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/VirtualFileUrlManagerTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/VirtualFileUrlManagerTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests import com.intellij.openapi.vfs.VfsUtil import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WithNullsEntityMultipleTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WithNullsEntityMultipleTest.kt similarity index 83% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WithNullsEntityMultipleTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WithNullsEntityMultipleTest.kt index 6c5bed889713..f9cb6f5cd625 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WithNullsEntityMultipleTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WithNullsEntityMultipleTest.kt @@ -1,7 +1,8 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.MutableEntityStorage import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WithNullsEntityTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WithNullsEntityTest.kt similarity index 83% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WithNullsEntityTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WithNullsEntityTest.kt index eb5ff22dbfd4..52b4c5c56ae1 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WithNullsEntityTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WithNullsEntityTest.kt @@ -1,7 +1,8 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.MutableEntityStorage import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WithNullsOppositeTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WithNullsOppositeTest.kt similarity index 76% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WithNullsOppositeTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WithNullsOppositeTest.kt index 878876a1e63a..aff1c62f012e 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WithNullsOppositeTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WithNullsOppositeTest.kt @@ -1,7 +1,8 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.workspaceModel.storage.MutableEntityStorage import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WorkspaceEntityEqualityTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WorkspaceEntityEqualityTest.kt similarity index 92% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WorkspaceEntityEqualityTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WorkspaceEntityEqualityTest.kt index 93ef4544d76b..0c7786d6a6a7 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/WorkspaceEntityEqualityTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/WorkspaceEntityEqualityTest.kt @@ -1,10 +1,13 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntity -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntitySource -import com.intellij.workspaceModel.storage.entities.test.api.modifyEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntitySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.modifyEntity +import com.intellij.workspaceModel.storage.EntityStorageSnapshot +import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl +import com.intellij.workspaceModel.storage.toBuilder import org.junit.Assert.* import org.junit.Before import org.junit.Ignore diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/BidirectionalMapTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/BidirectionalMapTest.kt similarity index 97% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/BidirectionalMapTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/BidirectionalMapTest.kt index e7dde33a4f85..e859887cf285 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/BidirectionalMapTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/BidirectionalMapTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.containers +package com.intellij.platform.workspaceModel.storage.tests.containers import com.intellij.testFramework.UsefulTestCase.* import com.intellij.workspaceModel.storage.impl.containers.BidirectionalMap diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/IntIntUniqueBiMapTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/IntIntUniqueBiMapTest.kt similarity index 94% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/IntIntUniqueBiMapTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/IntIntUniqueBiMapTest.kt index 02f4ba774b52..b6bd274c819b 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/IntIntUniqueBiMapTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/IntIntUniqueBiMapTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.containers +package com.intellij.platform.workspaceModel.storage.tests.containers import com.intellij.workspaceModel.storage.impl.containers.MutableIntIntUniqueBiMap import org.junit.Assert.* diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/NonNegativeIntIntBiMapPropertyTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/NonNegativeIntIntBiMapPropertyTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/NonNegativeIntIntBiMapPropertyTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/NonNegativeIntIntBiMapPropertyTest.kt index 0dce7dd22b7c..68214e98cc12 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/NonNegativeIntIntBiMapPropertyTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/NonNegativeIntIntBiMapPropertyTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.containers +package com.intellij.platform.workspaceModel.storage.tests.containers import com.intellij.util.containers.BidirectionalMap import com.intellij.workspaceModel.storage.impl.containers.MutableNonNegativeIntIntBiMap diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/NonNegativeIntIntBiMapTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/NonNegativeIntIntBiMapTest.kt similarity index 94% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/NonNegativeIntIntBiMapTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/NonNegativeIntIntBiMapTest.kt index f3da69744b53..c66311497fe8 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/NonNegativeIntIntBiMapTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/NonNegativeIntIntBiMapTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.containers +package com.intellij.platform.workspaceModel.storage.tests.containers import com.intellij.workspaceModel.storage.impl.containers.MutableNonNegativeIntIntBiMap import org.junit.jupiter.api.Assertions.assertArrayEquals diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/NonNegativeIntIntMultiMapPropertyTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/NonNegativeIntIntMultiMapPropertyTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/NonNegativeIntIntMultiMapPropertyTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/NonNegativeIntIntMultiMapPropertyTest.kt index 0a6b9293c59a..a161b5f262b1 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/NonNegativeIntIntMultiMapPropertyTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/NonNegativeIntIntMultiMapPropertyTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.containers +package com.intellij.platform.workspaceModel.storage.tests.containers import com.intellij.util.containers.MultiMap import com.intellij.workspaceModel.storage.impl.containers.MutableNonNegativeIntIntMultiMap diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/TestNonNegativeIntIntMultiMap.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/TestNonNegativeIntIntMultiMap.kt similarity index 95% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/TestNonNegativeIntIntMultiMap.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/TestNonNegativeIntIntMultiMap.kt index 3ffc1e009df0..4b7d37cea010 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/containers/TestNonNegativeIntIntMultiMap.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/containers/TestNonNegativeIntIntMultiMap.kt @@ -1,5 +1,5 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.containers +package com.intellij.platform.workspaceModel.storage.tests.containers import com.intellij.workspaceModel.storage.impl.containers.MutableNonNegativeIntIntMultiMap import org.junit.Assert.* diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/impl/ExternalEntityMappingImplTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/impl/ExternalEntityMappingImplTest.kt similarity index 77% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/impl/ExternalEntityMappingImplTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/impl/ExternalEntityMappingImplTest.kt index 5e3428ca61ef..6728661ecebd 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/impl/ExternalEntityMappingImplTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/impl/ExternalEntityMappingImplTest.kt @@ -1,10 +1,10 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.impl +package com.intellij.platform.workspaceModel.storage.tests.impl -import com.intellij.workspaceModel.storage.createBuilderFrom -import com.intellij.workspaceModel.storage.createEmptyBuilder -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntity -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntitySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntity +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntitySource +import com.intellij.platform.workspaceModel.storage.tests.createBuilderFrom +import com.intellij.platform.workspaceModel.storage.tests.createEmptyBuilder import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl import junit.framework.Assert.assertTrue import org.junit.Test diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/impl/WorkspaceBuilderChangeLogTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/impl/WorkspaceBuilderChangeLogTest.kt similarity index 97% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/impl/WorkspaceBuilderChangeLogTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/impl/WorkspaceBuilderChangeLogTest.kt index 460be834ff2f..4f17e0c8df63 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/impl/WorkspaceBuilderChangeLogTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/impl/WorkspaceBuilderChangeLogTest.kt @@ -1,9 +1,13 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.impl +package com.intellij.platform.workspaceModel.storage.tests.impl +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* +import com.intellij.platform.workspaceModel.storage.tests.createEmptyBuilder import com.intellij.testFramework.assertInstanceOf -import com.intellij.workspaceModel.storage.createEmptyBuilder -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.workspaceModel.storage.impl.AbstractEntityStorage +import com.intellij.workspaceModel.storage.impl.ChangeEntry +import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl +import com.intellij.workspaceModel.storage.impl.assertConsistency import org.junit.After import org.junit.Before import org.junit.Test @@ -12,7 +16,6 @@ import kotlin.test.assertFalse import kotlin.test.assertTrue class WorkspaceBuilderChangeLogTest { - internal lateinit var builder: MutableEntityStorageImpl internal lateinit var another: MutableEntityStorageImpl @@ -231,7 +234,7 @@ class WorkspaceBuilderChangeLogTest { assertEquals(1, log.size) val changeEntry = log.values.single() assertTrue(changeEntry is ChangeEntry.ReplaceEntity) - changeEntry as ChangeEntry.ReplaceEntity + changeEntry assertEquals(0, changeEntry.references!!.removedChildren.size) assertEquals(2, changeEntry.references.newChildren.size) assertEquals(0, changeEntry.references.modifiedParents.size) diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/impl/WorkspaceStorageConsistencyCheckingModeProviderForTests.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/impl/WorkspaceStorageConsistencyCheckingModeProviderForTests.kt similarity index 61% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/impl/WorkspaceStorageConsistencyCheckingModeProviderForTests.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/impl/WorkspaceStorageConsistencyCheckingModeProviderForTests.kt index 7c9ccfec787a..1d3d71622013 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/impl/WorkspaceStorageConsistencyCheckingModeProviderForTests.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/impl/WorkspaceStorageConsistencyCheckingModeProviderForTests.kt @@ -1,5 +1,8 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.impl +package com.intellij.platform.workspaceModel.storage.tests.impl + +import com.intellij.workspaceModel.storage.impl.ConsistencyCheckingMode +import com.intellij.workspaceModel.storage.impl.ConsistencyCheckingModeProvider class WorkspaceStorageConsistencyCheckingModeProviderForTests : ConsistencyCheckingModeProvider { override val mode: ConsistencyCheckingMode diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/BidirectionalMapPropertyTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/BidirectionalMapPropertyTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/BidirectionalMapPropertyTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/BidirectionalMapPropertyTest.kt index 5df4f8e70941..6a85b7c1ad83 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/BidirectionalMapPropertyTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/BidirectionalMapPropertyTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.propertyBased +package com.intellij.platform.workspaceModel.storage.tests.propertyBased import com.intellij.workspaceModel.storage.impl.containers.BidirectionalMap import org.jetbrains.jetCheck.Generator diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/EntityManipulations.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/EntityManipulations.kt similarity index 99% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/EntityManipulations.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/EntityManipulations.kt index 5b8f277953cf..f1594194a1c3 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/EntityManipulations.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/EntityManipulations.kt @@ -1,9 +1,9 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.propertyBased +package com.intellij.platform.workspaceModel.storage.tests.propertyBased import com.intellij.workspaceModel.storage.EntitySource import com.intellij.workspaceModel.storage.WorkspaceEntity -import com.intellij.workspaceModel.storage.entities.test.api.* +import com.intellij.platform.workspaceModel.storage.testEntities.entities.* import com.intellij.workspaceModel.storage.impl.* import com.intellij.workspaceModel.storage.impl.exceptions.SymbolicIdAlreadyExistsException import com.intellij.workspaceModel.storage.impl.url.VirtualFileUrlManagerImpl diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/Generators.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/Generators.kt similarity index 89% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/Generators.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/Generators.kt index 175e5c3a707d..e3314f44b6a6 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/Generators.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/Generators.kt @@ -1,11 +1,11 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.propertyBased +package com.intellij.platform.workspaceModel.storage.tests.propertyBased +import com.intellij.platform.workspaceModel.storage.testEntities.entities.AnotherSource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.SampleEntitySource +import com.intellij.platform.workspaceModel.storage.tests.createEmptyBuilder import com.intellij.workspaceModel.storage.WorkspaceEntity -import com.intellij.workspaceModel.storage.createEmptyBuilder -import com.intellij.workspaceModel.storage.entities.test.api.AnotherSource -import com.intellij.workspaceModel.storage.entities.test.api.MySource -import com.intellij.workspaceModel.storage.entities.test.api.SampleEntitySource import com.intellij.workspaceModel.storage.impl.EntityId import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.toClassId diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/PropertyTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/PropertyTest.kt similarity index 91% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/PropertyTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/PropertyTest.kt index c4b6a04a4111..501cb9a2e513 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/PropertyTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/PropertyTest.kt @@ -1,9 +1,13 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.propertyBased +package com.intellij.platform.workspaceModel.storage.tests.propertyBased -import com.intellij.workspaceModel.storage.* -import com.intellij.workspaceModel.storage.entities.test.api.AnotherSource -import com.intellij.workspaceModel.storage.entities.test.api.MySource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.AnotherSource +import com.intellij.platform.workspaceModel.storage.testEntities.entities.MySource +import com.intellij.platform.workspaceModel.storage.tests.createBuilderFrom +import com.intellij.workspaceModel.storage.EntitySource +import com.intellij.workspaceModel.storage.EntityStorage +import com.intellij.workspaceModel.storage.MutableEntityStorage +import com.intellij.workspaceModel.storage.WorkspaceEntity import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.RefsTable import com.intellij.workspaceModel.storage.impl.StorageIndexes diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/VirtualFileIndexTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/VirtualFileIndexTest.kt similarity index 98% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/VirtualFileIndexTest.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/VirtualFileIndexTest.kt index 73dc6159f327..d2b020e5c150 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/propertyBased/VirtualFileIndexTest.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/propertyBased/VirtualFileIndexTest.kt @@ -1,5 +1,5 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage.propertyBased +package com.intellij.platform.workspaceModel.storage.tests.propertyBased import com.intellij.testFramework.ApplicationRule import com.intellij.testFramework.DisposableRule diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/storageTestUtils.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/storageTestUtils.kt similarity index 85% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/storageTestUtils.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/storageTestUtils.kt index a48243d5600a..4ea57551d87b 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/storageTestUtils.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/storageTestUtils.kt @@ -1,7 +1,9 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests +import com.intellij.workspaceModel.storage.EntityStorage +import com.intellij.workspaceModel.storage.MutableEntityStorage import com.intellij.workspaceModel.storage.impl.MutableEntityStorageImpl import com.intellij.workspaceModel.storage.impl.EntityStorageSnapshotImpl import com.intellij.workspaceModel.storage.impl.assertConsistency diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/testUtils.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/testUtils.kt similarity index 95% rename from platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/testUtils.kt rename to platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/testUtils.kt index 332d0cee37d7..3b37dc614022 100644 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/testUtils.kt +++ b/platform/workspaceModel/storage/tests/testSrc/com/intellij/platform/workspaceModel/storage/tests/testUtils.kt @@ -1,12 +1,17 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.storage +package com.intellij.platform.workspaceModel.storage.tests import com.google.common.collect.HashBiMap +import com.intellij.workspaceModel.storage.EntityStorage +import com.intellij.workspaceModel.storage.EntityTypesResolver +import com.intellij.workspaceModel.storage.WorkspaceEntity import com.intellij.workspaceModel.storage.impl.* import com.intellij.workspaceModel.storage.impl.containers.BidirectionalLongMultiMap import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager import junit.framework.TestCase.* import org.junit.Assert +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.function.Executable import java.nio.file.Files import java.util.function.BiPredicate import kotlin.reflect.full.memberProperties diff --git a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntitySourceIndexTest.kt b/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntitySourceIndexTest.kt deleted file mode 100644 index b939af330136..000000000000 --- a/platform/workspaceModel/storage/tests/testSrc/com/intellij/workspaceModel/storage/EntitySourceIndexTest.kt +++ /dev/null @@ -1,136 +0,0 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.workspaceModel.storage - -import com.intellij.workspaceModel.storage.entities.test.api.* -import com.intellij.workspaceModel.storage.impl.ClassToIntConverter -import com.intellij.workspaceModel.storage.impl.assertConsistency -import com.intellij.workspaceModel.storage.impl.createEntityId -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNull -import org.junit.Test - -class EntitySourceIndexTest { - @Test - fun `base index test`() { - val oldSource = SampleEntitySource("oldSource") - val newSource = SampleEntitySource("newSource") - val builder = createEmptyBuilder() - val entity = builder addEntity SourceEntity("hello", oldSource) - assertEquals((entity as SourceEntityImpl.Builder).id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - - builder.modifyEntity(entity) { - this.entitySource = newSource - } - assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)) - assertEquals(entity.id, builder.indexes.entitySourceIndex.getIdsByEntry(newSource)?.single()) - - builder.removeEntity(entity) - assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)) - assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(newSource)) - } - - @Test - fun `base index with diff test`() { - val oldSource = SampleEntitySource("oldSource") - val newSource = SampleEntitySource("newSource") - val builder = createEmptyBuilder() - val firstEntity = builder addEntity SourceEntity("one", oldSource) - assertEquals((firstEntity as SourceEntityImpl.Builder).id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - - val diff = createBuilderFrom(builder.toSnapshot()) - assertEquals(firstEntity.id, diff.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - assertNull(diff.indexes.entitySourceIndex.getIdsByEntry(newSource)) - - val secondEntity = diff addEntity SourceEntity("two", newSource) - assertEquals((secondEntity as SourceEntityImpl.Builder).id, diff.indexes.entitySourceIndex.getIdsByEntry(newSource)?.single()) - assertEquals(firstEntity.id, diff.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(newSource)) - - builder.addDiff(diff) - assertEquals(secondEntity.id, builder.indexes.entitySourceIndex.getIdsByEntry(newSource)?.single()) - assertEquals(firstEntity.id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - } - - @Test - fun `remove from diff test`() { - val oldSource = SampleEntitySource("oldSource") - val builder = createEmptyBuilder() - val firstEntity = builder addEntity SourceEntity("one", oldSource) - assertEquals((firstEntity as SourceEntityImpl.Builder).id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - - val diff = createBuilderFrom(builder.toSnapshot()) - assertEquals(firstEntity.id, diff.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - - diff.removeEntity(firstEntity.from(diff)) - assertEquals(firstEntity.id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - assertNull(diff.indexes.entitySourceIndex.getIdsByEntry(oldSource)) - - builder.addDiff(diff) - assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)) - } - - @Test - fun `change source in diff test`() { - val oldSource = SampleEntitySource("oldSource") - val newSource = SampleEntitySource("newSource") - val builder = createEmptyBuilder() - val firstEntity = builder addEntity SourceEntity("one", oldSource) - assertEquals((firstEntity as SourceEntityImpl.Builder).id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - - val diff = createBuilderFrom(builder.toSnapshot()) - assertEquals(firstEntity.id, diff.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - assertNull(diff.indexes.entitySourceIndex.getIdsByEntry(newSource)) - - diff.modifyEntity(firstEntity.from(diff)) { - this.entitySource = newSource - } - assertEquals(firstEntity.id, builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)?.single()) - assertEquals(firstEntity.id, diff.indexes.entitySourceIndex.getIdsByEntry(newSource)?.single()) - assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(newSource)) - - builder.addDiff(diff) - assertEquals(firstEntity.id, builder.indexes.entitySourceIndex.getIdsByEntry(newSource)?.single()) - assertNull(builder.indexes.entitySourceIndex.getIdsByEntry(oldSource)) - } - - @Test - fun `remove entity with child`() { - val entitySource = SampleEntitySource("oldSource") - val builder = createEmptyBuilder() - val firstEntity = builder addEntity SourceEntity("one", entitySource) - val entity = ChildSourceEntity("firstChild", entitySource) { - this.parentEntity = firstEntity - } - builder.addEntity(entity) - - var entities = builder.indexes.entitySourceIndex.getIdsByEntry(entitySource) - assertEquals(2, entities?.size) - - builder.removeEntity(firstEntity) - - entities = builder.indexes.entitySourceIndex.getIdsByEntry(entitySource) - assertNull(entities) - } - - @Test(expected = AssertionError::class) - fun `test incorrect index`() { - val oldSource = SampleEntitySource("oldSource") - val builder = createEmptyBuilder() - builder addEntity SourceEntity("hello", oldSource) - - builder.indexes.entitySourceIndex.index(createEntityId(1, ClassToIntConverter.INSTANCE.getInt(SourceEntity::class.java)), oldSource) - - builder.assertConsistency() - } - - @Test - fun `add and change source`() { - val oldSource = SampleEntitySource("oldSource") - val builder = createEmptyBuilder() - val entity = builder addEntity SourceEntity("one", oldSource) - builder.modifyEntity(entity) { - this.entitySource = SampleEntitySource("newSource") - } - builder.assertConsistency() - } -} \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.workspaceModel/tests/testSrc/com/intellij/devkit/workspaceModel/AllIntellijEntitiesGenerationTest.kt b/plugins/devkit/intellij.devkit.workspaceModel/tests/testSrc/com/intellij/devkit/workspaceModel/AllIntellijEntitiesGenerationTest.kt index c361206ea2ac..eb249b44674b 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/tests/testSrc/com/intellij/devkit/workspaceModel/AllIntellijEntitiesGenerationTest.kt +++ b/plugins/devkit/intellij.devkit.workspaceModel/tests/testSrc/com/intellij/devkit/workspaceModel/AllIntellijEntitiesGenerationTest.kt @@ -39,11 +39,9 @@ class AllIntellijEntitiesGenerationTest : CodeGenerationTestBase() { private val skippedModulePaths: Set> = setOf( "intellij.platform.workspaceModel.storage.tests" to - "com/intellij/workspaceModel/storage", + "com/intellij/platform/workspaceModel/storage/tests", "intellij.platform.workspaceModel.storage.testEntities" to - "com/intellij/workspaceModel/storage/entities/unknowntypes/test/api", - "intellij.platform.workspaceModel.storage.testEntities" to - "com/intellij/workspaceModel/storage/entities/model/api", + "com/intellij/platform/workspaceModel/storage/testEntities/entities", "intellij.platform.workspaceModel.storage" to "com/intellij/workspaceModel/storage" )