@itwin/core-backend 5.8.2 → 5.9.0-dev.10

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

@@ -5,6 +5,7 @@
 import { assert, expect } from "chai";
 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 { IModelTestUtils } from "../IModelTestUtils";
 describe("ElementAspect", () => {
@@ -78,7 +79,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);
@@ -97,7 +98,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");
@@ -117,7 +118,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);
@@ -135,7 +136,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);
@@ -147,9 +148,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");
@@ -157,11 +158,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);
@@ -179,11 +180,11 @@ describe("ElementAspect", () => {
             element: { id: element.id },
             testMultiAspectProperty: "MultiAspectInsertTest1",
         };
-        iModel.elements.insertAspect(aspectProps);
+        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;
@@ -197,19 +198,19 @@ describe("ElementAspect", () => {
         }
         assert.isTrue(found);
         aspects[foundIndex].asAny.testMultiAspectProperty = "MultiAspectInsertTest1-Updated";
-        iModel.elements.updateAspect(aspects[foundIndex].toJSON());
+        withEditTxn(iModel, (txn) => txn.updateAspect(aspects[foundIndex].toJSON()));
         const aspectsUpdated = iModel.elements.getAspects(element.id, aspectProps.classFullName);
         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, ""));
-        iModel.elements.deleteAspect(aspects[foundIndex].id);
+        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", () => {
@@ -221,18 +222,18 @@ describe("ElementAspect", () => {
             element: { id: element.id },
             testUniqueAspectProperty: "UniqueAspectInsertTest1",
         };
-        iModel.elements.insertAspect(aspectProps);
+        withEditTxn(iModel, (txn) => txn.insertAspect(aspectProps));
         const aspects = iModel.elements.getAspects(element.id, aspectProps.classFullName);
         assert.isTrue(aspects.length === 1);
         assert.equal(aspects[0].asAny.testUniqueAspectProperty, aspectProps.testUniqueAspectProperty);
         assert.equal(JSON.stringify(aspects), `[{"classFullName":"DgnPlatformTest:TestUniqueAspectNoHandler","id":"0x6","testUniqueAspectProperty":"UniqueAspectInsertTest1","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsUniqueAspect"}}]`);
         aspects[0].asAny.testUniqueAspectProperty = "UniqueAspectInsertTest1-Updated";
-        iModel.elements.updateAspect(aspects[0].toJSON());
+        withEditTxn(iModel, (txn) => txn.updateAspect(aspects[0].toJSON()));
         const aspectsUpdated = iModel.elements.getAspects(element.id, aspectProps.classFullName);
         assert.equal(aspectsUpdated.length, 1);
         assert.equal(aspectsUpdated[0].asAny.testUniqueAspectProperty, "UniqueAspectInsertTest1-Updated");
         assert.equal(JSON.stringify(aspectsUpdated), `[{"classFullName":"DgnPlatformTest:TestUniqueAspectNoHandler","id":"0x6","testUniqueAspectProperty":"UniqueAspectInsertTest1-Updated","element":{"id":"0x17","relClassName":"BisCore.ElementOwnsUniqueAspect"}}]`);
-        iModel.elements.deleteAspect(aspects[0].id);
+        withEditTxn(iModel, (txn) => txn.deleteAspect(aspects[0].id));
         try {
             const noAspects = iModel.elements.getAspects(element.id, aspectProps.classFullName);
             assert.equal(noAspects.length, 0);
@@ -245,22 +246,25 @@ describe("ElementAspect", () => {
     it("should be able to insert ExternalSourceAspects", () => {
         const fileName = IModelTestUtils.prepareOutputFile("ElementAspect", "ExternalSourceAspect.bim");
         let iModelDb = SnapshotDb.createEmpty(fileName, { rootSubject: { name: "ExternalSourceAspect" } });
-        const elementId = SpatialCategory.insert(iModelDb, IModel.dictionaryId, "Category", new SubCategoryAppearance());
-        assert.isTrue(Id64.isValidId64(elementId));
-        const aspectProps = {
-            classFullName: ExternalSourceAspect.classFullName,
-            element: { id: elementId },
-            scope: { id: IModel.rootSubjectId },
-            identifier: "A",
-            kind: "Letter",
-            checksum: "1",
-            version: "1.0",
-        };
-        const aspect = new ExternalSourceAspect(aspectProps, iModelDb);
-        expect(aspect).to.deep.subsetEqual(aspectProps, { normalizeClassNameProps: true });
-        iModelDb.elements.insertAspect(aspectProps);
-        const aspectJson = aspect.toJSON();
-        iModelDb.saveChanges();
+        let elementId;
+        let aspectProps;
+        const aspectJson = withEditTxn(iModelDb, (txn) => {
+            elementId = SpatialCategory.insert(txn, IModel.dictionaryId, "Category", new SubCategoryAppearance());
+            assert.isTrue(Id64.isValidId64(elementId));
+            aspectProps = {
+                classFullName: ExternalSourceAspect.classFullName,
+                element: { id: elementId },
+                scope: { id: IModel.rootSubjectId },
+                identifier: "A",
+                kind: "Letter",
+                checksum: "1",
+                version: "1.0",
+            };
+            const aspect = new ExternalSourceAspect(aspectProps, iModelDb);
+            expect(aspect).to.deep.subsetEqual(aspectProps, { normalizeClassNameProps: true });
+            txn.insertAspect(aspectProps);
+            return aspect.toJSON();
+        });
         iModelDb.close();
         iModelDb = SnapshotDb.openFile(fileName);
         const aspects = iModelDb.elements.getAspects(elementId, aspectProps.classFullName);
@@ -273,43 +277,47 @@ describe("ElementAspect", () => {
         assert.equal(foundAspects.length, 1);
         const foundAspect = foundAspects[0];
         assert.equal(foundAspect.aspectId, aspects[0].id);
-        assert.equal(foundAspect.elementId, aspect.element.id);
+        assert.equal(foundAspect.elementId, aspectProps.element.id);
     });
     it("should be able to insert multiple ExternalSourceAspects", () => {
         const fileName = IModelTestUtils.prepareOutputFile("MultipleElementAspects", "ExternalSourceAspect.bim");
         let iModelDb = SnapshotDb.createEmpty(fileName, { rootSubject: { name: "MultipleExternalSourceAspects" } });
-        const e1 = SpatialCategory.insert(iModelDb, IModel.dictionaryId, "Category1", new SubCategoryAppearance());
-        const e2 = SpatialCategory.insert(iModelDb, IModel.dictionaryId, "Category2", new SubCategoryAppearance());
+        let e1;
+        let e2;
         const scopeId1 = IModel.rootSubjectId;
-        const scopeId2 = e1;
         const kind = "Letter";
         const kind2 = "Kind2";
-        const aspectProps = {
-            classFullName: ExternalSourceAspect.classFullName,
-            element: { id: "" },
-            scope: { id: "" },
-            identifier: "",
-            kind,
-        };
-        const a = { ...aspectProps, identifier: "A", scope: { id: scopeId1 } };
-        const a2 = { ...aspectProps, identifier: "A", scope: { id: scopeId2 } };
-        const b = { ...aspectProps, identifier: "B", scope: { id: scopeId1 } };
-        const c = { ...aspectProps, identifier: "C", scope: { id: scopeId1 } };
-        const ck2 = { ...aspectProps, identifier: "C", scope: { id: scopeId1 }, kind: kind2 };
-        const e1AspectProps = [
-            { ...a, element: { id: e1 } },
-            { ...a, element: { id: e1 } }, // add a second aspect "A" in scope1
-            { ...a2, element: { id: e1 } }, // add "A" in scope2
-            { ...b, element: { id: e1 } },
-            { ...ck2, element: { id: e1 } },
-        ];
-        const e2AspectProps = [
-            { ...a, element: { id: e2 } }, // element2 also has an "A" in scope1
-            { ...c, element: { id: e2 } },
-        ];
-        e1AspectProps.forEach((aspect) => iModelDb.elements.insertAspect(aspect));
-        e2AspectProps.forEach((aspect) => iModelDb.elements.insertAspect(aspect));
-        iModelDb.saveChanges();
+        const { e1AspectProps, e2AspectProps } = withEditTxn(iModelDb, (txn) => {
+            e1 = SpatialCategory.insert(txn, IModel.dictionaryId, "Category1", new SubCategoryAppearance());
+            e2 = SpatialCategory.insert(txn, IModel.dictionaryId, "Category2", new SubCategoryAppearance());
+            const scopeId2 = e1;
+            const aspectProps = {
+                classFullName: ExternalSourceAspect.classFullName,
+                element: { id: "" },
+                scope: { id: "" },
+                identifier: "",
+                kind,
+            };
+            const a = { ...aspectProps, identifier: "A", scope: { id: scopeId1 } };
+            const a2 = { ...aspectProps, identifier: "A", scope: { id: scopeId2 } };
+            const b = { ...aspectProps, identifier: "B", scope: { id: scopeId1 } };
+            const c = { ...aspectProps, identifier: "C", scope: { id: scopeId1 } };
+            const ck2 = { ...aspectProps, identifier: "C", scope: { id: scopeId1 }, kind: kind2 };
+            const e1Props = [
+                { ...a, element: { id: e1 } },
+                { ...a, element: { id: e1 } }, // add a second aspect "A" in scope1
+                { ...a2, element: { id: e1 } }, // add "A" in scope2
+                { ...b, element: { id: e1 } },
+                { ...ck2, element: { id: e1 } },
+            ];
+            const e2Props = [
+                { ...a, element: { id: e2 } }, // element2 also has an "A" in scope1
+                { ...c, element: { id: e2 } },
+            ];
+            e1Props.forEach((aspect) => txn.insertAspect(aspect));
+            e2Props.forEach((aspect) => txn.insertAspect(aspect));
+            return { e1AspectProps: e1Props, e2AspectProps: e2Props };
+        });
         iModelDb.close();
         iModelDb = SnapshotDb.openFile(fileName);
         const equalProps = (aspect, wantProps) => {
@@ -324,28 +332,28 @@ describe("ElementAspect", () => {
         const findInProps = (have, wantArray) => {
             return wantArray.find((want) => equalProps(have, want)) !== undefined;
         };
-        const e1Aspects = iModelDb.elements.getAspects(e1, aspectProps.classFullName);
+        const e1Aspects = iModelDb.elements.getAspects(e1, ExternalSourceAspect.classFullName);
         assert.equal(e1Aspects.length, e1AspectProps.length);
         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, aspectProps.classFullName);
+        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");
         assert.equal(allA.filter((x) => x.elementId === e2).length, 1, "there is one A in scope 1 on e2");
         assert.equal(allA.length, 3);
-        const allA2 = ExternalSourceAspect.findAllBySource(iModelDb, scopeId2, kind, "A");
+        const allA2 = ExternalSourceAspect.findAllBySource(iModelDb, e1, kind, "A");
         assert.equal(allA2.length, 1);
         assert.equal(allA2[0].elementId, e1, "there is one A in scope 2 on e1");
         const allB = ExternalSourceAspect.findAllBySource(iModelDb, scopeId1, kind, "B");
@@ -364,13 +372,13 @@ describe("ElementAspect", () => {
         const testChannelKey = "test-channel";
         // Enable the test channel
         iModelDb.channels.addAllowedChannel(testChannelKey);
-        // Create a channel subject using insertChannelSubject
-        const subjectId = iModelDb.channels.insertChannelSubject({
+        // Create a channel subject using insertChannelSubject with explicit txn
+        const subjectId = withEditTxn(iModelDb, (txn) => iModelDb.channels.insertChannelSubject({
             subjectName: "Test Channel Subject",
             channelKey: testChannelKey,
-        });
-        iModelDb.saveChanges();
-        assert.isTrue(Id64.isValidId64(subjectId), "Subject ID should be valid");
+            txn,
+        }));
+        assert.isTrue(Id64.isValidId64(subjectId), "Subject Id should be valid");
         // Get the ChannelRootAspect
         const aspects = iModelDb.elements.getAspects(subjectId, "BisCore:ChannelRootAspect");
         assert.equal(aspects.length, 1, "Should be exactly one as it's a unique aspect");