@itwin/core-backend 5.13.0-dev.1 → 5.13.0-dev.11

package/lib/esm/test/element/ElementAspect.test.js

@@ -3,10 +3,11 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 import { assert, expect } from "chai";
+import * as sinon from "sinon";
 import { Id64 } from "@itwin/core-bentley";
 import { IModel, SubCategoryAppearance } from "@itwin/core-common";
-import { withEditTxn } from "../../EditTxn";
-import { ElementAspect, ElementMultiAspect, ElementUniqueAspect, ExternalSourceAspect, PhysicalElement, SnapshotDb, SpatialCategory, } from "../../core-backend";
+import { EditTxn, withEditTxn } from "../../EditTxn";
+import { ElementAspect, ElementMultiAspect, ElementUniqueAspect, ExternalSourceAspect, PhysicalElement, SnapshotDb, SpatialCategory, Subject, } from "../../core-backend";
 import { IModelTestUtils } from "../IModelTestUtils";
 describe("ElementAspect", () => {
     let iModel;
@@ -79,7 +80,7 @@ describe("ElementAspect", () => {
             assert.equal(aspectX.schemaName, aspect.schemaName);
             assert.equal(aspectX.className, aspect.className);
         });
-        assert.equal(JSON.stringify(uniqueAspects), `[{"classFullName":"DgnPlatformTest:TestUniqueAspect","id":"0x1","testUniqueAspectProperty":"Aspect2-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsUniqueAspect"}},
+        assert.equal(JSON.stringify(uniqueAspects), `[{"classFullName":"DgnPlatformTest:TestUniqueAspect","id":"0x1","testUniqueAspectProperty":"Aspect2-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsUniqueAspect"}},
     {"classFullName":"DgnPlatformTest:TestUniqueAspectNoHandler","id":"0x6","testUniqueAspectProperty":"Aspect1-Updated","length":1,"element":{"id":"0x17","relClassName":"BisCore.ElementOwnsUniqueAspect"}}]`.replace(/\s+/g, ""));
         const multiAspectsA = iModel.elements.getAspects(element.id, "DgnPlatformTest:TestMultiAspectNoHandler");
         assert.exists(multiAspectsA);
@@ -98,7 +99,7 @@ describe("ElementAspect", () => {
             assert.exists(aspectX.asAny.testMultiAspectProperty);
             assert.equal(aspectX.asAny.testMultiAspectProperty, aspect.asAny.testMultiAspectProperty);
         });
-        assert.equal(JSON.stringify(multiAspectsA), `[{"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
+        assert.equal(JSON.stringify(multiAspectsA), `[{"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
     {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x5","testMultiAspectProperty":"Aspect4-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}}]`.replace(/\s+/g, ""));
         // Test getAspects with dot separator
         const multiAspectsADotSeparator = iModel.elements.getAspects(element.id, "DgnPlatformTest.TestMultiAspectNoHandler");
@@ -118,7 +119,7 @@ describe("ElementAspect", () => {
             assert.exists(aspectX.asAny.testMultiAspectProperty);
             assert.equal(aspectX.asAny.testMultiAspectProperty, aspect.asAny.testMultiAspectProperty);
         });
-        assert.equal(JSON.stringify(multiAspectsADotSeparator), `[{"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
+        assert.equal(JSON.stringify(multiAspectsADotSeparator), `[{"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
     {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x5","testMultiAspectProperty":"Aspect4-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}}]`.replace(/\s+/g, ""));
         const multiAspectsB = iModel.elements.getAspects(element.id, "DgnPlatformTest:TestMultiAspect");
         assert.exists(multiAspectsB);
@@ -136,7 +137,7 @@ describe("ElementAspect", () => {
             assert.equal(aspectX.className, "TestMultiAspect");
             assert.exists(aspectX.asAny.testMultiAspectProperty);
         });
-        assert.equal(JSON.stringify(multiAspectsB), `[{"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x2","testMultiAspectProperty":"Aspect5-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}},
+        assert.equal(JSON.stringify(multiAspectsB), `[{"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x2","testMultiAspectProperty":"Aspect5-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}},
     {"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x3","testMultiAspectProperty":"Aspect6-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}}]`.replace(/\s+/g, ""));
         const multiAspects = iModel.elements.getAspects(element.id, ElementMultiAspect.classFullName);
         assert.equal(multiAspects.length, 4);
@@ -148,9 +149,9 @@ describe("ElementAspect", () => {
             assert.equal(aspectX.schemaName, aspect.schemaName);
             assert.equal(aspectX.className, aspect.className);
         });
-        assert.equal(JSON.stringify(multiAspects), `[{"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x2","testMultiAspectProperty":"Aspect5-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}},
-    {"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x3","testMultiAspectProperty":"Aspect6-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}},
-    {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
+        assert.equal(JSON.stringify(multiAspects), `[{"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x2","testMultiAspectProperty":"Aspect5-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}},
+    {"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x3","testMultiAspectProperty":"Aspect6-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}},
+    {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
     {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x5","testMultiAspectProperty":"Aspect4-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}}]`.replace(/\s+/g, ""));
         const rootSubject = iModel.elements.getRootSubject();
         assert.equal(0, iModel.elements.getAspects(rootSubject.id, "DgnPlatformTest:TestUniqueAspect").length, "Don't expect DgnPlatformTest:TestUniqueAspect aspects on the root Subject");
@@ -158,11 +159,11 @@ describe("ElementAspect", () => {
         assert.equal(0, iModel.elements.getAspects(rootSubject.id).length, "Don't expect any aspects on the root Subject");
         // The 'Element' property is introduced by ElementUniqueAspect and ElementMultiAspect, but is not available at the ElementAspect base class.
         // Since we're now using instance queries to query ElementUniqueAspect and ElementMultiAspect directly in getAspects(), we can provide ElementAspect to the function as well.
-        const aspectList = `[{"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x2","testMultiAspectProperty":"Aspect5-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}},
-    {"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x3","testMultiAspectProperty":"Aspect6-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}},
-    {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
-    {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x5","testMultiAspectProperty":"Aspect4-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
-    {"classFullName":"DgnPlatformTest:TestUniqueAspect","id":"0x1","testUniqueAspectProperty":"Aspect2-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsUniqueAspect"}},
+        const aspectList = `[{"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x2","testMultiAspectProperty":"Aspect5-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}},
+    {"classFullName":"DgnPlatformTest:TestMultiAspect","id":"0x3","testMultiAspectProperty":"Aspect6-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}},
+    {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
+    {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x5","testMultiAspectProperty":"Aspect4-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
+    {"classFullName":"DgnPlatformTest:TestUniqueAspect","id":"0x1","testUniqueAspectProperty":"Aspect2-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsUniqueAspect"}},
     {"classFullName":"DgnPlatformTest:TestUniqueAspectNoHandler","id":"0x6","testUniqueAspectProperty":"Aspect1-Updated","length":1,"element":{"id":"0x17","relClassName":"BisCore.ElementOwnsUniqueAspect"}}]`.replace(/\s+/g, "");
         const aspects = iModel.elements.getAspects(element.id, ElementAspect.classFullName);
         assert.equal(aspects.length, 6);
@@ -171,6 +172,157 @@ describe("ElementAspect", () => {
         assert.equal(allAspects.length, 6);
         assert.equal(JSON.stringify(allAspects), aspectList);
     });
+    it("should use the aspect owner indexes", async () => {
+        const getPlanDetails = async (filtered, grouped) => {
+            const createQueryReader = sinon.spy(iModel, "createQueryReader");
+            try {
+                for await (const _aspect of iModel.elements.queryAspects({
+                    elementIds: "0x17",
+                    aspectClassFullName: filtered ? ElementAspect.classFullName : undefined,
+                    groupByOwner: grouped,
+                })) { }
+            }
+            finally {
+                createQueryReader.restore();
+            }
+            assert.equal(createQueryReader.callCount, 1);
+            const query = String(createQueryReader.firstCall.args[0])
+                .replace("IdSet(:elementIds)", `IdSet('["0x17"]')`)
+                .replace(":aspectClassFullName", `'${ElementAspect.classFullName}'`);
+            const pragma = `PRAGMA explain_query('${query.replaceAll("'", "''")}')`;
+            return iModel.withQueryReader(pragma, (reader) => {
+                const details = [];
+                for (const row of reader)
+                    details.push(row.toRow().detail);
+                return details;
+            });
+        };
+        for (const filtered of [false, true]) {
+            for (const grouped of [false, true]) {
+                const plan = await getPlanDetails(filtered, grouped);
+                assert.isTrue(plan.some((detail) => /^SCAN (?:owners|IdSet) VIRTUAL TABLE INDEX/.test(detail)), plan.join("\n"));
+                for (const aspectClass of ["ElementMultiAspect", "ElementUniqueAspect"])
+                    assert.isTrue(plan.some((detail) => new RegExp(`^SEARCH main\\.bis_${aspectClass} USING .*INDEX .*_target \\(ElementId=\\?\\)$`).test(detail)), plan.join("\n"));
+                if (!grouped)
+                    assert.isFalse(plan.some((detail) => detail.startsWith("USE TEMP B-TREE FOR ORDER BY")), plan.join("\n"));
+            }
+        }
+    });
+    it("should query aspects for multiple elements", async () => {
+        const seedFileName = IModelTestUtils.resolveAssetFile("ElementAspectTest.bim");
+        const testFileName = IModelTestUtils.prepareOutputFile("ElementAspect", "QueryAspects.bim");
+        const testDb = IModelTestUtils.createSnapshotFromSeed(testFileName, seedFileName);
+        try {
+            const secondOwnerId = withEditTxn(testDb, (txn) => {
+                const ownerId = Subject.insert(txn, IModel.rootSubjectId, "Second aspect owner");
+                txn.insertAspect({
+                    classFullName: "DgnPlatformTest:TestUniqueAspectNoHandler",
+                    element: { id: ownerId },
+                    testUniqueAspectProperty: "Second owner unique aspect",
+                });
+                txn.insertAspect({
+                    classFullName: "DgnPlatformTest:TestMultiAspectNoHandler",
+                    element: { id: ownerId },
+                    testMultiAspectProperty: "Second owner multi-aspect",
+                });
+                return ownerId;
+            });
+            const collect = async (aspects) => {
+                const result = [];
+                for await (const aspect of aspects)
+                    result.push(aspect);
+                return result;
+            };
+            const allAspects = await collect(testDb.elements.queryAspects({
+                elementIds: [secondOwnerId, "0x17", secondOwnerId, IModel.rootSubjectId],
+                groupByOwner: true,
+                usePrimaryConn: true,
+            }));
+            assert.equal(allAspects.length, 8);
+            assert.deepEqual([...new Set(allAspects.map((aspect) => aspect.element.id))], ["0x17", secondOwnerId]);
+            const ownerRuns = allAspects.reduce((runs, aspect) => {
+                if (runs.at(-1) !== aspect.element.id)
+                    runs.push(aspect.element.id);
+                return runs;
+            }, []);
+            assert.deepEqual(ownerRuns, ["0x17", secondOwnerId]);
+            const firstOwnerAspects = allAspects.filter((aspect) => aspect.element.id === "0x17");
+            assert.equal(firstOwnerAspects.length, 6);
+            assert.equal(allAspects.filter((aspect) => aspect.element.id === secondOwnerId).length, 2);
+            assert.isTrue(allAspects.every((aspect) => aspect instanceof ElementAspect));
+            assert.equal(JSON.stringify(firstOwnerAspects), JSON.stringify(testDb.elements.getAspects("0x17")));
+            const multiAspects = await collect(testDb.elements.queryAspects({
+                elementIds: ["0x17", secondOwnerId],
+                aspectClassFullName: ElementMultiAspect.classFullName,
+            }));
+            assert.equal(multiAspects.length, 5);
+            assert.isTrue(multiAspects.every((aspect) => aspect instanceof ElementMultiAspect));
+            const uniqueAspects = await collect(testDb.elements.queryAspects({
+                elementIds: ["0x17", secondOwnerId],
+                aspectClassFullName: ElementUniqueAspect.classFullName,
+            }));
+            assert.equal(uniqueAspects.length, 3);
+            assert.isTrue(uniqueAspects.every((aspect) => aspect instanceof ElementUniqueAspect));
+            const noHandlerMultiAspects = await collect(testDb.elements.queryAspects({
+                elementIds: new Set(["0x17", secondOwnerId]),
+                aspectClassFullName: "DgnPlatformTest.TestMultiAspectNoHandler",
+            }));
+            assert.equal(noHandlerMultiAspects.length, 3);
+            assert.isTrue(noHandlerMultiAspects.every((aspect) => aspect.classFullName === "DgnPlatformTest:TestMultiAspectNoHandler"));
+            const withoutNoHandlerMultiAspects = await collect(testDb.elements.queryAspects({
+                elementIds: ["0x17", secondOwnerId],
+                excludedAspectClassFullNames: new Set(["DgnPlatformTest:TestMultiAspectNoHandler"]),
+            }));
+            assert.equal(withoutNoHandlerMultiAspects.length, 5);
+            assert.isFalse(withoutNoHandlerMultiAspects.some((aspect) => aspect.classFullName === "DgnPlatformTest:TestMultiAspectNoHandler"));
+            const withUnknownExclusion = await collect(testDb.elements.queryAspects({
+                elementIds: ["0x17", secondOwnerId],
+                excludedAspectClassFullNames: new Set(["UnknownSchema:UnknownAspect"]),
+            }));
+            assert.equal(withUnknownExclusion.length, 8);
+            const includedMultiWithoutNoHandler = await collect(testDb.elements.queryAspects({
+                elementIds: ["0x17", secondOwnerId],
+                aspectClassFullName: ElementMultiAspect.classFullName,
+                excludedAspectClassFullNames: new Set(["DgnPlatformTest:TestMultiAspectNoHandler"]),
+            }));
+            assert.equal(includedMultiWithoutNoHandler.length, 2);
+            assert.isTrue(includedMultiWithoutNoHandler.every((aspect) => aspect.classFullName === "DgnPlatformTest:TestMultiAspect"));
+            const withMultipleExclusions = await collect(testDb.elements.queryAspects({
+                elementIds: ["0x17", secondOwnerId],
+                excludedAspectClassFullNames: new Set([
+                    "DgnPlatformTest:TestMultiAspectNoHandler",
+                    "DgnPlatformTest:TestUniqueAspectNoHandler",
+                    "UnknownSchema:UnknownAspect",
+                ]),
+            }));
+            assert.equal(withMultipleExclusions.length, 3);
+            assert.isFalse(withMultipleExclusions.some((aspect) => aspect.classFullName.endsWith("NoHandler")));
+            const noAspects = await collect(testDb.elements.queryAspects({ elementIds: [] }));
+            assert.deepEqual(noAspects, []);
+            const unsavedEditTxn = new EditTxn(testDb, "query unsaved aspect");
+            unsavedEditTxn.start();
+            try {
+                const unsavedAspectId = unsavedEditTxn.insertAspect({
+                    classFullName: "DgnPlatformTest:TestMultiAspectNoHandler",
+                    element: { id: secondOwnerId },
+                    testMultiAspectProperty: "Unsaved multi-aspect",
+                });
+                const primaryConnectionAspects = await collect(testDb.elements.queryAspects({
+                    elementIds: secondOwnerId,
+                    usePrimaryConn: true,
+                }));
+                assert.isTrue(primaryConnectionAspects.some((aspect) => aspect.id === unsavedAspectId));
+                const concurrentQueryAspects = await collect(testDb.elements.queryAspects({ elementIds: secondOwnerId }));
+                assert.isFalse(concurrentQueryAspects.some((aspect) => aspect.id === unsavedAspectId));
+            }
+            finally {
+                unsavedEditTxn.end("abandon");
+            }
+        }
+        finally {
+            testDb.close();
+        }
+    });
     it("should be able to insert, update, and delete MultiAspects", () => {
         const element = iModel.elements.getElement("0x17");
         assert.exists(element);
@@ -183,8 +335,8 @@ describe("ElementAspect", () => {
         withEditTxn(iModel, (txn) => txn.insertAspect(aspectProps));
         let aspects = iModel.elements.getAspects(element.id, aspectProps.classFullName);
         assert.isAtLeast(aspects.length, 1);
-        assert.equal(JSON.stringify(aspects), `[{"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
-    {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x5","testMultiAspectProperty":"Aspect4-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
+        assert.equal(JSON.stringify(aspects), `[{"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
+    {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x5","testMultiAspectProperty":"Aspect4-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
     {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x21","testMultiAspectProperty":"MultiAspectInsertTest1","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}}]`.replace(/\s+/g, ""));
         const numAspects = aspects.length;
         let found = false;
@@ -203,14 +355,14 @@ describe("ElementAspect", () => {
         assert.equal(aspectsUpdated.length, aspects.length);
         assert.equal(aspectsUpdated[foundIndex].asAny.testMultiAspectProperty, "MultiAspectInsertTest1-Updated");
         // Check if aspect was updated
-        assert.equal(JSON.stringify(aspectsUpdated), `[{"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
-    {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x5","testMultiAspectProperty":"Aspect4-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
+        assert.equal(JSON.stringify(aspectsUpdated), `[{"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
+    {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x5","testMultiAspectProperty":"Aspect4-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
     {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x21","testMultiAspectProperty":"MultiAspectInsertTest1-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsMultiAspects"}}]`.replace(/\s+/g, ""));
         withEditTxn(iModel, (txn) => txn.deleteAspect(aspects[foundIndex].id));
         aspects = iModel.elements.getAspects(element.id, aspectProps.classFullName);
         assert.equal(numAspects, aspects.length + 1);
         // Check if aspect was deleted
-        assert.equal(JSON.stringify(aspects), `[{"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
+        assert.equal(JSON.stringify(aspects), `[{"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x4","testMultiAspectProperty":"Aspect3-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}},
     {"classFullName":"DgnPlatformTest:TestMultiAspectNoHandler","id":"0x5","testMultiAspectProperty":"Aspect4-Updated","element":{"id":"0x17","relClassName":"DgnPlatformTest.TestElement"}}]`.replace(/\s+/g, ""));
     });
     it("should be able to insert, update, and delete UniqueAspects", () => {
@@ -337,17 +489,17 @@ describe("ElementAspect", () => {
         e1Aspects.forEach((x) => {
             assert.isTrue(findInProps(x, e1AspectProps));
         });
-        assert.equal(JSON.stringify(e1Aspects), `[{"classFullName":"BisCore:ExternalSourceAspect","id":"0x21","scope":{"id":"0x1","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"A","kind":"Letter","element":{"id":"0x11","relClassName":"BisCore.ElementOwnsMultiAspects"}},
-    {"classFullName":"BisCore:ExternalSourceAspect","id":"0x22","scope":{"id":"0x1","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"A","kind":"Letter","element":{"id":"0x11","relClassName":"BisCore.ElementOwnsMultiAspects"}},
-    {"classFullName":"BisCore:ExternalSourceAspect","id":"0x23","scope":{"id":"0x11","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"A","kind":"Letter","element":{"id":"0x11","relClassName":"BisCore.ElementOwnsMultiAspects"}},
-    {"classFullName":"BisCore:ExternalSourceAspect","id":"0x24","scope":{"id":"0x1","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"B","kind":"Letter","element":{"id":"0x11","relClassName":"BisCore.ElementOwnsMultiAspects"}},
+        assert.equal(JSON.stringify(e1Aspects), `[{"classFullName":"BisCore:ExternalSourceAspect","id":"0x21","scope":{"id":"0x1","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"A","kind":"Letter","element":{"id":"0x11","relClassName":"BisCore.ElementOwnsMultiAspects"}},
+    {"classFullName":"BisCore:ExternalSourceAspect","id":"0x22","scope":{"id":"0x1","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"A","kind":"Letter","element":{"id":"0x11","relClassName":"BisCore.ElementOwnsMultiAspects"}},
+    {"classFullName":"BisCore:ExternalSourceAspect","id":"0x23","scope":{"id":"0x11","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"A","kind":"Letter","element":{"id":"0x11","relClassName":"BisCore.ElementOwnsMultiAspects"}},
+    {"classFullName":"BisCore:ExternalSourceAspect","id":"0x24","scope":{"id":"0x1","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"B","kind":"Letter","element":{"id":"0x11","relClassName":"BisCore.ElementOwnsMultiAspects"}},
     {"classFullName":"BisCore:ExternalSourceAspect","id":"0x25","scope":{"id":"0x1","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"C","kind":"Kind2","element":{"id":"0x11","relClassName":"BisCore.ElementOwnsMultiAspects"}}]`.replace(/\s+/g, ""));
         const e2Aspects = iModelDb.elements.getAspects(e2, ExternalSourceAspect.classFullName);
         assert.equal(e2Aspects.length, e2AspectProps.length);
         e2Aspects.forEach((x) => {
             assert.isTrue(findInProps(x, e2AspectProps));
         });
-        assert.equal(JSON.stringify(e2Aspects), `[{"classFullName":"BisCore:ExternalSourceAspect","id":"0x26","scope":{"id":"0x1","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"A","kind":"Letter","element":{"id":"0x13","relClassName":"BisCore.ElementOwnsMultiAspects"}},
+        assert.equal(JSON.stringify(e2Aspects), `[{"classFullName":"BisCore:ExternalSourceAspect","id":"0x26","scope":{"id":"0x1","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"A","kind":"Letter","element":{"id":"0x13","relClassName":"BisCore.ElementOwnsMultiAspects"}},
     {"classFullName":"BisCore:ExternalSourceAspect","id":"0x27","scope":{"id":"0x1","relClassName":"BisCore.ElementScopesExternalSourceIdentifier"},"identifier":"C","kind":"Letter","element":{"id":"0x13","relClassName":"BisCore.ElementOwnsMultiAspects"}}]`.replace(/\s+/g, ""));
         const allA = ExternalSourceAspect.findAllBySource(iModelDb, scopeId1, kind, "A");
         assert.equal(allA.filter((x) => x.elementId === e1).length, 2, "there are two A's in scope 1 on e1");