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

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

@@ -68,6 +68,17 @@ import { HubMock } from "../../internal/HubMock";
 import { SqliteChangesetReader } from "../../SqliteChangesetReader";
 import { HubWrappers, IModelTestUtils } from "../IModelTestUtils";
 import { KnownTestLocations } from "../KnownTestLocations";
+import { EditTxn } from "../../EditTxn";
+function startTestTxn(iModel, description = "changeset reader") {
+    const txn = new EditTxn(iModel, description);
+    txn.start();
+    return txn;
+}
+async function importSchemaStrings(txn, schemas) {
+    if (txn.isActive)
+        txn.saveChanges();
+    await txn.iModel.importSchemaStrings(schemas);
+}
 describe("Changeset Reader API", async () => {
     let iTwinId;
     before(() => {
@@ -92,25 +103,26 @@ describe("Changeset Reader API", async () => {
         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 txn = startTestTxn(rwIModel, "recover overflow table changeset reader");
         // 1. Import schema with class that span overflow table.
-        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>
-            ${Array(nProps).fill(undefined).map((_, i) => `<ECProperty propertyName="p${i}" typeName="string"/>`).join("\n")}
-        </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>
+            ${Array(nProps).fill(undefined).map((_, i) => `<ECProperty propertyName="p${i}" typeName="string"/>`).join("\n")}
+        </ECEntityClass>
     </ECSchema>`;
-        await rwIModel.importSchemaStrings([schema]);
+        await importSchemaStrings(txn, [schema]);
         rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
         // Create drawing model and category
         await rwIModel.locks.acquireLocks({ shared: IModel.dictionaryId });
         const codeProps = Code.createEmpty();
         codeProps.value = "DrawingModel";
-        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(rwIModel, codeProps, true);
+        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(txn, 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() }));
+            drawingCategoryId = DrawingCategory.insert(txn, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
         // Insert element with 100 properties
         const geomArray = [
             Arc3d.createXY(Point3d.create(0, 0), 5),
@@ -136,9 +148,9 @@ describe("Changeset Reader API", async () => {
             ...props,
         };
         // 2. Insert a element for the class.
-        const id = rwIModel.elements.insertElement(geomElement);
+        const id = txn.insertElement(geomElement);
         assert.isTrue(Id64.isValidId64(id), "insert worked");
-        rwIModel.saveChanges();
+        txn.saveChanges();
         // 3. Push changes to hub.
         await rwIModel.pushChanges({ description: "insert element", accessToken: adminToken });
         // 4. Update the element.
@@ -148,14 +160,14 @@ describe("Changeset Reader API", async () => {
             return { ...acc, ...curr };
         }, {}));
         await rwIModel.locks.acquireLocks({ exclusive: id });
-        rwIModel.elements.updateElement(updatedElementProps);
-        rwIModel.saveChanges();
+        txn.updateElement(updatedElementProps);
+        txn.saveChanges();
         // 5. Push changes to hub.
         await rwIModel.pushChanges({ description: "update element", accessToken: adminToken });
         await rwIModel.locks.acquireLocks({ exclusive: id });
         // 6. Delete the element.
-        rwIModel.elements.deleteElement(id);
-        rwIModel.saveChanges();
+        txn.deleteElement(id);
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "delete element", accessToken: adminToken });
         const targetDir = path.join(KnownTestLocations.outputDir, rwIModelId, "changesets");
         const changesets = await HubMock.downloadChangesets({ iModelId: rwIModelId, targetDir });
@@ -187,6 +199,7 @@ describe("Changeset Reader API", async () => {
             }
         }
         assert.isTrue(assertOnOverflowTable);
+        txn.end();
         rwIModel.close();
     });
     function getClassIdByName(iModel, className) {
@@ -209,16 +222,16 @@ describe("Changeset Reader API", async () => {
         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 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 txn = startTestTxn(rwIModel, "changeset reader EC adaptor");
+        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.saveChanges("user 1: schema changeset");
+        await importSchemaStrings(txn, [schema]);
         if (true || "push changes") {
             // Push the changes to the hub
             const prePushChangeSetId = rwIModel.changeset.id;
@@ -232,11 +245,11 @@ describe("Changeset Reader API", async () => {
         const codeProps = Code.createEmpty();
         codeProps.value = "DrawingModel";
         let totalEl = 0;
-        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(rwIModel, codeProps, true);
+        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(txn, 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() }));
-        rwIModel.saveChanges("user 1: create drawing partition");
+            drawingCategoryId = DrawingCategory.insert(txn, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
+        txn.saveChanges("user 1: create drawing partition");
         if (true || "push changes") {
             // Push the changes to the hub
             const prePushChangeSetId = rwIModel.changeset.id;
@@ -246,7 +259,7 @@ describe("Changeset Reader API", async () => {
             expect(prePushChangeSetId !== postPushChangeSetId);
         }
         await rwIModel.locks.acquireLocks({ shared: drawingModelId });
-        const insertElements = (imodel, className = "Test2dElement", noOfElements = 10, userProp) => {
+        const insertElements = (className = "Test2dElement", noOfElements = 10, userProp) => {
             for (let m = 0; m < noOfElements; ++m) {
                 const geomArray = [
                     Arc3d.createXY(Point3d.create(0, 0), 5),
@@ -268,23 +281,23 @@ describe("Changeset Reader API", async () => {
                     geom: geometryStream,
                     ...prop,
                 };
-                const id = imodel.elements.insertElement(geomElement);
+                const id = txn.insertElement(geomElement);
                 assert.isTrue(Id64.isValidId64(id), "insert worked");
             }
         };
         const generatedStr = new Array(10).join("x");
-        insertElements(rwIModel, "Test2dElement", 1, () => {
+        insertElements("Test2dElement", 1, () => {
             return { s: generatedStr };
         });
         const updatedElements = async () => {
             await rwIModel.locks.acquireLocks({ exclusive: "0x20000000004" });
             const updatedElement = rwIModel.elements.getElementProps("0x20000000004");
             updatedElement.s = "updated property";
-            rwIModel.elements.updateElement(updatedElement);
-            rwIModel.saveChanges("user 1: updated data");
+            txn.updateElement(updatedElement);
+            txn.saveChanges("user 1: updated data");
             await rwIModel.pushChanges({ description: "user 1: update property id=0x20000000004", accessToken: adminToken });
         };
-        rwIModel.saveChanges("user 1: data");
+        txn.saveChanges("user 1: data");
         if (true || "test local changes") {
             const testChanges = async (changes) => {
                 assert.equal(changes.length, 3);
@@ -714,6 +727,7 @@ describe("Changeset Reader API", async () => {
                 }
             }
         }
+        txn.end();
         rwIModel.close();
     });
     it("revert timeline changes", async () => {
@@ -722,20 +736,21 @@ describe("Changeset Reader API", async () => {
         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 txn = startTestTxn(rwIModel, "revert timeline changes");
         let nProps = 0;
         // 1. Import schema with class that span overflow table.
         const addPropertyAndImportSchema = async () => {
             await rwIModel.acquireSchemaLock();
             ++nProps;
-            const schema = `<?xml version="1.0" encoding="UTF-8"?>
-    <ECSchema schemaName="TestDomain" alias="ts" version="01.00.${nProps}" 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>
-            ${Array(nProps).fill(undefined).map((_, i) => `<ECProperty propertyName="p${i + 1}" typeName="string"/>`).join("\n")}
-        </ECEntityClass>
+            const schema = `<?xml version="1.0" encoding="UTF-8"?>
+    <ECSchema schemaName="TestDomain" alias="ts" version="01.00.${nProps}" 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>
+            ${Array(nProps).fill(undefined).map((_, i) => `<ECProperty propertyName="p${i + 1}" typeName="string"/>`).join("\n")}
+        </ECEntityClass>
     </ECSchema>`;
-            await rwIModel.importSchemaStrings([schema]);
+            await importSchemaStrings(txn, [schema]);
         };
         await addPropertyAndImportSchema();
         rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
@@ -743,11 +758,11 @@ describe("Changeset Reader API", async () => {
         await rwIModel.locks.acquireLocks({ shared: IModel.dictionaryId });
         const codeProps = Code.createEmpty();
         codeProps.value = "DrawingModel";
-        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(rwIModel, codeProps, true);
+        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(txn, 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() }));
-        rwIModel.saveChanges();
+            drawingCategoryId = DrawingCategory.insert(txn, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "setup category", accessToken: adminToken });
         const createEl = async (args) => {
             await rwIModel.locks.acquireLocks({ exclusive: drawingModelId });
@@ -769,17 +784,17 @@ describe("Changeset Reader API", async () => {
                 geom: geometryStream,
                 ...args,
             };
-            return rwIModel.elements.insertElement(e1);
+            return txn.insertElement(e1);
             ;
         };
         const updateEl = async (id, args) => {
             await rwIModel.locks.acquireLocks({ exclusive: id });
             const updatedElementProps = Object.assign(rwIModel.elements.getElementProps(id), args);
-            rwIModel.elements.updateElement(updatedElementProps);
+            txn.updateElement(updatedElementProps);
         };
         const deleteEl = async (id) => {
             await rwIModel.locks.acquireLocks({ exclusive: id });
-            rwIModel.elements.deleteElement(id);
+            txn.deleteElement(id);
         };
         const getChanges = async () => {
             return HubMock.downloadChangesets({ iModelId: rwIModelId, targetDir: path.join(KnownTestLocations.outputDir, rwIModelId, "changesets") });
@@ -795,22 +810,22 @@ describe("Changeset Reader API", async () => {
         // 2. Insert a element for the class
         const el1 = await createEl({ p1: "test1" });
         const el2 = await createEl({ p1: "test2" });
-        rwIModel.saveChanges();
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "insert 2 elements" });
         // 3. Update the element.
         await updateEl(el1, { p1: "test3" });
-        rwIModel.saveChanges();
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "update element 1" });
         // 4. Delete the element.
         await deleteEl(el2);
         const el3 = await createEl({ p1: "test4" });
-        rwIModel.saveChanges();
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "delete element 2" });
         // 5. import schema and insert element 4 & update element 3
         await addPropertyAndImportSchema();
         const el4 = await createEl({ p1: "test5", p2: "test6" });
         await updateEl(el3, { p1: "test7", p2: "test8" });
-        rwIModel.saveChanges();
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "import schema, insert element 4 & update element 3" });
         assert.isDefined(findEl(el1));
         assert.isUndefined(findEl(el2));
@@ -838,7 +853,7 @@ describe("Changeset Reader API", async () => {
         await addPropertyAndImportSchema();
         const el5 = await createEl({ p1: "test9", p2: "test10", p3: "test11" });
         await updateEl(el1, { p1: "test12", p2: "test13", p3: "test114" });
-        rwIModel.saveChanges();
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "import schema, insert element 5 & update element 1" });
         // eslint-disable-next-line @typescript-eslint/no-deprecated
         assert.deepEqual(Object.getOwnPropertyNames(rwIModel.getMetaData("TestDomain:Test2dElement").properties), ["p1", "p2", "p3"]);
@@ -861,6 +876,7 @@ describe("Changeset Reader API", async () => {
         assert.isDefined(findEl(el5));
         // eslint-disable-next-line @typescript-eslint/no-deprecated
         assert.deepEqual(Object.getOwnPropertyNames(rwIModel.getMetaData("TestDomain:Test2dElement").properties), ["p1", "p2", "p3"]);
+        txn.end();
         rwIModel.close();
     });
     it("openGroup() & writeToFile()", async () => {
@@ -869,26 +885,27 @@ describe("Changeset Reader API", async () => {
         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 txn = startTestTxn(rwIModel, "openGroup writeToFile");
         // 1. Import schema with class that span overflow table.
-        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="p1" 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="p1" typeName="string"/>
+        </ECEntityClass>
     </ECSchema>`;
-        await rwIModel.importSchemaStrings([schema]);
+        await importSchemaStrings(txn, [schema]);
         rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
         // Create drawing model and category
         await rwIModel.locks.acquireLocks({ shared: IModel.dictionaryId });
         const codeProps = Code.createEmpty();
         codeProps.value = "DrawingModel";
-        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(rwIModel, codeProps, true);
+        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(txn, 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() }));
-        rwIModel.saveChanges();
+            drawingCategoryId = DrawingCategory.insert(txn, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "setup category", accessToken: adminToken });
         const geomArray = [
             Arc3d.createXY(Point3d.create(0, 0), 5),
@@ -910,20 +927,20 @@ describe("Changeset Reader API", async () => {
         };
         // 2. Insert a element for the class
         await rwIModel.locks.acquireLocks({ shared: drawingModelId });
-        const e1id = rwIModel.elements.insertElement(e1);
+        const e1id = txn.insertElement(e1);
         assert.isTrue(Id64.isValidId64(e1id), "insert worked");
-        rwIModel.saveChanges();
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "insert element", accessToken: adminToken });
         // 3. Update the element.
         const updatedElementProps = Object.assign(rwIModel.elements.getElementProps(e1id), { p1: "test2" });
         await rwIModel.locks.acquireLocks({ exclusive: e1id });
-        rwIModel.elements.updateElement(updatedElementProps);
-        rwIModel.saveChanges();
+        txn.updateElement(updatedElementProps);
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "update element", accessToken: adminToken });
         // 4. Delete the element.
         await rwIModel.locks.acquireLocks({ exclusive: e1id });
-        rwIModel.elements.deleteElement(e1id);
-        rwIModel.saveChanges();
+        txn.deleteElement(e1id);
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "delete element", accessToken: adminToken });
         const targetDir = path.join(KnownTestLocations.outputDir, rwIModelId, "changesets");
         const changesets = (await HubMock.downloadChangesets({ iModelId: rwIModelId, targetDir })).slice(1);
@@ -1045,6 +1062,7 @@ describe("Changeset Reader API", async () => {
                 classFullName: "BisCore:DrawingModel",
             });
         }
+        txn.end();
         rwIModel.close();
     });
     it("Delete class FK constraint violation in cache table", async () => {
@@ -1071,37 +1089,36 @@ describe("Changeset Reader API", async () => {
             HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken }),
             HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken })
         ]);
+        const firstTxn = startTestTxn(firstBriefCase, "delete class FK constraint setup");
         // Enable shared channel for both
         [firstBriefCase, secondBriefCase].forEach(briefcase => briefcase.channels.addAllowedChannel(ChannelControl.sharedChannelName));
-        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-          <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
-          <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-          <ECCustomAttributes>
-              <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-          </ECCustomAttributes>
-
-          <ECEntityClass typeName="TestClass">
-              <BaseClass>bis:PhysicalElement</BaseClass>
-          </ECEntityClass>
+        await importSchemaStrings(firstTxn, [`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+          <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
+          <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+          <ECCustomAttributes>
+              <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+          </ECCustomAttributes>
+
+          <ECEntityClass typeName="TestClass">
+              <BaseClass>bis:PhysicalElement</BaseClass>
+          </ECEntityClass>
       </ECSchema>`]);
-        firstBriefCase.saveChanges("import initial schema");
         // Push the changes to the hub
         await firstBriefCase.pushChanges({ description: "push initial schema changeset", accessToken: adminToken });
         // Sync the second briefcase with the iModel
         await secondBriefCase.pullChanges({ accessToken: adminToken });
         checkClass(firstBriefCase, true, secondBriefCase, true);
         // Import the schema
-        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-        <ECCustomAttributes>
-          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-        </ECCustomAttributes>
+        await importSchemaStrings(firstTxn, [`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+        <ECCustomAttributes>
+          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+        </ECCustomAttributes>
       </ECSchema>`]);
-        firstBriefCase.saveChanges("imported schema");
         // Push the changeset to the hub
         await firstBriefCase.pushChanges({ description: "Delete class major change", accessToken: adminToken });
         checkClass(firstBriefCase, false, secondBriefCase, true);
@@ -1114,6 +1131,7 @@ describe("Changeset Reader API", async () => {
         }
         checkClass(firstBriefCase, false, secondBriefCase, false);
         // Cleanup
+        firstTxn.end();
         secondBriefCase.close();
         firstBriefCase.close();
     });
@@ -1139,46 +1157,45 @@ describe("Changeset Reader API", async () => {
             HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken }),
             HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken })
         ]);
+        const firstTxn = startTestTxn(firstBriefCase, "delete class FK revert");
         // Enable shared channel for both
         [firstBriefCase, secondBriefCase].forEach(briefcase => briefcase.channels.addAllowedChannel(ChannelControl.sharedChannelName));
-        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-          <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
-          <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-          <ECCustomAttributes>
-              <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-          </ECCustomAttributes>
-
-          <ECEntityClass typeName="TestClass">
-              <BaseClass>bis:PhysicalElement</BaseClass>
-          </ECEntityClass>
+        await importSchemaStrings(firstTxn, [`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+          <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
+          <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+          <ECCustomAttributes>
+              <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+          </ECCustomAttributes>
+
+          <ECEntityClass typeName="TestClass">
+              <BaseClass>bis:PhysicalElement</BaseClass>
+          </ECEntityClass>
       </ECSchema>`]);
-        firstBriefCase.saveChanges("import initial schema");
         // Push the changes to the hub
         await firstBriefCase.pushChanges({ description: "push initial schema changeset", accessToken: adminToken });
         // Sync the second briefcase
         await secondBriefCase.pullChanges({ accessToken: adminToken });
         checkClass("TestClass", firstBriefCase, true, secondBriefCase, true);
         // Import the schema
-        await firstBriefCase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.1" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
-        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-        <ECCustomAttributes>
-          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-        </ECCustomAttributes>
-
-        <ECEntityClass typeName="TestClass">
-          <BaseClass>bis:PhysicalElement</BaseClass>
-        </ECEntityClass>
-
-        <ECEntityClass typeName="AnotherTestClass">
-          <BaseClass>bis:PhysicalElement</BaseClass>
-        </ECEntityClass>
+        await importSchemaStrings(firstTxn, [`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.1" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
+        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+        <ECCustomAttributes>
+          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+        </ECCustomAttributes>
+
+        <ECEntityClass typeName="TestClass">
+          <BaseClass>bis:PhysicalElement</BaseClass>
+        </ECEntityClass>
+
+        <ECEntityClass typeName="AnotherTestClass">
+          <BaseClass>bis:PhysicalElement</BaseClass>
+        </ECEntityClass>
       </ECSchema>`]);
-        firstBriefCase.saveChanges("imported schema");
         // Push the changeset to the hub
         await firstBriefCase.pushChanges({ description: "Add another class change", accessToken: adminToken });
         // Sync the second briefcase
@@ -1203,6 +1220,7 @@ describe("Changeset Reader API", async () => {
         checkClass("TestClass", firstBriefCase, true, secondBriefCase, true);
         checkClass("AnotherTestClass", firstBriefCase, false, secondBriefCase, false);
         // Cleanup
+        firstTxn.end();
         secondBriefCase.close();
         firstBriefCase.close();
     });
@@ -1216,63 +1234,62 @@ describe("Changeset Reader API", async () => {
             HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken }),
             HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: rwIModelId, accessToken: adminToken })
         ]);
+        const firstTxn = startTestTxn(firstBriefcase, "track changeset health first briefcase");
+        const secondTxn = startTestTxn(secondBriefcase, "track changeset health second briefcase");
         [firstBriefcase, secondBriefcase].forEach(briefcase => briefcase.channels.addAllowedChannel(ChannelControl.sharedChannelName));
-        await firstBriefcase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
-        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-        <ECCustomAttributes>
-          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-        </ECCustomAttributes>
-
-        <ECEntityClass typeName="TestClass">
-          <BaseClass>bis:PhysicalElement</BaseClass>
-        </ECEntityClass>
+        await importSchemaStrings(firstTxn, [`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="1.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
+        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+        <ECCustomAttributes>
+          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+        </ECCustomAttributes>
+
+        <ECEntityClass typeName="TestClass">
+          <BaseClass>bis:PhysicalElement</BaseClass>
+        </ECEntityClass>
       </ECSchema>`]);
-        firstBriefcase.saveChanges("import initial schema");
         // Enable changeset tracking for both briefcases
         await Promise.all([firstBriefcase.enableChangesetStatTracking(), secondBriefcase.enableChangesetStatTracking()]);
         await firstBriefcase.pushChanges({ description: "push initial schema changeset", accessToken: adminToken });
         await secondBriefcase.pullChanges({ accessToken: adminToken });
         // Schema upgrade
-        await secondBriefcase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
-        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-        <ECCustomAttributes>
-          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-        </ECCustomAttributes>
-
-        <ECEntityClass typeName="TestClass">
-          <BaseClass>bis:PhysicalElement</BaseClass>
-          <ECProperty propertyName="TestProperty" typeName="string"/>
-        </ECEntityClass>
-
-        <ECEnumeration typeName="TestEnum" backingTypeName="int" isStrict="true">
-          <ECEnumerator name="Enumerator1" value="1" displayLabel="TestEnumerator1"/>
-          <ECEnumerator name="Enumerator2" value="2" displayLabel="TestEnumerator2"/>
-        </ECEnumeration>
+        await importSchemaStrings(secondTxn, [`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+        <ECSchemaReference name="BisCore" version="1.0.0" alias="bis"/>
+        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+        <ECCustomAttributes>
+          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+        </ECCustomAttributes>
+
+        <ECEntityClass typeName="TestClass">
+          <BaseClass>bis:PhysicalElement</BaseClass>
+          <ECProperty propertyName="TestProperty" typeName="string"/>
+        </ECEntityClass>
+
+        <ECEnumeration typeName="TestEnum" backingTypeName="int" isStrict="true">
+          <ECEnumerator name="Enumerator1" value="1" displayLabel="TestEnumerator1"/>
+          <ECEnumerator name="Enumerator2" value="2" displayLabel="TestEnumerator2"/>
+        </ECEnumeration>
       </ECSchema>`]);
-        secondBriefcase.saveChanges("imported schema");
         await secondBriefcase.pushChanges({ description: "Added a property to TestClass and an enum", accessToken: adminToken });
         await firstBriefcase.pullChanges({ accessToken: adminToken });
         // Major schema change
-        await firstBriefcase.importSchemaStrings([`<?xml version="1.0" encoding="UTF-8"?>
-      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
-        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
-
-        <ECCustomAttributes>
-          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
-        </ECCustomAttributes>
-
-        <ECEnumeration typeName="TestEnum" backingTypeName="int" isStrict="true">
-          <ECEnumerator name="Enumerator1" value="1" displayLabel="TestEnumerator1"/>
-          <ECEnumerator name="Enumerator2" value="2" displayLabel="TestEnumerator2"/>
-        </ECEnumeration>
+        await importSchemaStrings(firstTxn, [`<?xml version="1.0" encoding="UTF-8"?>
+      <ECSchema schemaName="TestSchema" alias="ts" version="2.0.0" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+        <ECSchemaReference name="CoreCustomAttributes" version="1.0.0" alias="CoreCA" />
+
+        <ECCustomAttributes>
+          <DynamicSchema xmlns = 'CoreCustomAttributes.1.0.0' />
+        </ECCustomAttributes>
+
+        <ECEnumeration typeName="TestEnum" backingTypeName="int" isStrict="true">
+          <ECEnumerator name="Enumerator1" value="1" displayLabel="TestEnumerator1"/>
+          <ECEnumerator name="Enumerator2" value="2" displayLabel="TestEnumerator2"/>
+        </ECEnumeration>
       </ECSchema>`]);
-        firstBriefcase.saveChanges("imported schema");
         await firstBriefcase.pushChanges({ description: "Deleted TestClass", accessToken: adminToken });
         await secondBriefcase.pullChanges({ accessToken: adminToken });
         const firstBriefcaseChangesets = await firstBriefcase.getAllChangesetHealthData();
@@ -1303,6 +1320,8 @@ describe("Changeset Reader API", async () => {
         expect(secondBriefcaseChangeset2.totalFullTableScans).to.be.eql(0);
         expect(secondBriefcaseChangeset2.perStatementStats.length).to.be.eql(11);
         // Cleanup
+        secondTxn.end();
+        firstTxn.end();
         secondBriefcase.close();
         firstBriefcase.close();
     });
@@ -1312,26 +1331,27 @@ describe("Changeset Reader API", async () => {
         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 txn = startTestTxn(rwIModel, "openInMemory step");
         // 1. Import schema with class that span overflow table.
-        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="p1" 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="p1" typeName="string"/>
+        </ECEntityClass>
     </ECSchema>`;
-        await rwIModel.importSchemaStrings([schema]);
+        await importSchemaStrings(txn, [schema]);
         rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
         // Create drawing model and category
         await rwIModel.locks.acquireLocks({ shared: IModel.dictionaryId });
         const codeProps = Code.createEmpty();
         codeProps.value = "DrawingModel";
-        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(rwIModel, codeProps, true);
+        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(txn, 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() }));
-        rwIModel.saveChanges();
+            drawingCategoryId = DrawingCategory.insert(txn, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
+        txn.saveChanges();
         await rwIModel.pushChanges({ description: "setup category", accessToken: adminToken });
         const geomArray = [
             Arc3d.createXY(Point3d.create(0, 0), 5),
@@ -1353,7 +1373,7 @@ describe("Changeset Reader API", async () => {
         };
         // 2. Insert a element for the class
         await rwIModel.locks.acquireLocks({ shared: drawingModelId });
-        const e1id = rwIModel.elements.insertElement(e1);
+        const e1id = txn.insertElement(e1);
         assert.isTrue(Id64.isValidId64(e1id), "insert worked");
         const testElClassId = getClassIdByName(rwIModel, "Test2dElement");
         if (true) {
@@ -1385,7 +1405,7 @@ describe("Changeset Reader API", async () => {
             expect(testEl.p1).to.equals("test1");
         }
         // save changes and verify the the txn
-        rwIModel.saveChanges();
+        txn.saveChanges();
         if (true) {
             const txnId = rwIModel.txns.getLastSavedTxnProps()?.id;
             expect(txnId).to.not.be.undefined;
@@ -1437,6 +1457,8 @@ describe("Changeset Reader API", async () => {
             expect(testEl.p1).to.equals("test1");
         }
         await rwIModel.pushChanges({ description: "insert element", accessToken: adminToken });
+        txn.end();
+        rwIModel.close();
     });
     it("Instance update to a different class (bug)", async () => {
         /**
@@ -1467,29 +1489,30 @@ describe("Changeset Reader API", async () => {
         const modelId = await HubMock.createNewIModel({ iTwinId, iModelName, description: "TestSubject", accessToken: adminToken });
         assert.isNotEmpty(modelId);
         let b1 = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId: modelId, accessToken: adminToken });
+        let txn = startTestTxn(b1, "instance update to different class");
         // 1. Import schema with classes that span overflow table.
-        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="T1">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-              <ECProperty propertyName="p" typeName="string"/>
-        </ECEntityClass>
-        <ECEntityClass typeName="T2">
-            <BaseClass>bis:GraphicalElement2d</BaseClass>
-              <ECProperty propertyName="p" typeName="long"/>
-        </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="T1">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+              <ECProperty propertyName="p" typeName="string"/>
+        </ECEntityClass>
+        <ECEntityClass typeName="T2">
+            <BaseClass>bis:GraphicalElement2d</BaseClass>
+              <ECProperty propertyName="p" typeName="long"/>
+        </ECEntityClass>
     </ECSchema>`;
-        await b1.importSchemaStrings([schema]);
+        await importSchemaStrings(txn, [schema]);
         b1.channels.addAllowedChannel(ChannelControl.sharedChannelName);
         // Create drawing model and category
         await b1.locks.acquireLocks({ shared: IModel.dictionaryId });
         const codeProps = Code.createEmpty();
         codeProps.value = "DrawingModel";
-        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(b1, codeProps, true);
+        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(txn, codeProps, true);
         let drawingCategoryId = DrawingCategory.queryCategoryIdByName(b1, IModel.dictionaryId, "MyDrawingCategory");
         if (undefined === drawingCategoryId)
-            drawingCategoryId = DrawingCategory.insert(b1, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
+            drawingCategoryId = DrawingCategory.insert(txn, IModel.dictionaryId, "MyDrawingCategory", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(255,0,0)").toJSON() }));
         const geomArray = [
             Arc3d.createXY(Point3d.create(0, 0), 5),
             Arc3d.createXY(Point3d.create(5, 5), 2),
@@ -1508,22 +1531,24 @@ describe("Changeset Reader API", async () => {
             geom: geometryStream,
             p: "wwww",
         };
-        const elId = b1.elements.insertElement(geomElementT1);
+        const elId = txn.insertElement(geomElementT1);
         assert.isTrue(Id64.isValidId64(elId), "insert worked");
-        b1.saveChanges();
+        txn.saveChanges();
         await b1.pushChanges({ description: "insert element" });
         await b1.locks.acquireLocks({ shared: drawingModelId, exclusive: elId });
         await b1.locks.acquireLocks({ shared: IModel.dictionaryId });
-        b1.elements.deleteElement(elId);
-        b1.saveChanges();
+        txn.deleteElement(elId);
+        txn.saveChanges();
         // Force id set to reproduce same instance with different classid
         const bid = BigInt(elId) - 1n;
         b1[_nativeDb].saveLocalValue("bis_elementidsequence", bid.toString());
-        b1.saveChanges();
+        txn.saveChanges();
         const fileName = b1[_nativeDb].getFilePath();
+        txn.end();
         b1.close();
         b1 = await BriefcaseDb.open({ fileName });
         b1.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+        txn = startTestTxn(b1, "instance update to different class reopened briefcase");
         const geomElementT2 = {
             classFullName: `TestDomain:T2`,
             model: drawingModelId,
@@ -1532,9 +1557,9 @@ describe("Changeset Reader API", async () => {
             geom: geometryStream,
             p: 1111,
         };
-        const elId2 = b1.elements.insertElement(geomElementT2);
+        const elId2 = txn.insertElement(geomElementT2);
         chai.expect(elId).equals(elId2);
-        b1.saveChanges();
+        txn.saveChanges();
         await b1.pushChanges({ description: "buggy changeset" });
         const getChanges = async () => {
             return HubMock.downloadChangesets({ iModelId: modelId, targetDir: path.join(KnownTestLocations.outputDir, modelId, "changesets") });
@@ -1653,7 +1678,7 @@ describe("Changeset Reader API", async () => {
             unifier.appendFrom(adaptor2);
         }
         chai.expect(unifier.getInstanceCount()).to.be.equals(2); // WRONG should be 1
-        b1.saveChanges();
+        txn.end();
         b1.close();
     });
 });
@@ -1745,19 +1770,20 @@ describe("PRAGMA ECSQL Functions", async () => {
         // Insert two elements
         iModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
         await iModel.locks.acquireLocks({ shared: IModel.repositoryModelId });
-        const element1Id = iModel.elements.insertElement({
+        const txn = startTestTxn(iModel, "PRAGMA integrity check corrupted iModel");
+        const element1Id = txn.insertElement({
             classFullName: Subject.classFullName,
             model: IModel.repositoryModelId,
             parent: new SubjectOwnsSubjects(IModel.rootSubjectId),
             code: Subject.createCode(iModel, IModel.rootSubjectId, "Subject1"),
         });
-        const element2Id = iModel.elements.insertElement({
+        const element2Id = txn.insertElement({
             classFullName: Subject.classFullName,
             model: IModel.repositoryModelId,
             parent: new SubjectOwnsSubjects(IModel.rootSubjectId),
             code: Subject.createCode(iModel, IModel.rootSubjectId, "Subject2"),
         });
-        iModel.saveChanges();
+        txn.saveChanges();
         // Create a relationship between them
         await iModel.locks.acquireLocks({ exclusive: Id64.toIdSet([element1Id, element2Id]) });
         const relationship = iModel.relationships.createInstance({
@@ -1765,13 +1791,13 @@ describe("PRAGMA ECSQL Functions", async () => {
             sourceId: element1Id,
             targetId: element2Id,
         });
-        const relationshipId = iModel.relationships.insertInstance(relationship.toJSON());
+        const relationshipId = txn.insertRelationship(relationship.toJSON());
         assert.isTrue(Id64.isValidId64(relationshipId));
-        iModel.saveChanges();
+        txn.saveChanges();
         // Delete one element without deleting the relationship to corrupt the iModel
         const deleteResult = iModel[_nativeDb].executeSql(`DELETE FROM bis_Element WHERE Id=${element2Id}`);
         expect(deleteResult).to.equal(DbResult.BE_SQLITE_OK);
-        iModel.saveChanges();
+        txn.saveChanges();
         // Call PRAGMA integrity_check
         const query = "PRAGMA integrity_check ECSQLOPTIONS ENABLE_EXPERIMENTAL_FEATURES";
         const result = iModel.createQueryReader(query, undefined, undefined);
@@ -1787,24 +1813,26 @@ describe("PRAGMA ECSQL Functions", async () => {
         assert(results[6][2] === true, "'check_class_ids' check should be true");
         assert(results[7][2] === true, "'check_data_schema' check should be true");
         assert(results[8][2] === true, "'check_schema_load' check should be true");
+        txn.end();
     });
     it("should call PRAGMA integrity_check(check_linktable_fk_class_ids) on a corrupted iModel and return an error", async () => {
         // Insert two elements
         iModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
         await iModel.locks.acquireLocks({ shared: IModel.repositoryModelId });
-        const element1Id = iModel.elements.insertElement({
+        const txn = startTestTxn(iModel, "PRAGMA integrity check corrupted linktable fk ids");
+        const element1Id = txn.insertElement({
             classFullName: Subject.classFullName,
             model: IModel.repositoryModelId,
             parent: new SubjectOwnsSubjects(IModel.rootSubjectId),
             code: Subject.createCode(iModel, IModel.rootSubjectId, "Subject1"),
         });
-        const element2Id = iModel.elements.insertElement({
+        const element2Id = txn.insertElement({
             classFullName: Subject.classFullName,
             model: IModel.repositoryModelId,
             parent: new SubjectOwnsSubjects(IModel.rootSubjectId),
             code: Subject.createCode(iModel, IModel.rootSubjectId, "Subject2"),
         });
-        iModel.saveChanges();
+        txn.saveChanges();
         // Create a relationship between them
         await iModel.locks.acquireLocks({ exclusive: Id64.toIdSet([element1Id, element2Id]) });
         const relationship = iModel.relationships.createInstance({
@@ -1812,13 +1840,13 @@ describe("PRAGMA ECSQL Functions", async () => {
             sourceId: element1Id,
             targetId: element2Id,
         });
-        const relationshipId = iModel.relationships.insertInstance(relationship.toJSON());
+        const relationshipId = txn.insertRelationship(relationship.toJSON());
         assert.isTrue(Id64.isValidId64(relationshipId));
-        iModel.saveChanges();
+        txn.saveChanges();
         // Delete one element without deleting the relationship to corrupt the iModel
         const deleteResult = iModel[_nativeDb].executeSql(`DELETE FROM bis_Element WHERE Id=${element2Id}`);
         expect(deleteResult).to.equal(DbResult.BE_SQLITE_OK);
-        iModel.saveChanges();
+        txn.saveChanges();
         // Call PRAGMA integrity_check
         const query = "pragma integrity_check(check_linktable_fk_ids) options enable_experimental_features";
         const result = iModel.createQueryReader(query, undefined, { rowFormat: QueryRowFormat.UseECSqlPropertyNames });
@@ -1826,6 +1854,7 @@ describe("PRAGMA ECSQL Functions", async () => {
         expect(resultArray.length).to.equal(1); // 1 error report expected
         expect(resultArray[0].id).to.equal("0x20000000001");
         expect(resultArray[0].key_id).to.equal("0x20000000002");
+        txn.end();
     });
 });
 //# sourceMappingURL=ChangesetReader.test.js.map