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

package/lib/esm/test/standalone/IModelWrite.test.js

@@ -3,6 +3,7 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 import { DbResult, Id64 } from "@itwin/core-bentley";
+import { EditTxn, withEditTxn } from "../../EditTxn";
 import { Code, ColorDef, IModel, IModelVersion, LockState, QueryRowFormat, SchemaState, SubCategoryAppearance, } from "@itwin/core-common";
 import { Arc3d, IModelJson, Point2d, Point3d } from "@itwin/core-geometry";
 import * as chai from "chai";
@@ -17,15 +18,16 @@ import { HubMock } from "../../internal/HubMock";
 import { _nativeDb, BriefcaseDb, BriefcaseManager, ChannelControl, CodeService, DefinitionModel, DocumentListModel, Drawing, DrawingGraphic, SpatialCategory, Subject, } from "../../core-backend";
 import { IModelTestUtils, TestUserType } from "../IModelTestUtils";
 chai.use(chaiAsPromised);
-export async function createNewModelAndCategory(rwIModel, parent) {
+export async function createNewModelAndCategory(txn, parent) {
+    const rwIModel = txn.iModel;
     // Create a new physical model.
-    const [, modelId] = await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(rwIModel, IModelTestUtils.getUniqueModelCode(rwIModel, "newPhysicalModel"), true, parent);
+    const [, modelId] = await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(txn, IModelTestUtils.getUniqueModelCode(rwIModel, "newPhysicalModel"), true, parent);
     // Find or create a SpatialCategory.
     const dictionary = rwIModel.models.getModel(IModel.dictionaryId);
     const newCategoryCode = IModelTestUtils.getUniqueSpatialCategoryCode(dictionary, "ThisTestSpatialCategory");
     const category = SpatialCategory.create(rwIModel, IModel.dictionaryId, newCategoryCode.value);
-    const spatialCategoryId = rwIModel.elements.insertElement(category.toJSON());
-    category.setDefaultAppearance(new SubCategoryAppearance({ color: 0xff0000 }));
+    const spatialCategoryId = txn.insertElement(category.toJSON());
+    category.setDefaultAppearance(txn, new SubCategoryAppearance({ color: 0xff0000 }));
     // const spatialCategoryId: Id64String = SpatialCategory.insert(rwIModel, IModel.dictionaryId, newCategoryCode.value!, new SubCategoryAppearance({ color: 0xff0000 }));
     return { modelId, spatialCategoryId };
 }
@@ -33,9 +35,11 @@ describe("IModelWriteTest", () => {
     let managerAccessToken;
     let superAccessToken;
     let iTwinId;
-    before(() => {
+    before(async () => {
         HubMock.startup("IModelWriteTest", KnownTestLocations.outputDir);
         iTwinId = HubMock.iTwinId;
+        managerAccessToken = await HubWrappers.getAccessToken(TestUserType.Manager);
+        superAccessToken = await HubWrappers.getAccessToken(TestUserType.SuperManager);
     });
     after(() => HubMock.shutdown());
     it("Check busyTimeout option", async () => {
@@ -60,14 +64,16 @@ describe("IModelWriteTest", () => {
         };
         const seconds = (s) => s * 1000;
         const db = await BriefcaseDb.open({ fileName: briefcaseProps.fileName });
-        db.saveChanges();
+        const dbTxn = new EditTxn(db, "imodel write");
+        dbTxn.start();
+        dbTxn.saveChanges();
         // lock db so another connection cannot write to it.
-        db.saveFileProperty({ name: "test", namespace: "test" }, "");
+        dbTxn.saveFileProperty({ name: "test", namespace: "test" }, "");
         assert.isAtMost(await tryOpen({ fileName: briefcaseProps.fileName, busyTimeout: seconds(0) }), seconds(1), "open should fail with busy error instantly");
         assert.isAtLeast(await tryOpen({ fileName: briefcaseProps.fileName, busyTimeout: seconds(1) }), seconds(1), "open should fail with atleast 1 sec delay due to retry");
         assert.isAtLeast(await tryOpen({ fileName: briefcaseProps.fileName, busyTimeout: seconds(2) }), seconds(2), "open should fail with atleast 2 sec delay due to retry");
         assert.isAtLeast(await tryOpen({ fileName: briefcaseProps.fileName, busyTimeout: seconds(3) }), seconds(3), "open should fail with atleast 3 sec delay due to retry");
-        db.abandonChanges();
+        dbTxn.end("abandon");
         db.close();
     });
     it("WatchForChanges", async () => {
@@ -87,26 +93,34 @@ describe("IModelWriteTest", () => {
             return fsWatcher;
         };
         const watchStubResult = sinon.stub(fs, "watch").callsFake(watchStub);
-        const bc = await BriefcaseDb.open({ fileName: briefcaseProps.fileName });
-        bc.channels.addAllowedChannel(ChannelControl.sharedChannelName);
-        const roBC = await BriefcaseDb.open({ fileName: briefcaseProps.fileName, watchForChanges: true });
-        const code1 = IModelTestUtils.getUniqueModelCode(bc, "newPhysicalModel1");
-        await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(bc, code1, true);
-        bc.saveChanges();
-        // immediately after save changes the current txnId in the writeable briefcase changes, but it isn't reflected
-        // in the readonly briefcase until the file watcher fires.
-        expect(bc[_nativeDb].getCurrentTxnId()).not.equal(roBC[_nativeDb].getCurrentTxnId());
-        // trigger watcher via stub
-        fsWatcher.callback();
-        // now they should match because restartDefaultTxn in the readonly briefcase reads the changes from the writeable connection
-        expect(bc[_nativeDb].getCurrentTxnId()).equal(roBC[_nativeDb].getCurrentTxnId());
-        roBC.close();
+        let bc;
+        let roBC;
+        try {
+            bc = await BriefcaseDb.open({ fileName: briefcaseProps.fileName });
+            bc.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+            roBC = await BriefcaseDb.open({ fileName: briefcaseProps.fileName, watchForChanges: true });
+            const bcTxn = new EditTxn(bc, "imodel write");
+            bcTxn.start();
+            const code1 = IModelTestUtils.getUniqueModelCode(bc, "newPhysicalModel1");
+            await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(bcTxn, code1, true);
+            bcTxn.end();
+            // immediately after save changes the current txnId in the writeable briefcase changes, but it isn't reflected
+            // in the readonly briefcase until the file watcher fires.
+            expect(bc[_nativeDb].getCurrentTxnId()).not.equal(roBC[_nativeDb].getCurrentTxnId());
+            // trigger watcher via stub
+            fsWatcher.callback();
+            // now they should match because restartDefaultTxn in the readonly briefcase reads the changes from the writeable connection
+            expect(bc[_nativeDb].getCurrentTxnId()).equal(roBC[_nativeDb].getCurrentTxnId());
+        }
+        finally {
+            roBC?.close();
+            bc?.close();
+            // NOTE: Since HubMock.startup() is called in the before() block and not beforeEach(), we CANNOT
+            // call sinon.restore() here. This is because sinon.restore() will restore the stubs for
+            // CloudSqlite that HubMock.startup() put in place.
+            watchStubResult.restore();
+        }
         expect(nClosed).equal(1);
-        bc.close();
-        // NOTE: Since HubMock.startup() is called in the before() block and not beforeEach(), we CANNOT
-        // call sinon.restore() here. This is because sinon.restore() will restore the stubs for
-        // CloudSqlite that HubMock.startup() put in place.
-        watchStubResult.restore();
     });
     function expectEqualChangesets(a, b) {
         expect(a.id).to.equal(b.id);
@@ -130,42 +144,49 @@ describe("IModelWriteTest", () => {
             return fsWatcher;
         };
         const watchStubResult = sinon.stub(fs, "watch").callsFake(watchStub);
-        const bc = await BriefcaseDb.open({ fileName: briefcaseProps.fileName });
-        bc.channels.addAllowedChannel(ChannelControl.sharedChannelName);
-        const roBC = await BriefcaseDb.open({ fileName: briefcaseProps.fileName, watchForChanges: true });
-        const code1 = IModelTestUtils.getUniqueModelCode(bc, "newPhysicalModel1");
-        await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(bc, code1, true);
-        bc.saveChanges();
-        // immediately after save changes the current txnId in the writeable briefcase changes, but it isn't reflected
-        // in the readonly briefcase until the file watcher fires.
-        expect(bc[_nativeDb].getCurrentTxnId()).not.equal(roBC[_nativeDb].getCurrentTxnId());
-        // trigger watcher via stub
-        fsWatcher.callback();
-        // now they should match because restartDefaultTxn in the readonly briefcase reads the changes from the writeable connection
-        expect(bc[_nativeDb].getCurrentTxnId()).equal(roBC[_nativeDb].getCurrentTxnId());
-        // Push the changes to the hub
-        const prePushChangeset = bc.changeset;
-        let eventRaised = false;
-        roBC.onChangesetChanged.addOnce((prevCS) => {
-            expectEqualChangesets(prevCS, prePushChangeset);
-            eventRaised = true;
-        });
-        await bc.pushChanges({ accessToken: adminAccessToken, description: "test" });
-        const postPushChangeset = bc.changeset;
-        assert(!!postPushChangeset);
-        expect(prePushChangeset !== postPushChangeset, "changes should be pushed");
-        // trigger watcher via stub
-        fsWatcher.callback();
-        expectEqualChangesets(roBC.changeset, postPushChangeset);
-        expect(roBC[_nativeDb].getCurrentTxnId(), "txn should be updated").equal(bc[_nativeDb].getCurrentTxnId());
-        expect(eventRaised).to.be.true;
-        roBC.close();
+        let bc;
+        let roBC;
+        try {
+            bc = await BriefcaseDb.open({ fileName: briefcaseProps.fileName });
+            bc.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+            roBC = await BriefcaseDb.open({ fileName: briefcaseProps.fileName, watchForChanges: true });
+            const bcTxn = new EditTxn(bc, "imodel write");
+            bcTxn.start();
+            const code1 = IModelTestUtils.getUniqueModelCode(bc, "newPhysicalModel1");
+            await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(bcTxn, code1, true);
+            bcTxn.end();
+            // immediately after save changes the current txnId in the writeable briefcase changes, but it isn't reflected
+            // in the readonly briefcase until the file watcher fires.
+            expect(bc[_nativeDb].getCurrentTxnId()).not.equal(roBC[_nativeDb].getCurrentTxnId());
+            // trigger watcher via stub
+            fsWatcher.callback();
+            // now they should match because restartDefaultTxn in the readonly briefcase reads the changes from the writeable connection
+            expect(bc[_nativeDb].getCurrentTxnId()).equal(roBC[_nativeDb].getCurrentTxnId());
+            const prePushChangeset = bc.changeset;
+            let eventRaised = false;
+            roBC.onChangesetChanged.addOnce((prevCS) => {
+                expectEqualChangesets(prevCS, prePushChangeset);
+                eventRaised = true;
+            });
+            await bc.pushChanges({ accessToken: adminAccessToken, description: "test" });
+            const postPushChangeset = bc.changeset;
+            assert(!!postPushChangeset);
+            expect(prePushChangeset !== postPushChangeset, "changes should be pushed");
+            // trigger watcher via stub
+            fsWatcher.callback();
+            expectEqualChangesets(roBC.changeset, postPushChangeset);
+            expect(roBC[_nativeDb].getCurrentTxnId(), "txn should be updated").equal(bc[_nativeDb].getCurrentTxnId());
+            expect(eventRaised).to.be.true;
+        }
+        finally {
+            roBC?.close();
+            bc?.close();
+            // NOTE: Since HubMock.startup() is called in the before() block and not beforeEach(), we CANNOT
+            // call sinon.restore() here. This is because sinon.restore() will restore the stubs for
+            // CloudSqlite that HubMock.startup() put in place.
+            watchStubResult.restore();
+        }
         expect(nClosed).equal(1);
-        bc.close();
-        // NOTE: Since HubMock.startup() is called in the before() block and not beforeEach(), we CANNOT
-        // call sinon.restore() here. This is because sinon.restore() will restore the stubs for
-        // CloudSqlite that HubMock.startup() put in place.
-        watchStubResult.restore();
     });
     it("WatchForChanges - pull", async () => {
         const adminAccessToken = await HubWrappers.getAccessToken(TestUserType.SuperManager);
@@ -176,19 +197,6 @@ describe("IModelWriteTest", () => {
         const args = { iTwinId, iModelId };
         const initialDb = await BriefcaseManager.downloadBriefcase({ accessToken: adminAccessToken, ...args });
         const briefcaseProps = await BriefcaseManager.downloadBriefcase({ accessToken: adminAccessToken, ...args });
-        // Push some changes - prep for pull workflow.
-        const bc1 = await BriefcaseDb.open({ fileName: initialDb.fileName });
-        bc1.channels.addAllowedChannel(ChannelControl.sharedChannelName);
-        const code2 = IModelTestUtils.getUniqueModelCode(bc1, "newPhysicalModel2");
-        await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(bc1, code2, true);
-        const prePushChangeset = bc1.changeset;
-        bc1.saveChanges();
-        await bc1.pushChanges({ accessToken: adminAccessToken, description: "test" });
-        const postPushChangeset = bc1.changeset;
-        assert(!!prePushChangeset);
-        expect(prePushChangeset !== postPushChangeset, "changes should be pushed");
-        bc1.close();
-        // Writer that pulls + watcher.
         let nClosed = 0;
         const fsWatcher = {
             callback: () => { },
@@ -198,32 +206,53 @@ describe("IModelWriteTest", () => {
             fsWatcher.callback = fn;
             return fsWatcher;
         };
+        // Push some changes - prep for pull workflow.
+        let bc1;
+        let bc;
+        let roBC;
         const watchStubResult = sinon.stub(fs, "watch").callsFake(watchStub);
-        const bc = await BriefcaseDb.open({ fileName: briefcaseProps.fileName });
-        bc.channels.addAllowedChannel(ChannelControl.sharedChannelName);
-        const roBC = await BriefcaseDb.open({ fileName: briefcaseProps.fileName, watchForChanges: true });
-        const prePullChangeset = bc.changeset;
-        let eventRaised = false;
-        roBC.onChangesetChanged.addOnce((prevCS) => {
-            expectEqualChangesets(prevCS, prePushChangeset);
-            eventRaised = true;
-        });
-        await bc.pullChanges();
-        const postPullChangeset = bc.changeset;
-        assert(!!postPullChangeset);
-        expect(prePullChangeset !== postPullChangeset, "changes should be pulled");
-        // trigger watcher via stub
-        fsWatcher.callback();
-        expectEqualChangesets(roBC.changeset, postPullChangeset);
-        expect(roBC[_nativeDb].getCurrentTxnId(), "txn should be updated").equal(bc[_nativeDb].getCurrentTxnId());
-        expect(eventRaised).to.be.true;
-        roBC.close();
+        try {
+            bc1 = await BriefcaseDb.open({ fileName: initialDb.fileName });
+            bc1.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+            const bc1Txn = new EditTxn(bc1, "imodel write");
+            bc1Txn.start();
+            const code2 = IModelTestUtils.getUniqueModelCode(bc1, "newPhysicalModel2");
+            await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(bc1Txn, code2, true);
+            const prePushChangeset = bc1.changeset;
+            bc1Txn.end();
+            await bc1.pushChanges({ accessToken: adminAccessToken, description: "test" });
+            const postPushChangeset = bc1.changeset;
+            assert(!!prePushChangeset);
+            expect(prePushChangeset !== postPushChangeset, "changes should be pushed");
+            bc = await BriefcaseDb.open({ fileName: briefcaseProps.fileName });
+            bc.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+            roBC = await BriefcaseDb.open({ fileName: briefcaseProps.fileName, watchForChanges: true });
+            const prePullChangeset = bc.changeset;
+            let eventRaised = false;
+            roBC.onChangesetChanged.addOnce((prevCS) => {
+                expectEqualChangesets(prevCS, prePushChangeset);
+                eventRaised = true;
+            });
+            await bc.pullChanges();
+            const postPullChangeset = bc.changeset;
+            assert(!!postPullChangeset);
+            expect(prePullChangeset !== postPullChangeset, "changes should be pulled");
+            // trigger watcher via stub
+            fsWatcher.callback();
+            expectEqualChangesets(roBC.changeset, postPullChangeset);
+            expect(roBC[_nativeDb].getCurrentTxnId(), "txn should be updated").equal(bc[_nativeDb].getCurrentTxnId());
+            expect(eventRaised).to.be.true;
+        }
+        finally {
+            roBC?.close();
+            bc?.close();
+            bc1?.close();
+            // NOTE: Since HubMock.startup() is called in the before() block and not beforeEach(), we CANNOT
+            // call sinon.restore() here. This is because sinon.restore() will restore the stubs for
+            // CloudSqlite that HubMock.startup() put in place.
+            watchStubResult.restore();
+        }
         expect(nClosed).equal(1);
-        bc.close();
-        // NOTE: Since HubMock.startup() is called in the before() block and not beforeEach(), we CANNOT
-        // call sinon.restore() here. This is because sinon.restore() will restore the stubs for
-        // CloudSqlite that HubMock.startup() put in place.
-        watchStubResult.restore();
     });
     it("should handle undo/redo", async () => {
         const adminAccessToken = await HubWrappers.getAccessToken(TestUserType.SuperManager);
@@ -233,13 +262,15 @@ describe("IModelWriteTest", () => {
         const rwIModelId = await HubMock.createNewIModel({ accessToken: adminAccessToken, iTwinId, iModelName, description: "TestSubject" });
         assert.isNotEmpty(rwIModelId);
         const rwIModel = await HubWrappers.downloadAndOpenBriefcase({ accessToken: adminAccessToken, iTwinId, iModelId: rwIModelId });
+        const rwTxn = new EditTxn(rwIModel, "imodel write");
+        rwTxn.start();
         rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
         // create and insert a new model with code1
         const code1 = IModelTestUtils.getUniqueModelCode(rwIModel, "newPhysicalModel1");
-        await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(rwIModel, code1, true);
+        await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(rwTxn, code1, true);
         assert.isTrue(rwIModel.elements.getElement(code1) !== undefined); // throws if element is not found
         // create a local txn with that change
-        rwIModel.saveChanges("inserted newPhysicalModel");
+        rwTxn.saveChanges("inserted newPhysicalModel");
         // Reverse that local txn
         rwIModel.txns.reverseSingleTxn();
         try {
@@ -253,8 +284,8 @@ describe("IModelWriteTest", () => {
         }
         // Create and insert a model with code2
         const code2 = IModelTestUtils.getUniqueModelCode(rwIModel, "newPhysicalModel2");
-        await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(rwIModel, code2, true);
-        rwIModel.saveChanges("inserted generic objects");
+        await IModelTestUtils.createAndInsertPhysicalPartitionAndModelAsync(rwTxn, code2, true);
+        rwTxn.end("save", "inserted generic objects");
         // The iModel should have a model with code1 and not code2
         assert.isTrue(rwIModel.elements.getElement(code2) !== undefined); // throws if element is not found
         // Push the changes to the hub
@@ -324,18 +355,19 @@ describe("IModelWriteTest", () => {
         const rwIModelId = await HubMock.createNewIModel({ iTwinId, iModelName, description: "TestSubject", accessToken: adminToken });
         assert.isNotEmpty(rwIModelId);
         const rwIModel = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken });
+        const rwTxn = new EditTxn(rwIModel, "imodel write");
         assert.equal(rwIModel[_nativeDb].enableChangesetSizeStats(true), DbResult.BE_SQLITE_OK);
-        const schema = `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
-        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
-        <ECEntityClass typeName="Test2dElement">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-            <ECProperty propertyName="s" typeName="string"/>
-        </ECEntityClass>
+        const schema = `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+        <ECEntityClass typeName="Test2dElement">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+            <ECProperty propertyName="s" typeName="string"/>
+        </ECEntityClass>
     </ECSchema>`;
         await rwIModel.importSchemaStrings([schema]);
         rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
-        rwIModel.saveChanges("user 1: schema changeset");
+        rwTxn.start();
         if (true || "push changes") {
             // Push the changes to the hub
             const prePushChangeSetId = rwIModel.changeset.id;
@@ -350,11 +382,11 @@ describe("IModelWriteTest", () => {
         const codeProps = Code.createEmpty();
         codeProps.value = "DrawingModel";
         let totalEl = 0;
-        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(rwIModel, codeProps, true);
+        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(rwTxn, codeProps, true);
         let drawingCategoryId = DrawingCategory.queryCategoryIdByName(rwIModel, IModel.dictionaryId, "MyDrawingCategory");
         if (undefined === drawingCategoryId)
-            drawingCategoryId = DrawingCategory.insert(rwIModel, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
-        const insertElements = (imodel, className = "Test2dElement", noOfElements = 10, userProp) => {
+            drawingCategoryId = DrawingCategory.insert(rwTxn, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
+        const insertElements = (txn, className = "Test2dElement", noOfElements = 10, userProp) => {
             for (let m = 0; m < noOfElements; ++m) {
                 const geomArray = [
                     Arc3d.createXY(Point3d.create(0, 0), 5),
@@ -376,16 +408,16 @@ describe("IModelWriteTest", () => {
                     geom: geometryStream,
                     ...prop,
                 };
-                const id = imodel.elements.insertElement(geomElement);
+                const id = txn.insertElement(geomElement);
                 assert.isTrue(Id64.isValidId64(id), "insert worked");
             }
         };
         const str = new Array(1024).join("x");
-        insertElements(rwIModel, "Test2dElement", 1024, () => {
+        insertElements(rwTxn, "Test2dElement", 1024, () => {
             return { s: str };
         });
         assert.equal(1357648, rwIModel[_nativeDb].getChangesetSize());
-        rwIModel.saveChanges("user 1: data");
+        rwTxn.saveChanges("user 1: data");
         assert.equal(0, rwIModel[_nativeDb].getChangesetSize());
         await rwIModel.pushChanges({ description: "schema changeset", accessToken: adminToken });
         rwIModel.close();
@@ -404,6 +436,8 @@ describe("IModelWriteTest", () => {
         };
         const briefcaseDb = await BriefcaseDb.open({ fileName: briefcaseProps.fileName });
         briefcaseDb.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+        const briefcaseDbTxn = new EditTxn(briefcaseDb, "imodel write");
+        briefcaseDbTxn.start();
         let firstNonRootElement = { id: undefined, codeValue: "test" };
         // eslint-disable-next-line @typescript-eslint/no-deprecated
         briefcaseDb.withPreparedStatement("SELECT * from Bis.Element LIMIT 1 OFFSET 1", (stmt) => {
@@ -413,16 +447,16 @@ describe("IModelWriteTest", () => {
         });
         // make change to the briefcaseDb that does not affect code, e.g., save file property
         // expect no error from verifyCode
-        expect(() => briefcaseDb.saveFileProperty({ name: "codeServiceProp", namespace: "codeService", id: 1, subId: 1 }, "codeService test")).to.not.throw();
+        expect(() => briefcaseDbTxn.saveFileProperty({ name: "codeServiceProp", namespace: "codeService", id: 1, subId: 1 }, "codeService test")).to.not.throw();
         // make change to the briefcaseDb that affects code that will invoke verifyCode, e.g., update an element with a non-null code
         // expect error from verifyCode
         let newProps = { id: firstNonRootElement.id, code: { ...Code.createEmpty(), value: firstNonRootElement.codeValue }, classFullName: undefined, model: undefined };
         await briefcaseDb.locks.acquireLocks({ exclusive: firstNonRootElement.id });
-        expect(() => briefcaseDb.elements.updateElement(newProps)).to.throw(CodeService.Error);
+        expect(() => briefcaseDbTxn.updateElement(newProps)).to.throw(CodeService.Error);
         // make change to the briefcaseDb that will invoke verifyCode with a null(empty) code, e.g., update an element with a null(empty) code
         // expect no error from verifyCode
         newProps = { id: firstNonRootElement.id, code: Code.createEmpty(), classFullName: undefined, model: undefined };
-        expect(() => briefcaseDb.elements.updateElement(newProps)).to.not.throw();
+        expect(() => briefcaseDbTxn.updateElement(newProps)).to.not.throw();
         briefcaseDb.close();
         // throw "NoCodeIndex", this error should get ignored because it means the iModel isn't enforcing codes. updating an element with an empty code and a non empty code should work without issue.
         CodeService.createForIModel = async () => {
@@ -430,13 +464,15 @@ describe("IModelWriteTest", () => {
         };
         const briefcaseDb2 = await BriefcaseDb.open({ fileName: briefcaseProps.fileName });
         briefcaseDb2.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+        const briefcaseDb2Txn = new EditTxn(briefcaseDb2, "imodel write");
+        briefcaseDb2Txn.start();
         await briefcaseDb2.locks.acquireLocks({ exclusive: firstNonRootElement.id });
         // expect no error from verifyCode for empty code
-        expect(() => briefcaseDb2.elements.updateElement(newProps)).to.not.throw();
+        expect(() => briefcaseDb2Txn.updateElement(newProps)).to.not.throw();
         newProps = { id: firstNonRootElement.id, code: { ...Code.createEmpty(), value: firstNonRootElement.codeValue }, classFullName: undefined, model: undefined };
         // make change to the briefcaseDb that affects code that will invoke verifyCode, e.g., update an element with a non-null code
         // expect no error from verifyCode
-        expect(() => briefcaseDb2.elements.updateElement(newProps)).to.not.throw();
+        expect(() => briefcaseDb2Txn.updateElement(newProps)).to.not.throw();
         // clean up
         CodeService.createForIModel = originalCreateForIModel;
         briefcaseDb2.close();
@@ -450,22 +486,25 @@ describe("IModelWriteTest", () => {
         const rwIModelId = await HubMock.createNewIModel({ iTwinId, iModelName, description: "TestSubject" });
         assert.isNotEmpty(rwIModelId);
         const rwIModel = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken });
+        const rwTxn = new EditTxn(rwIModel, "imodel write");
         const rwIModel2 = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: userToken });
+        const rwTxn2 = new EditTxn(rwIModel2, "imodel write");
+        rwTxn2.start();
         // enable change tracking
         assert.equal(rwIModel[_nativeDb].enableChangesetSizeStats(true), DbResult.BE_SQLITE_OK);
         assert.equal(rwIModel2[_nativeDb].enableChangesetSizeStats(true), DbResult.BE_SQLITE_OK);
-        const schema = `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
-        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
-        <ECEntityClass typeName="Test2dElement">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-            <ECProperty propertyName="s" typeName="string"/>
-        </ECEntityClass>
+        const schema = `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+        <ECEntityClass typeName="Test2dElement">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+            <ECProperty propertyName="s" typeName="string"/>
+        </ECEntityClass>
     </ECSchema>`;
         await rwIModel.importSchemaStrings([schema]);
         rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
         rwIModel2.channels.addAllowedChannel(ChannelControl.sharedChannelName);
-        rwIModel.saveChanges("user 1: schema changeset");
+        rwTxn.start();
         if (true || "push changes") {
             // Push the changes to the hub
             const prePushChangeSetId = rwIModel.changeset.id;
@@ -480,11 +519,11 @@ describe("IModelWriteTest", () => {
         codeProps.value = "DrawingModel";
         let totalEl = 0;
         await rwIModel.locks.acquireLocks({ shared: IModel.dictionaryId });
-        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(rwIModel, codeProps, true);
+        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(rwTxn, codeProps, true);
         let drawingCategoryId = DrawingCategory.queryCategoryIdByName(rwIModel, IModel.dictionaryId, "MyDrawingCategory");
         if (undefined === drawingCategoryId)
-            drawingCategoryId = DrawingCategory.insert(rwIModel, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
-        const insertElements = (imodel, className = "Test2dElement", noOfElements = 10, userProp) => {
+            drawingCategoryId = DrawingCategory.insert(rwTxn, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
+        const insertElements = (txn, className = "Test2dElement", noOfElements = 10, userProp) => {
             for (let m = 0; m < noOfElements; ++m) {
                 const geomArray = [
                     Arc3d.createXY(Point3d.create(0, 0), 5),
@@ -506,15 +545,15 @@ describe("IModelWriteTest", () => {
                     geom: geometryStream,
                     ...prop,
                 };
-                const id = imodel.elements.insertElement(geomElement);
+                const id = txn.insertElement(geomElement);
                 assert.isTrue(Id64.isValidId64(id), "insert worked");
             }
         };
-        insertElements(rwIModel, "Test2dElement", 10, (n) => {
+        insertElements(rwTxn, "Test2dElement", 10, (n) => {
             return { s: `s-${n}` };
         });
         assert.equal(3889, rwIModel[_nativeDb].getChangesetSize());
-        rwIModel.saveChanges("user 1: data changeset");
+        rwTxn.saveChanges("user 1: data changeset");
         if (true || "push changes") {
             // Push the changes to the hub
             const prePushChangeSetId = rwIModel.changeset.id;
@@ -560,11 +599,11 @@ describe("IModelWriteTest", () => {
             assert.equal(rows.map((r) => r.s).filter((v) => v).length, 10);
             // create some element and push those changes
             await rwIModel2.locks.acquireLocks({ shared: drawingModelId });
-            insertElements(rwIModel2, "Test2dElement", 10, (n) => {
+            insertElements(rwTxn2, "Test2dElement", 10, (n) => {
                 return { s: `s-${n}` };
             });
             assert.equal(0, rwIModel[_nativeDb].getChangesetSize());
-            rwIModel2.saveChanges("user 2: data changeset");
+            rwTxn2.saveChanges("user 2: data changeset");
             if (true || "push changes") {
                 // Push the changes to the hub
                 const prePushChangeSetId = rwIModel2.changeset.id;
@@ -578,23 +617,22 @@ describe("IModelWriteTest", () => {
         }
         await rwIModel.pullChanges({ accessToken: adminToken });
         // second schema import ==============================================================
-        const schemaV2 = `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="ts" version="01.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
-        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
-        <ECEntityClass typeName="Test2dElement">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-            <ECProperty propertyName="s" typeName="string"/>
-            <ECProperty propertyName="v" typeName="string"/>
-        </ECEntityClass>
-        <ECEntityClass typeName="Test2dElement2nd">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-            <ECProperty propertyName="t" typeName="string"/>
-            <ECProperty propertyName="r" typeName="string"/>
-        </ECEntityClass>
+        const schemaV2 = `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="ts" version="01.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+        <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+        <ECEntityClass typeName="Test2dElement">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+            <ECProperty propertyName="s" typeName="string"/>
+            <ECProperty propertyName="v" typeName="string"/>
+        </ECEntityClass>
+        <ECEntityClass typeName="Test2dElement2nd">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+            <ECProperty propertyName="t" typeName="string"/>
+            <ECProperty propertyName="r" typeName="string"/>
+        </ECEntityClass>
     </ECSchema>`;
         await rwIModel.importSchemaStrings([schemaV2]);
         assert.equal(0, rwIModel[_nativeDb].getChangesetSize());
-        rwIModel.saveChanges("user 1: schema changeset2");
         if (true || "push changes") {
             // Push the changes to the hub
             const prePushChangeSetId = rwIModel.changeset.id;
@@ -607,19 +645,19 @@ describe("IModelWriteTest", () => {
         }
         // create some element and push those changes
         await rwIModel.locks.acquireLocks({ shared: drawingModelId });
-        insertElements(rwIModel, "Test2dElement", 10, (n) => {
+        insertElements(rwTxn, "Test2dElement", 10, (n) => {
             return {
                 s: `s-${n}`, v: `v-${n}`,
             };
         });
         // create some element and push those changes
-        insertElements(rwIModel, "Test2dElement2nd", 10, (n) => {
+        insertElements(rwTxn, "Test2dElement2nd", 10, (n) => {
             return {
                 t: `t-${n}`, r: `r-${n}`,
             };
         });
         assert.equal(6266, rwIModel[_nativeDb].getChangesetSize());
-        rwIModel.saveChanges("user 1: data changeset");
+        rwTxn.saveChanges("user 1: data changeset");
         if (true || "push changes") {
             // Push the changes to the hub
             const prePushChangeSetId = rwIModel.changeset.id;
@@ -767,8 +805,7 @@ describe("IModelWriteTest", () => {
         newExtents.low.y += 100;
         newExtents.high.x += 100;
         newExtents.high.y += 100;
-        iModel.updateProjectExtents(newExtents);
-        iModel.saveChanges("update project extents");
+        withEditTxn(iModel, "update project extents", (txn) => txn.updateProjectExtents(newExtents));
         await iModel.pushChanges({ description: "update project extents" });
         await HubWrappers.closeAndDeleteBriefcaseDb(accessToken, iModel);
         const iModelBeforeExtentsChange = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: IModelVersion.asOfChangeSet(changesetIdBeforeExtentsChange).toJSON() });
@@ -792,14 +829,16 @@ describe("IModelWriteTest", () => {
         const iModelId = await HubMock.createNewIModel({ iTwinId, iModelName: "subModelCoveredByParentLockTest", version0 });
         let iModel = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId });
         iModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+        const iModelTxn = new EditTxn(iModel, "imodel write");
+        iModelTxn.start();
         /*
         Job Subject
           +- DefinitionPartition  --  [DefinitionModel]
       */
         await iModel.locks.acquireLocks({ shared: IModel.repositoryModelId });
-        const jobSubjectId = IModelTestUtils.createJobSubjectElement(iModel, "JobSubject").insert();
-        const definitionModelId = DefinitionModel.insert(iModel, jobSubjectId, "Definition");
-        iModel.saveChanges();
+        const jobSubjectId = IModelTestUtils.createJobSubjectElement(iModel, "JobSubject").insert(iModelTxn);
+        const definitionModelId = DefinitionModel.insert(iModelTxn, jobSubjectId, "Definition");
+        iModelTxn.end();
         const locks = iModel.locks;
         expect(locks.isServerBased).true;
         await iModel.pushChanges({ description: "create model" });
@@ -813,16 +852,17 @@ describe("IModelWriteTest", () => {
         assert.isFalse(iModel.locks.holdsExclusiveLock(jobSubjectId));
         assert.isFalse(iModel.locks.holdsExclusiveLock(definitionModelId));
         assert.isFalse(iModel.locks.holdsSharedLock(definitionModelId));
+        iModelTxn.start();
         await iModel.locks.acquireLocks({ exclusive: jobSubjectId });
         iModel.locks.checkExclusiveLock(jobSubjectId, "", "");
         iModel.locks.checkSharedLock(jobSubjectId, "", "");
         iModel.locks.checkSharedLock(definitionModelId, "", "");
         iModel.locks.checkExclusiveLock(definitionModelId, "", "");
-        const spatialCategoryId = SpatialCategory.insert(iModel, definitionModelId, "SpatialCategory", new SubCategoryAppearance()); // throws if we get locking error
-        const drawingCategoryId = DrawingCategory.insert(iModel, definitionModelId, "DrawingCategory", new SubCategoryAppearance());
+        const spatialCategoryId = SpatialCategory.insert(iModelTxn, definitionModelId, "SpatialCategory", new SubCategoryAppearance()); // throws if we get locking error
+        const drawingCategoryId = DrawingCategory.insert(iModelTxn, definitionModelId, "DrawingCategory", new SubCategoryAppearance());
         assert.isTrue(iModel.elements.getElement(spatialCategoryId).model === definitionModelId);
         assert.isTrue(iModel.elements.getElement(drawingCategoryId).model === definitionModelId);
-        iModel.saveChanges();
+        iModelTxn.end();
         await iModel.pushChanges({ description: "insert category" });
         /*
         Create some more nesting.
@@ -837,19 +877,20 @@ describe("IModelWriteTest", () => {
         assert.isFalse(iModel.locks.holdsExclusiveLock(jobSubjectId));
         assert.isFalse(iModel.locks.holdsExclusiveLock(definitionModelId));
         assert.isFalse(iModel.locks.holdsSharedLock(definitionModelId));
+        iModelTxn.start();
         await iModel.locks.acquireLocks({ exclusive: jobSubjectId });
         iModel.locks.checkExclusiveLock(jobSubjectId, "", "");
         iModel.locks.checkSharedLock(IModel.repositoryModelId, "", "");
-        const childSubjectId = Subject.insert(iModel, jobSubjectId, "Child Subject");
-        const documentListModelId = DocumentListModel.insert(iModel, childSubjectId, "Document"); // creates DocumentList and DocumentListModel
+        const childSubjectId = Subject.insert(iModelTxn, jobSubjectId, "Child Subject");
+        const documentListModelId = DocumentListModel.insert(iModelTxn, childSubjectId, "Document"); // creates DocumentList and DocumentListModel
         assert.isTrue(Id64.isValidId64(documentListModelId));
-        const drawingModelId = Drawing.insert(iModel, documentListModelId, "Drawing"); // creates Drawing and DrawingModel
+        const drawingModelId = Drawing.insert(iModelTxn, documentListModelId, "Drawing"); // creates Drawing and DrawingModel
         assert.isTrue(iModel.elements.getElement(childSubjectId).parent?.id === jobSubjectId);
         assert.isTrue(iModel.elements.getElement(childSubjectId).model === IModel.repositoryModelId);
         assert.isTrue(iModel.elements.getElement(documentListModelId).parent?.id === childSubjectId);
         assert.isTrue(iModel.elements.getElement(documentListModelId).model === IModel.repositoryModelId);
         assert.isTrue(iModel.elements.getElement(drawingModelId).model === documentListModelId);
-        iModel.saveChanges();
+        iModelTxn.end();
         await iModel.pushChanges({ description: "insert doc list with nested drawing model" });
         /*
         Verify that even a deeply nested insertion is covered by the exclusive lock on the top-level parent.
@@ -867,6 +908,7 @@ describe("IModelWriteTest", () => {
         assert.isFalse(iModel.locks.holdsSharedLock(definitionModelId));
         assert.isFalse(iModel.locks.holdsSharedLock(documentListModelId));
         assert.isFalse(iModel.locks.holdsSharedLock(drawingModelId));
+        iModelTxn.start();
         await iModel.locks.acquireLocks({ exclusive: jobSubjectId });
         iModel.locks.checkExclusiveLock(jobSubjectId, "", "");
         iModel.locks.checkSharedLock(IModel.repositoryModelId, "", "");
@@ -881,9 +923,9 @@ describe("IModelWriteTest", () => {
             geom: IModelTestUtils.createRectangle(Point2d.create(1, 1)),
             placement: { origin: Point2d.create(2, 2), angle: 0 },
         };
-        const drawingGraphicId1 = iModel.elements.insertElement(drawingGraphicProps1);
+        const drawingGraphicId1 = iModelTxn.insertElement(drawingGraphicProps1);
         assert.isTrue(iModel.elements.getElement(drawingGraphicId1).model === drawingModelId);
-        iModel.saveChanges();
+        iModelTxn.end();
         expect(iModel.locks.holdsExclusiveLock(drawingModelId)).true;
         const fileName = iModel[_nativeDb].getFilePath();
         iModel.close(); // close rw